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:49:45 UTC
svn commit: r1785398 -
/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
Author: pmouawad
Date: Fri Mar 3 21:49:45 2017
New Revision: 1785398
URL: http://svn.apache.org/viewvc?rev=1785398&view=rev
Log:
Avoid showing Undo/Redo icons in toolbar if feature is disabled
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java?rev=1785398&r1=1785397&r2=1785398&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java Fri Mar 3 21:49:45 2017
@@ -32,6 +32,7 @@ import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JToolBar;
+import org.apache.jmeter.gui.UndoHistory;
import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.util.JMeterUtils;
@@ -98,7 +99,14 @@ public class JMeterToolBar extends JTool
toolBar.addSeparator();
} else {
try {
- toolBar.add(makeButtonItemRes(iconToolbarBean));
+ if(ActionNames.UNDO.equalsIgnoreCase(iconToolbarBean.getActionName())
+ || ActionNames.REDO.equalsIgnoreCase(iconToolbarBean.getActionName())) {
+ if(UndoHistory.isEnabled()) {
+ toolBar.add(makeButtonItemRes(iconToolbarBean));
+ }
+ } else {
+ toolBar.add(makeButtonItemRes(iconToolbarBean));
+ }
} catch (Exception e) {
if (log.isWarnEnabled()) {
log.warn("Exception while adding button item to toolbar. {}", e.getMessage());