Author: sebb
Date: Tue Jan 19 00:44:15 2010
New Revision: 900624
URL: http://svn.apache.org/viewvc?rev=900624&view=rev
Log:
Make private fields final
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
Tue Jan 19 00:44:15 2010
@@ -46,7 +46,7 @@
*
*/
public class AboutCommand implements Command {
- private static Set<String> commandSet;
+ private static final Set<String> commandSet;
private static JDialog about;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Tue Jan 19 00:44:15 2010
@@ -46,10 +46,10 @@
private Map<String, Set<Command>> commands = new HashMap<String,
Set<Command>>();
- private Map<String, HashSet<ActionListener>> preActionListeners =
+ private final Map<String, HashSet<ActionListener>> preActionListeners =
new HashMap<String, HashSet<ActionListener>>();
- private Map<String, HashSet<ActionListener>> postActionListeners =
+ private final Map<String, HashSet<ActionListener>> postActionListeners =
new HashMap<String, HashSet<ActionListener>>();
private ActionRouter() {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
Tue Jan 19 00:44:15 2010
@@ -37,7 +37,7 @@
public class AddToTree implements Command {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static Set<String> commandSet;
+ private static final Set<String> commandSet;
static {
HashSet<String> commands = new HashSet<String>();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java Tue
Jan 19 00:44:15 2010
@@ -53,9 +53,9 @@
private static JDialog helpWindow;
- private static HtmlPane helpDoc;
+ private static final HtmlPane helpDoc;
- private static JScrollPane scroller;
+ private static final JScrollPane scroller;
private static String currentPage;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
Tue Jan 19 00:44:15 2010
@@ -33,7 +33,7 @@
}
// Bug 47064 - fixes for Mac LAF
- private static int CONTROL_MASK
=Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+ private static final int CONTROL_MASK
=Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
public static final KeyStroke CUT = KeyStroke.getKeyStroke(KeyEvent.VK_X,
CONTROL_MASK);
public static final KeyStroke COPY = KeyStroke.getKeyStroke(KeyEvent.VK_C,
CONTROL_MASK);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
Tue Jan 19 00:44:15 2010
@@ -53,11 +53,11 @@
*
*/
public class SSLManagerCommand implements Command {
- private static Set<String> commandSet;
+ private static final Set<String> commandSet;
static {
HashSet<String> commands = new HashSet<String>();
commands.add(ActionNames.SSL_MANAGER);
- SSLManagerCommand.commandSet = Collections.unmodifiableSet(commands);
+ commandSet = Collections.unmodifiableSet(commands);
}
private JFileChooser keyStoreChooser;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Tue Jan 19 00:44:15 2010
@@ -254,7 +254,7 @@
private static final String _timeStampFormat;
- private static int _assertionsResultsToSave;
+ private static final int _assertionsResultsToSave;
// TODO turn into method?
public static final int SAVE_NO_ASSERTIONS = 0;
@@ -374,6 +374,8 @@
_assertionsResultsToSave = SAVE_FIRST_ASSERTION;
} else if (ALL.equals(whichAssertionResults)) {
_assertionsResultsToSave = SAVE_ALL_ASSERTIONS;
+ } else {
+ _assertionsResultsToSave = 0;
}
String howToSave = props.getProperty(OUTPUT_FORMAT_PROP, XML);
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=900624&r1=900623&r2=900624&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Tue Jan 19 00:44:15 2010
@@ -93,7 +93,7 @@
JMeterUtils.getPropDefault("proxy.ssl.protocol", "SSLv3"); //
$NON-NLS-1$ $NON-NLS-2$
// HashMap to save ssl connection between Jmeter proxy and browser
- private static HashMap<String, SSLSocketFactory> hashHost = new
HashMap<String, SSLSocketFactory>();
+ private static final HashMap<String, SSLSocketFactory> hashHost = new
HashMap<String, SSLSocketFactory>();
// Proxy configuration SSL
private static final String CERT_DIRECTORY =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
