View | Details | Raw Unified | Return to bug 51822
Collapse All | Expand All

(-)src/core/org/apache/jmeter/gui/action/EditCommand.java (-2 / +4 lines)
Lines 23-28 Link Here
23
import java.util.Set;
23
import java.util.Set;
24
24
25
import org.apache.jmeter.gui.GuiPackage;
25
import org.apache.jmeter.gui.GuiPackage;
26
import org.apache.jmeter.gui.JMeterGUIComponent;
26
import org.apache.jmeter.gui.NamePanel;
27
import org.apache.jmeter.gui.NamePanel;
27
28
28
/**
29
/**
Lines 40-51 Link Here
40
41
41
    public void doAction(ActionEvent e) {
42
    public void doAction(ActionEvent e) {
42
        GuiPackage guiPackage = GuiPackage.getInstance();
43
        GuiPackage guiPackage = GuiPackage.getInstance();
43
        guiPackage.getMainFrame().setMainPanel((javax.swing.JComponent) guiPackage.getCurrentGui());
44
        JMeterGUIComponent currentGui = guiPackage.getCurrentGui();
45
        guiPackage.getMainFrame().setMainPanel((javax.swing.JComponent) currentGui);
44
        guiPackage.getMainFrame().setEditMenu(guiPackage.getTreeListener().getCurrentNode().createPopupMenu());
46
        guiPackage.getMainFrame().setEditMenu(guiPackage.getTreeListener().getCurrentNode().createPopupMenu());
45
        // TODO: I believe the following code (to the end of the method) is
47
        // TODO: I believe the following code (to the end of the method) is
46
        // obsolete,
48
        // obsolete,
47
        // since NamePanel no longer seems to be the GUI for any component:
49
        // since NamePanel no longer seems to be the GUI for any component:
48
        if (!(guiPackage.getCurrentGui() instanceof NamePanel)) {
50
        if (!(currentGui instanceof NamePanel)) {
49
            guiPackage.getMainFrame().setFileLoadEnabled(true);
51
            guiPackage.getMainFrame().setFileLoadEnabled(true);
50
            guiPackage.getMainFrame().setFileSaveEnabled(true);
52
            guiPackage.getMainFrame().setFileSaveEnabled(true);
51
        } else {
53
        } else {

Return to bug 51822