sebb 2004/09/20 05:11:33
Modified: src/core/org/apache/jmeter/gui/action Tag: rel-2_0
Remove.java
Log:
Bug25145 - changed to use canRemove() insteadl of inaccessible Proxy method
Revision Changes Path
No revision
No revision
1.10.2.2 +15 -10 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.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- Remove.java 18 Sep 2004 20:50:33 -0000 1.10.2.1
+++ Remove.java 20 Sep 2004 12:11:33 -0000 1.10.2.2
@@ -22,11 +22,11 @@
import java.util.HashSet;
import java.util.Set;
+import javax.swing.JOptionPane;
import javax.swing.tree.TreePath;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
-import org.apache.jmeter.protocol.http.proxy.ProxyControl;
import org.apache.jmeter.testelement.TestElement;
/**
@@ -76,12 +76,17 @@
public static void removeNode(JMeterTreeNode node)
{
- GuiPackage.getInstance().getTreeModel().removeNodeFromParent(node);
- TestElement testElement = node.getTestElement();
- if(testElement instanceof ProxyControl)
- {
- ((ProxyControl)testElement).stopProxy();
- }
- GuiPackage.getInstance().removeNode(testElement);
+ TestElement testElement = node.getTestElement();
+ if (testElement.canRemove())
+ {
+ GuiPackage.getInstance().getTreeModel().removeNodeFromParent(node);
+ GuiPackage.getInstance().removeNode(testElement);
+ }
+ else
+ {
+ String message=testElement.getClass().getName()+ " is busy";
+ JOptionPane.showMessageDialog(null, message, "Cannot remove item",
+ JOptionPane.ERROR_MESSAGE);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
