Author: sebb
Date: Fri Dec 10 17:07:49 2010
New Revision: 1044445
URL: http://svn.apache.org/viewvc?rev=1044445&view=rev
Log:
FindBugs: invalid iinitialisation
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1044445&r1=1044444&r2=1044445&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Fri Dec
10 17:07:49 2010
@@ -92,10 +92,10 @@ public final class GuiPackage implements
private boolean currentNodeUpdated = false;
/** The model for JMeter's test tree. */
- private JMeterTreeModel treeModel;
+ private final JMeterTreeModel treeModel;
/** The listener for JMeter's test tree. */
- private JMeterTreeListener treeListener;
+ private final JMeterTreeListener treeListener;
/** The main JMeter frame. */
private MainFrame mainFrame;
@@ -104,7 +104,9 @@ public final class GuiPackage implements
* Private constructor to permit instantiation only from within this class.
* Use {...@link #getInstance()} to retrieve a singleton instance.
*/
- private GuiPackage() {
+ private GuiPackage(JMeterTreeModel treeModel, JMeterTreeListener
treeListener) {
+ this.treeModel = treeModel;
+ this.treeListener = treeListener;
JMeterUtils.addLocaleChangeListener(this);
}
@@ -130,9 +132,7 @@ public final class GuiPackage implements
*/
public static GuiPackage getInstance(JMeterTreeListener listener,
JMeterTreeModel treeModel) {
if (guiPack == null) {
- guiPack = new GuiPackage();
- guiPack.setTreeListener(listener);
- guiPack.setTreeModel(treeModel);
+ guiPack = new GuiPackage(treeModel, listener);
}
return guiPack;
}
@@ -472,16 +472,6 @@ public final class GuiPackage implements
}
/**
- * Set the model for JMeter's test tree.
- *
- * @param newTreeModel
- * the new JMeter tree model
- */
- public void setTreeModel(JMeterTreeModel newTreeModel) {
- treeModel = newTreeModel;
- }
-
- /**
* Get a ValueReplacer for the test tree.
*
* @return a ValueReplacer configured for the test tree
@@ -511,16 +501,6 @@ public final class GuiPackage implements
}
/**
- * Set the listener for JMeter's test tree.
- *
- * @param newTreeListener
- * the new JMeter test tree listener
- */
- public void setTreeListener(JMeterTreeListener newTreeListener) {
- treeListener = newTreeListener;
- }
-
- /**
* Get the listener for JMeter's test tree.
*
* @return the JMeter test tree listener
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=1044445&r1=1044444&r2=1044445&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
Fri Dec 10 17:07:49 2010
@@ -42,7 +42,9 @@ import org.apache.log.Logger;
public final class ActionRouter implements ActionListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static ActionRouter router;
+ static class SingletonHolder {
+ static final ActionRouter INSTANCE = new ActionRouter();
+ }
private Map<String, Set<Command>> commands = new HashMap<String,
Set<Command>>();
@@ -53,6 +55,7 @@ public final class ActionRouter implemen
new HashMap<String, HashSet<ActionListener>>();
private ActionRouter() {
+ populateCommandMap();
}
public void actionPerformed(final ActionEvent e) {
@@ -305,10 +308,6 @@ public final class ActionRouter implemen
* @return The Instance value
*/
public static ActionRouter getInstance() {
- if (router == null) {
- router = new ActionRouter();
- router.populateCommandMap();
- }
- return router;
+ return SingletonHolder.INSTANCE;
}
}
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java?rev=1044445&r1=1044444&r2=1044445&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
Fri Dec 10 17:07:49 2010
@@ -42,7 +42,9 @@ import org.apache.log.Logger;
public final class ReportActionRouter implements ActionListener {
private Map<String, Set<Command>> commands = new HashMap<String,
Set<Command>>();
- private static ReportActionRouter router;
+ static class SingletonHolder {
+ static final ReportActionRouter INSTANCE = new ReportActionRouter();
+ }
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -53,6 +55,7 @@ public final class ReportActionRouter im
new HashMap<String, HashSet<ActionListener>>();
private ReportActionRouter() {
+ populateCommandMap();
}
public void actionPerformed(final ActionEvent e) {
@@ -298,10 +301,6 @@ public final class ReportActionRouter im
* @return The Instance value
*/
public static ReportActionRouter getInstance() {
- if (router == null) {
- router = new ReportActionRouter();
- router.populateCommandMap();
- }
- return router;
+ return SingletonHolder.INSTANCE;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
