Author: sebb
Date: Sat Sep 17 10:18:33 2011
New Revision: 1171938
URL: http://svn.apache.org/viewvc?rev=1171938&view=rev
Log:
Bug 51822 - (part 1) save 1 invocation of GuiPackage#getCurrentGui
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java?rev=1171938&r1=1171937&r2=1171938&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
Sat Sep 17 10:18:33 2011
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.NamePanel;
/**
@@ -40,12 +41,13 @@ public class EditCommand implements Comm
public void doAction(ActionEvent e) {
GuiPackage guiPackage = GuiPackage.getInstance();
- guiPackage.getMainFrame().setMainPanel((javax.swing.JComponent)
guiPackage.getCurrentGui());
+ JMeterGUIComponent currentGui = guiPackage.getCurrentGui();
+ guiPackage.getMainFrame().setMainPanel((javax.swing.JComponent)
currentGui);
guiPackage.getMainFrame().setEditMenu(guiPackage.getTreeListener().getCurrentNode().createPopupMenu());
// TODO: I believe the following code (to the end of the method) is
// obsolete,
// since NamePanel no longer seems to be the GUI for any component:
- if (!(guiPackage.getCurrentGui() instanceof NamePanel)) {
+ if (!(currentGui instanceof NamePanel)) {
guiPackage.getMainFrame().setFileLoadEnabled(true);
guiPackage.getMainFrame().setFileSaveEnabled(true);
} else {
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1171938&r1=1171937&r2=1171938&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Sep 17 10:18:33 2011
@@ -155,6 +155,7 @@ This can be overridden by setting the JM
<h3>General</h3>
<ul>
+<li>Bug 51822 - (part 1) save 1 invocation of GuiPackage#getCurrentGui</li>
</ul>
<h2>Non-functional changes</h2>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
