jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1803375 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/ActionNames.java src/core/org/apache/jmeter/gui/action/CheckDirty.java src/core/org/apache/jmeter/gui/action/Cut.java xdocs/changes.xml
Date Sat, 29 Jul 2017 14:29:27 GMT
Author: pmouawad
Date: Sat Jul 29 14:29:26 2017
New Revision: 1803375

URL: http://svn.apache.org/viewvc?rev=1803375&view=rev
Log:
Bug 61359 - When cutting an element from Tree, Test plan is not marked as dirty 
Bugzilla Id: 61359

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1803375&r1=1803374&r2=1803375&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Sat Jul 29 14:29:26
2017
@@ -40,6 +40,7 @@ public final class ActionNames {
     public static final String CHANGE_PARENT    = "Change Parent"; // $NON-NLS-1$
     public static final String CHECK_DIRTY      = "check_dirty"; // $NON-NLS-1$
     public static final String CHECK_REMOVE     = "check_remove"; // $NON-NLS-1$
+    public static final String CHECK_CUT        = "check_cut"; // $NON-NLS-1$
     public static final String CLEAR            = "action.clear"; // $NON-NLS-1$
     public static final String CLEAR_ALL        = "action.clear_all"; // $NON-NLS-1$
     public static final String CLOSE            = "close"; // $NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java?rev=1803375&r1=1803374&r2=1803375&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java Sat Jul 29 14:29:26
2017
@@ -59,6 +59,7 @@ public class CheckDirty extends Abstract
         commands.add(ActionNames.SUB_TREE_LOADED);
         commands.add(ActionNames.ADD_ALL);
         commands.add(ActionNames.CHECK_REMOVE);
+        commands.add(ActionNames.CHECK_CUT);
     }
 
     public CheckDirty() {
@@ -91,7 +92,8 @@ public class CheckDirty extends Abstract
             if (isWorkbenchSaveable()) {
                 GuiPackage.getInstance().getTreeModel().getWorkBench().traverse(this);
             }
-        } else if (action.equals(ActionNames.CHECK_REMOVE)) {
+        } else if (action.equals(ActionNames.CHECK_REMOVE) ||
+                action.equals(ActionNames.CHECK_CUT)) {
             GuiPackage guiPackage = GuiPackage.getInstance();
             JMeterTreeNode[] nodes = guiPackage.getTreeListener().getSelectedNodes();
             removeMode = true;

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java?rev=1803375&r1=1803374&r2=1803375&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java Sat Jul 29 14:29:26 2017
@@ -49,6 +49,7 @@ public class Cut extends AbstractAction
     @Override
     public void doAction(ActionEvent e) {
         GuiPackage guiPack = GuiPackage.getInstance();
+        ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(), e.getID(),
ActionNames.CHECK_CUT));
         JMeterTreeNode[] currentNodes = guiPack.getTreeListener().getSelectedNodes();
 
         currentNodes = Copy.keepOnlyAncestors(currentNodes);

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1803375&r1=1803374&r2=1803375&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 29 14:29:26 2017
@@ -221,6 +221,7 @@ Incorporated feed back about unclear doc
     <li><bug>57962</bug>Allow to use variables ( from User Defined Variables
only ) in all listeners in slave mode</li>
     <li><bug>61270</bug>Fixed width fonts too small in text areas to read
under hidpi (user manual bug)</li>
     <li><bug>61292</bug>Make processing of samples in reporter more robust.</li>
+    <li><bug>61359</bug>When cutting an element from Tree, Test plan is
not marked as dirty</li>
 </ul>
 
  <!--  =================== Thanks =================== -->



Mime
View raw message