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 2013/04/16 13:29:14 UTC
svn commit: r1468374 - in
/jmeter/trunk/src/core/org/apache/jmeter/gui/action: Copy.java Cut.java
Author: pmouawad
Date: Tue Apr 16 11:29:14 2013
New Revision: 1468374
URL: http://svn.apache.org/r1468374
Log:
Bug 54847 - Cut & Paste is broken with tree multi-selection
Take into account sebb remark on dev mailing list
Bugzilla Id: 54847
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=1468374&r1=1468373&r2=1468374&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Tue Apr 16 11:29:14 2013
@@ -61,7 +61,7 @@ public class Copy extends AbstractAction
public void doAction(ActionEvent e) {
JMeterTreeListener treeListener = GuiPackage.getInstance().getTreeListener();
JMeterTreeNode[] nodes = treeListener.getSelectedNodes();
- nodes = filterNodes(nodes);
+ nodes = keepOnlyAncestors(nodes);
nodes = cloneTreeNodes(nodes);
setCopiedNodes(nodes);
}
@@ -93,7 +93,7 @@ public class Copy extends AbstractAction
* @param currentNodes JMeterTreeNode[]
* @return JMeterTreeNode[]
*/
- public static JMeterTreeNode[] filterNodes(JMeterTreeNode[] currentNodes) {
+ static JMeterTreeNode[] keepOnlyAncestors(JMeterTreeNode[] currentNodes) {
List<JMeterTreeNode> nodes = new ArrayList<JMeterTreeNode>();
for (int i = 0; i < currentNodes.length; i++) {
boolean exclude = false;
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=1468374&r1=1468373&r2=1468374&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 Tue Apr 16 11:29:14 2013
@@ -51,7 +51,7 @@ public class Cut extends AbstractAction
GuiPackage guiPack = GuiPackage.getInstance();
JMeterTreeNode[] currentNodes = guiPack.getTreeListener().getSelectedNodes();
- currentNodes = Copy.filterNodes(currentNodes);
+ currentNodes = Copy.keepOnlyAncestors(currentNodes);
Copy.setCopiedNodes(currentNodes);
for (int i = 0; i < currentNodes.length; i++) {
guiPack.getTreeModel().removeNodeFromParent(currentNodes[i]);