sebb 2003/10/19 15:32:16
Modified: src/core/org/apache/jmeter/threads TestCompiler.java
Log:
Commented out unused fields; fixed javadoc tags
Revision Changes Path
1.33 +64 -64
jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java
Index: TestCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TestCompiler.java 7 Sep 2003 18:54:54 -0000 1.32
+++ TestCompiler.java 19 Oct 2003 22:32:16 -0000 1.33
@@ -1,14 +1,14 @@
package org.apache.jmeter.threads;
-import java.util.ArrayList;
+//import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
+//import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import java.util.Set;
+//import java.util.Set;
import org.apache.jmeter.assertions.Assertion;
import org.apache.jmeter.config.ConfigTestElement;
@@ -40,29 +40,29 @@
transient private static Logger log = LoggingManager.getLoggerForClass();
LinkedList stack = new LinkedList();
Map samplerConfigMap = new HashMap();
- Set objectsWithFunctions = new HashSet();
+ //Set objectsWithFunctions = new HashSet();
HashTree testTree;
- SampleResult previousResult;
- Sampler currentSampler;
- JMeterVariables threadVars;
- private static Set pairing = new HashSet();
+ //SampleResult previousResult;
+ //Sampler currentSampler;
+ //JMeterVariables threadVars;
+ //private static Set pairing = new HashSet();
- List loopIterListeners = new ArrayList();
+ //List loopIterListeners = new ArrayList();
public TestCompiler(HashTree testTree, JMeterVariables vars)
{
- threadVars = vars;
+ //threadVars = vars;
this.testTree = testTree;
}
public static void initialize()
{
- pairing.clear();
+ //pairing.clear();
}
public void sampleOccurred(SampleEvent e)
{
- previousResult = e.getResult();
+ //previousResult = e.getResult();
}
public void sampleStarted(SampleEvent e)
@@ -75,7 +75,7 @@
public SamplePackage configureSampler(Sampler sampler)
{
- currentSampler = sampler;
+ //currentSampler = sampler;
SamplePackage pack = (SamplePackage) samplerConfigMap.get(sampler);
pack.setSampler(sampler);
runPreProcessors(pack.getPreProcessors());
@@ -117,18 +117,18 @@
saveSamplerConfigs((Sampler) child);
}
stack.removeLast();
- if (stack.size() > 0)
- {
- ObjectPair pair =
- new ObjectPair(
- (TestElement) child,
- (TestElement) stack.getLast());
- if (!pairing.contains(pair))
- {
- pair.addTestElements();
- pairing.add(pair);
- }
- }
+// if (stack.size() > 0)
+// {
+// ObjectPair pair =
+// new ObjectPair(
+// (TestElement) child,
+// (TestElement) stack.getLast());
+// if (!pairing.contains(pair))
+// {
+// pair.addTestElements();
+// pairing.add(pair);
+// }
+// }
}
private void trackIterationListeners(LinkedList stack)
@@ -224,7 +224,7 @@
}
/**
- * @author $Author$
+ * @author
* @version $Revision$
*/
public static class Test extends junit.framework.TestCase
@@ -271,43 +271,43 @@
}
/**
- * @author $Author$
+ *
* @version $Revision$
*/
- private class ObjectPair
- {
- TestElement child, parent;
-
- public ObjectPair(TestElement one, TestElement two)
- {
- this.child = one;
- this.parent = two;
- }
-
- public void addTestElements()
- {
- if (parent instanceof Controller
- && (child instanceof Sampler || child instanceof Controller))
- {
- parent.addTestElement(child);
- }
- }
-
- public int hashCode()
- {
- return child.hashCode() + parent.hashCode();
- }
-
- public boolean equals(Object o)
- {
- if (o instanceof ObjectPair)
- {
- return child == ((ObjectPair) o).child
- && parent == ((ObjectPair) o).parent;
- }
- return false;
- }
- }
+// private class ObjectPair
+// {
+// TestElement child, parent;
+//
+// public ObjectPair(TestElement one, TestElement two)
+// {
+// this.child = one;
+// this.parent = two;
+// }
+//
+// public void addTestElements()
+// {
+// if (parent instanceof Controller
+// && (child instanceof Sampler || child instanceof Controller))
+// {
+// parent.addTestElement(child);
+// }
+// }
+//
+// public int hashCode()
+// {
+// return child.hashCode() + parent.hashCode();
+// }
+//
+// public boolean equals(Object o)
+// {
+// if (o instanceof ObjectPair)
+// {
+// return child == ((ObjectPair) o).child
+// && parent == ((ObjectPair) o).parent;
+// }
+// return false;
+// }
+// }
private void configureWithConfigElements(Sampler sam, List configs)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
