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 2017/03/03 21:15:54 UTC

svn commit: r1785392 - in /jmeter/trunk/src/core/org/apache/jmeter/gui: UndoHistory.java util/MenuFactory.java

Author: pmouawad
Date: Fri Mar  3 21:15:53 2017
New Revision: 1785392

URL: http://svn.apache.org/viewvc?rev=1785392&view=rev
Log:
Avoid showing Undo/Redo if feature is disabled

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java?rev=1785392&r1=1785391&r2=1785392&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Fri Mar  3 21:15:53 2017
@@ -347,10 +347,9 @@ public class UndoHistory implements Tree
     }
     
     /**
-     * 
      * @return true if history is enabled
      */
-    boolean isEnabled() {
+    public static boolean isEnabled() {
         return HISTORY_SIZE > 0;
     }
     

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=1785392&r1=1785391&r2=1785392&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Fri Mar  3 21:15:53 2017
@@ -43,6 +43,7 @@ import javax.swing.MenuElement;
 import org.apache.jmeter.control.Controller;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.JMeterGUIComponent;
+import org.apache.jmeter.gui.UndoHistory;
 import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.action.ActionRouter;
 import org.apache.jmeter.gui.action.KeyStrokes;
@@ -210,7 +211,9 @@ public final class MenuFactory {
     public static void addFileMenu(JPopupMenu menu, boolean addSaveTestFragmentMenu) {
         // the undo/redo as a standard goes first in Edit menus
         // maybe there's better place for them in JMeter?
-        addUndoItems(menu);
+        if(UndoHistory.isEnabled()) {
+            addUndoItems(menu);
+        }
 
         addSeparator(menu);
         menu.add(makeMenuItemRes("open", ActionNames.OPEN));// $NON-NLS-1$