svn commit: r1628260 - in /jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/gui/UndoHistory.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Mon Sep 29 19:10:48 2014
New Revision: 1628260

URL: http://svn.apache.org/r1628260
Log:
Bug 42248 - Undo-redo support on Test Plan tree modification
Disable feature by default as it is still in ALPHA MODE
Mention this in changes.xml
Bugzilla Id: 42248

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1628260&r1=1628259&r2=1628260&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Mon Sep 29 19:10:48 2014
@@ -162,8 +162,10 @@ jmeter.laf.mac=System
 not_in_menu=org.apache.jmeter.protocol.http.modifier.gui.ParamModifierGui, HTTP User Parameter Modifier, org.apache.jmeter.protocol.http.control.gui.WebServiceSamplerGui
 
 # Number of items in undo history
+# Feature is disabled by default (0)
+# Set it to a number > 0 (25 can be a good default)
 # The bigger it is, the more it consumes memory
-#undo.history.size=25
+#undo.history.size=0
 
 #---------------------------------------------------------------------------
 # Remote hosts and RMI configuration

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=1628260&r1=1628259&r2=1628260&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Mon Sep 29 19:10:48 2014
@@ -93,7 +93,7 @@ public class UndoHistory implements Tree
     private static final int INITIAL_POS = -1;
     private int position = INITIAL_POS;
 
-    private static final int HISTORY_SIZE = JMeterUtils.getPropDefault("undo.history.size", 25);
+    private static final int HISTORY_SIZE = JMeterUtils.getPropDefault("undo.history.size", 0);
 
     private List<UndoHistoryItem> history = new LimitedArrayList<UndoHistoryItem>(HISTORY_SIZE);
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1628260&r1=1628259&r2=1628260&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Sep 29 19:10:48 2014
@@ -111,7 +111,7 @@ In addition, you can fetch only the mess
 <ch_category>GUI Improvements</ch_category>
 
 <ch_title>Undo/Redo support</ch_title>
-<p>Undo / Redo has been introduced and allows user to undo/redo changes made on Test Plan Tree</p>
+<p>Undo / Redo has been introduced and allows user to undo/redo changes made on Test Plan Tree. This feature (ALPHA MODE) is disabled by default, to enable it set property <b>undo.history.size=25</b> </p>
 <figure width="1024" height="56" image="changes/2.12/10_undo_redo.png"></figure>
 
 <ch_title>View Results Tree</ch_title>