You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/08/12 20:32:26 UTC
svn commit: r1756224 - in /jmeter/trunk/src/core/org/apache/jmeter:
JMeter.java gui/GuiPackage.java
Author: pmouawad
Date: Fri Aug 12 20:32:26 2016
New Revision: 1756224
URL: http://svn.apache.org/viewvc?rev=1756224&view=rev
Log:
Rename method to make code clear
deprecate old one
Fix Findbugs warning
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1756224&r1=1756223&r2=1756224&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Aug 12 20:32:26 2016
@@ -322,8 +322,7 @@ public class JMeter implements JMeterPlu
final ActionRouter instance = ActionRouter.getInstance();
instance.populateCommandMap();
treeLis.setActionHandler(instance);
- // NOTUSED: GuiPackage guiPack =
- GuiPackage.getInstance(treeLis, treeModel);
+ GuiPackage.initInstance(treeLis, treeModel);
MainFrame main = new MainFrame(treeModel, treeLis);
ComponentUtil.centerComponentInWindow(main, 80);
main.setVisible(true);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1756224&r1=1756223&r2=1756224&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Fri Aug 12 20:32:26 2016
@@ -169,16 +169,33 @@ public final class GuiPackage implements
* the TreeListener for JMeter's test tree
* @param treeModel
* the model for JMeter's test tree
+ */
+ public static void initInstance(JMeterTreeListener listener, JMeterTreeModel treeModel) {
+ GuiPackage guiPack = new GuiPackage(treeModel, listener);
+ guiPack.undoHistory.add(treeModel, "Created");
+ GuiPackage.guiPack = guiPack;
+ }
+
+ /**
+ * When GuiPackage is requested for the first time, it should be given
+ * handles to JMeter's Tree Listener and TreeModel.
+ *
+ * @param listener
+ * the TreeListener for JMeter's test tree
+ * @param treeModel
+ * the model for JMeter's test tree
*
* @return GuiPackage
+ * @deprecated Will be remove in next version
*/
+ @Deprecated
public static GuiPackage getInstance(JMeterTreeListener listener, JMeterTreeModel treeModel) {
- if (guiPack == null) {
- guiPack = new GuiPackage(treeModel, listener);
- guiPack.undoHistory.add(treeModel, "Created");
+ if(guiPack == null) {
+ initInstance(listener, treeModel);
}
- return guiPack;
+ return GuiPackage.guiPack;
}
+
/**
* Get a JMeterGUIComponent for the specified test element. If the GUI has