sebb 2003/10/16 10:37:41
Modified: src/core/org/apache/jmeter/gui/tree JMeterTreeListener.java
src/core/org/apache/jmeter/gui/action Remove.java
Log:
Bug: 23787 properties of ThreadGroup in tree get overwritten
Revision Changes Path
1.11 +3 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
Index: JMeterTreeListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMeterTreeListener.java 5 Oct 2003 01:05:31 -0000 1.10
+++ JMeterTreeListener.java 16 Oct 2003 17:37:41 -0000 1.11
@@ -206,9 +206,10 @@
return nodes;
}
- public void removedSelectedNode()
+ public TreePath removedSelectedNode()
{
currentPath = currentPath.getParentPath();
+ return currentPath;
}
public void valueChanged(TreeSelectionEvent e)
1.7 +8 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Remove.java
Index: Remove.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Remove.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Remove.java 27 Jun 2003 19:12:54 -0000 1.6
+++ Remove.java 16 Oct 2003 17:37:41 -0000 1.7
@@ -58,6 +58,8 @@
import java.util.HashSet;
import java.util.Set;
+import javax.swing.tree.TreePath;
+
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
@@ -96,12 +98,15 @@
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeNode[] nodes =
guiPackage.getTreeListener().getSelectedNodes();
- guiPackage.getTreeListener().removedSelectedNode();
+ TreePath newTreePath = //Save parent node for later
+ guiPackage.getTreeListener().removedSelectedNode();
for (int i = nodes.length - 1; i >= 0; i--)
{
removeNode(nodes[i]);
}
- guiPackage.getTreeListener().getJTree().setSelectionRow(1);
+ guiPackage.getTreeListener().getJTree().setSelectionPath(newTreePath);
+
+ //guiPackage.getTreeListener().getJTree().setSelectionRow(1);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
