woolfel 2005/09/06 18:31:56
Modified: src/components/org/apache/jmeter/control Tag: rel-2-1
ModuleController.java
Added: src/components/org/apache/jmeter/control Tag: rel-2-1
IncludeController.java
src/components/org/apache/jmeter/control/gui Tag: rel-2-1
IncludeControllerGui.java
Log:
merging the include controller from HEAD to 2.1 branch
peter
Revision Changes Path
No revision
No revision
1.10.2.1 +7 -18
jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java
Index: ModuleController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- ModuleController.java 12 Jul 2005 20:51:02 -0000 1.10
+++ ModuleController.java 7 Sep 2005 01:31:55 -0000 1.10.2.1
@@ -31,6 +31,7 @@
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.NullProperty;
import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.collections.ListedHashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -75,21 +76,6 @@
}
/**
- * Get the controller which this object is "pointing" to.
- *
- * @return the controller which this node points to
- * @see org.apache.jmeter.testelement.TestElement
- * @see org.apache.jmeter.control.ReplaceableController#getReplacement()
- */
- public TestElement getReplacement() {
- if (selectedNode != null) {
- return selectedNode.getTestElement();
- } else {
- return this;
- }
- }
-
- /**
* Sets the (@link JMeterTreeNode) which represents the controller which
* this object is pointing to. Used for building the test case upon
* execution.
@@ -167,12 +153,15 @@
* @param tree -
* The current tree under which the nodes will be added
*/
- public void replace(HashTree tree) {
+ public HashTree getReplacementSubTree() {
if (!selectedNode.isEnabled()) {
selectedNode = cloneTreeNode(selectedNode);
selectedNode.setEnabled(true);
}
+ HashTree tree = new ListedHashTree();
+ tree.add(selectedNode);
createSubTree(tree, selectedNode);
+ return tree;
}
private void createSubTree(HashTree tree, JMeterTreeNode node) {
No revision
Index: ModuleController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- ModuleController.java 12 Jul 2005 20:51:02 -0000 1.10
+++ ModuleController.java 7 Sep 2005 01:31:55 -0000 1.10.2.1
@@ -31,6 +31,7 @@
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.NullProperty;
import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.collections.ListedHashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -75,21 +76,6 @@
}
/**
- * Get the controller which this object is "pointing" to.
- *
- * @return the controller which this node points to
- * @see org.apache.jmeter.testelement.TestElement
- * @see org.apache.jmeter.control.ReplaceableController#getReplacement()
- */
- public TestElement getReplacement() {
- if (selectedNode != null) {
- return selectedNode.getTestElement();
- } else {
- return this;
- }
- }
-
- /**
* Sets the (@link JMeterTreeNode) which represents the controller which
* this object is pointing to. Used for building the test case upon
* execution.
@@ -167,12 +153,15 @@
* @param tree -
* The current tree under which the nodes will be added
*/
- public void replace(HashTree tree) {
+ public HashTree getReplacementSubTree() {
if (!selectedNode.isEnabled()) {
selectedNode = cloneTreeNode(selectedNode);
selectedNode.setEnabled(true);
}
+ HashTree tree = new ListedHashTree();
+ tree.add(selectedNode);
createSubTree(tree, selectedNode);
+ return tree;
}
private void createSubTree(HashTree tree, JMeterTreeNode node) {
No revision
Index: ModuleController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- ModuleController.java 12 Jul 2005 20:51:02 -0000 1.10
+++ ModuleController.java 7 Sep 2005 01:31:55 -0000 1.10.2.1
@@ -31,6 +31,7 @@
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.NullProperty;
import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.collections.ListedHashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -75,21 +76,6 @@
}
/**
- * Get the controller which this object is "pointing" to.
- *
- * @return the controller which this node points to
- * @see org.apache.jmeter.testelement.TestElement
- * @see org.apache.jmeter.control.ReplaceableController#getReplacement()
- */
- public TestElement getReplacement() {
- if (selectedNode != null) {
- return selectedNode.getTestElement();
- } else {
- return this;
- }
- }
-
- /**
* Sets the (@link JMeterTreeNode) which represents the controller which
* this object is pointing to. Used for building the test case upon
* execution.
@@ -167,12 +153,15 @@
* @param tree -
* The current tree under which the nodes will be added
*/
- public void replace(HashTree tree) {
+ public HashTree getReplacementSubTree() {
if (!selectedNode.isEnabled()) {
selectedNode = cloneTreeNode(selectedNode);
selectedNode.setEnabled(true);
}
+ HashTree tree = new ListedHashTree();
+ tree.add(selectedNode);
createSubTree(tree, selectedNode);
+ return tree;
}
private void createSubTree(HashTree tree, JMeterTreeNode node) {
1.4.2.1 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/control/IncludeController.java
No revision
No revision
1.1.2.1 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
