Author: sebb
Date: Fri Aug 31 09:40:04 2007
New Revision: 571515
URL: http://svn.apache.org/viewvc?rev=571515&view=rev
Log:
Code for convertSubTree is now all in JMeter.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Start.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java?rev=571515&r1=571514&r2=571515&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Fri Aug 31 09:40:04 2007
@@ -19,18 +19,12 @@
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
-import java.util.Iterator;
-import java.util.LinkedList;
import java.util.Set;
import javax.swing.JOptionPane;
-import org.apache.jmeter.control.ReplaceableController;
import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.tree.JMeterTreeNode;
-import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -47,38 +41,6 @@
* @see Command#getActionNames()
*/
abstract public Set getActionNames();
-
- protected void convertSubTree(HashTree tree) {
- Iterator iter = new LinkedList(tree.list()).iterator();
- while (iter.hasNext()) {
- Object o = iter.next();
- if(o instanceof TestElement)
- continue; //hey, no need to convert
- JMeterTreeNode item = (JMeterTreeNode) o;
- if (item.isEnabled()) {
- if (item.getUserObject() instanceof
ReplaceableController) {
- ReplaceableController rc =
(ReplaceableController) item.getTestElement();
- HashTree subTree = tree.getTree(item);
-
- if (subTree != null) {
- HashTree replacementTree =
rc.getReplacementSubTree();
- if (replacementTree != null) {
- convertSubTree(replacementTree);
- tree.replace(item,rc);
- tree.set(rc,replacementTree);
- }
- }
- } else {
- convertSubTree(tree.getTree(item));
- TestElement testElement =
item.getTestElement();
- tree.replace(item, testElement);
- }
- } else {
- tree.remove(item);
- }
-
- }
- }
/**
* @param e
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java?rev=571515&r1=571514&r2=571515&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
Fri Aug 31 09:40:04 2007
@@ -25,6 +25,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.jmeter.JMeter;
import org.apache.jmeter.engine.ClientJMeterEngine;
import org.apache.jmeter.engine.JMeterEngine;
import org.apache.jmeter.engine.JMeterEngineException;
@@ -184,7 +185,7 @@
private void initEngine(JMeterEngine engine, String host) {
GuiPackage gui = GuiPackage.getInstance();
HashTree testTree = gui.getTreeModel().getTestPlan();
- convertSubTree(testTree);
+ JMeter.convertSubTree(testTree);
testTree.add(testTree.getArray()[0], gui.getMainFrame());
engine.configure(testTree);
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Start.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Start.java?rev=571515&r1=571514&r2=571515&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Start.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Start.java
Fri Aug 31 09:40:04 2007
@@ -24,6 +24,7 @@
import javax.swing.JOptionPane;
+import org.apache.jmeter.JMeter;
import org.apache.jmeter.engine.JMeterEngineException;
import org.apache.jmeter.engine.StandardJMeterEngine;
import org.apache.jmeter.engine.TreeCloner;
@@ -35,10 +36,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Michael Stover Created March 1, 2001
- * @version $Revision$ Last updated: $Date$
- */
public class Start extends AbstractAction {
private static Logger log = LoggingManager.getLoggerForClass();
@@ -89,7 +86,7 @@
GuiPackage gui = GuiPackage.getInstance();
engine = new StandardJMeterEngine();
HashTree testTree = gui.getTreeModel().getTestPlan();
- convertSubTree(testTree);
+ JMeter.convertSubTree(testTree);
DisabledComponentRemover remover = new
DisabledComponentRemover(testTree);
testTree.traverse(remover);
testTree.add(testTree.getArray()[0], gui.getMainFrame());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
