woolfel 2005/09/06 18:34:31
Modified: src/core/org/apache/jmeter/resources Tag: rel-2-1
messages.properties
src/core/org/apache/jmeter/control Tag: rel-2-1
ReplaceableController.java
src/core/org/apache/jmeter/gui/action Tag: rel-2-1
AbstractAction.java
Log:
updates for the include controller
peter
Revision Changes Path
No revision
No revision
1.151.2.3 +2 -0
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.151.2.2
retrieving revision 1.151.2.3
diff -u -r1.151.2.2 -r1.151.2.3
--- messages.properties 5 Sep 2005 23:33:15 -0000 1.151.2.2
+++ messages.properties 7 Sep 2005 01:34:31 -0000 1.151.2.3
@@ -229,7 +229,9 @@
if_controller_label=Condition
if_controller_title=If Controller
ignore_subcontrollers=Ignore sub-controller blocks
+include_controller=Include Controller
include_equals=Include Equals?
+include_path=Include Test Plan
increment=Increment
infinite=Forever
initial_context_factory=Initial Context Factory
No revision
No revision
1.5.2.1 +3 -11
jakarta-jmeter/src/core/org/apache/jmeter/control/ReplaceableController.java
Index: ReplaceableController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/ReplaceableController.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- ReplaceableController.java 12 Jul 2005 20:51:00 -0000 1.5
+++ ReplaceableController.java 7 Sep 2005 01:34:31 -0000 1.5.2.1
@@ -31,14 +31,6 @@
* @version $Revision$
*/
public interface ReplaceableController {
- /**
- * Returns the TestElement that should replace the current
- * ReplaceableCoroller.
- *
- * @return TestElement
- * @see org.apache.jmeter.testelement.TestElement
- */
- public TestElement getReplacement();
/**
* Used to replace the test execution tree (usually by adding the
@@ -50,5 +42,5 @@
* @see org.apache.jorphan.collections.HashTree
* @see org.apache.jmeter.gui.action.AbstractAction#convertSubTree
*/
- public void replace(HashTree tree);
+ public HashTree getReplacementSubTree();
}
No revision
No revision
1.16.2.1 +10 -6
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- AbstractAction.java 12 Jul 2005 20:50:26 -0000 1.16
+++ AbstractAction.java 7 Sep 2005 01:34:31 -0000 1.16.2.1
@@ -55,16 +55,20 @@
protected void convertSubTree(HashTree tree) {
Iterator iter = new LinkedList(tree.list()).iterator();
while (iter.hasNext()) {
- JMeterTreeNode item = (JMeterTreeNode) iter.next();
+ 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) {
- rc.replace(subTree);
- convertSubTree(subTree);
- tree.replace(item,
rc.getReplacement());
+ HashTree replacementTree =
rc.getReplacementSubTree();
+ convertSubTree(replacementTree);
+ tree.replace(item,rc);
+ tree.set(rc,replacementTree);
}
} else {
convertSubTree(tree.getTree(item));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
