You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2002/06/26 04:14:15 UTC
cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/gui/action CheckDirty.java Load.java Remove.java
mstover1 2002/06/25 19:14:15
Modified: src_1/org/apache/jmeter/gui/action CheckDirty.java Load.java
Remove.java
Log:
Improving memory usage
Revision Changes Path
1.5 +30 -3 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/CheckDirty.java
Index: CheckDirty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/CheckDirty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CheckDirty.java 13 Jun 2002 00:45:16 -0000 1.4
+++ CheckDirty.java 26 Jun 2002 02:14:14 -0000 1.5
@@ -1,9 +1,17 @@
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
-import java.util.*;
-import org.apache.jmeter.util.*;
-import org.apache.jmeter.gui.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.JMeterGUIComponent;
+import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.util.ListedHashTree;
+import org.apache.jmeter.util.ListedHashTreeVisitor;
/**
* @author mstover
@@ -21,8 +29,10 @@
public static final String ADD_ALL = "add_all";
public static final String SAVE = "save";
public static final String SAVE_ALL = "save_all";
+ public static final String REMOVE = "check_remove";
boolean checkMode = false;
+ boolean removeMode = false;
boolean dirty = false;
private static Set commands = new HashSet();
@@ -34,6 +44,7 @@
commands.add(ADD_ALL);
commands.add(SAVE);
commands.add(SAVE_ALL);
+ commands.add(REMOVE);
}
public CheckDirty()
@@ -64,8 +75,20 @@
}
else if(action.equals(ADD_ALL))
{
+ previousGuiItems.clear();
GuiPackage.getInstance().getTreeModel().getTestPlan().traverse(this);
}
+ else if(action.equals(REMOVE))
+ {
+ GuiPackage guiPackage = GuiPackage.getInstance();
+ JMeterTreeNode[] nodes = guiPackage.getTreeListener().getSelectedNodes();
+ removeMode = true;
+ for (int i = nodes.length - 1; i >= 0; i--)
+ {
+ guiPackage.getTreeModel().getCurrentSubTree(nodes[i]).traverse(this);
+ }
+ removeMode = false;
+ }
else if(action.equals(CHECK_DIRTY))
{
checkMode = true;
@@ -98,6 +121,10 @@
{
dirty = true;
}
+ }
+ else if(removeMode)
+ {
+ previousGuiItems.remove(treeNode);
}
else
{
1.12 +3 -1 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Load.java 25 Jun 2002 00:45:14 -0000 1.11
+++ Load.java 26 Jun 2002 02:14:14 -0000 1.12
@@ -142,6 +142,8 @@
}
catch(Throwable ex)
{
+ ex.printStackTrace();
+ JMeterUtils.reportErrorToUser("Couldn't load JMX file. May have been corrupted");
try
{
legacyLoad(f);
1.4 +6 -5 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Remove.java
Index: Remove.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Remove.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Remove.java 19 Jun 2002 19:56:20 -0000 1.3
+++ Remove.java 26 Jun 2002 02:14:14 -0000 1.4
@@ -55,12 +55,11 @@
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
-import org.apache.jmeter.gui.tree.*;
-import org.apache.jmeter.gui.*;
-import org.apache.jmeter.testelement.WorkBench;
-import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.util.JMeterUtils;
/**
@@ -100,6 +99,8 @@
*/
public void doAction(ActionEvent e)
{
+ ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(),
+ e.getID(),CheckDirty.REMOVE));
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeNode[] nodes = guiPackage.getTreeListener().getSelectedNodes();
guiPackage.getTreeListener().removedSelectedNode();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>