sebb 2003/10/04 18:08:40
Modified: src/components/org/apache/jmeter/timers
ConstantThroughputTimer.java ConstantTimer.java
src/components/org/apache/jmeter/visualizers
StatVisualizerModel.java SplineVisualizer.java
GraphModel.java GraphAccum.java
GraphVisualizer.java SplineModel.java Graph.java
src/components/org/apache/jmeter/modifiers
CounterConfig.java UserParameters.java
src/components/org/apache/jmeter/extractor
RegexExtractor.java
src/components/org/apache/jmeter/control
InterleaveControl.java
Log:
Removing unused items
Revision Changes Path
1.8 +3 -6
jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
Index: ConstantThroughputTimer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConstantThroughputTimer.java 15 Aug 2003 22:20:17 -0000 1.7
+++ ConstantThroughputTimer.java 5 Oct 2003 01:08:40 -0000 1.8
@@ -55,8 +55,6 @@
package org.apache.jmeter.timers;
import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -75,8 +73,7 @@
implements Timer, Serializable
{
public final static String THROUGHPUT= "ConstantThroughputTimer.throughput";
- private static List addableList= new LinkedList();
-
+
/**
* Target time for the start of the next request. The delay provided by
* the timer will be calculated so that the next request happens at this
@@ -88,7 +85,7 @@
* Inverse of the configured throughput, in milliseconds. It's the interval
* at which sampling should ideally occur to get that throughput.
*/
- private long delay;
+ //TODO: remove? notused private long delay;
/**
* Constructor for a non-configured ConstantThroughputTimer.
1.15 +1 -11
jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantTimer.java
Index: ConstantTimer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantTimer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ConstantTimer.java 7 Sep 2003 18:52:54 -0000 1.14
+++ ConstantTimer.java 5 Oct 2003 01:08:40 -0000 1.15
@@ -56,17 +56,11 @@
package org.apache.jmeter.timers;
import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.event.LoopIterationListener;
import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.VariablesCollection;
-import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
/**
* This class implements a constant timer with its own panel and fields for
@@ -80,12 +74,8 @@
extends AbstractTestElement
implements Timer, Serializable, LoopIterationListener
{
- private static Logger log = LoggingManager.getLoggerForClass();
public final static String DELAY = "ConstantTimer.delay";
- private VariablesCollection vars = new VariablesCollection();
- private JMeterVariables variables;
- private static List addableList = new LinkedList();
private long delay = 0;
/**
1.11 +1 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizerModel.java
Index: StatVisualizerModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizerModel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StatVisualizerModel.java 16 Aug 2003 09:58:28 -0000 1.10
+++ StatVisualizerModel.java 5 Oct 2003 01:08:40 -0000 1.11
@@ -163,7 +163,6 @@
public void addNewSample(SampleResult res)
{
String aLabel = res.getSampleLabel();
- String responseCode = res.getResponseCode();
RunningSample s;
synchronized (labelMap)
1.10 +5 -5
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Index: SplineVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SplineVisualizer.java 16 Aug 2003 09:58:28 -0000 1.9
+++ SplineVisualizer.java 5 Oct 2003 01:08:40 -0000 1.10
@@ -358,17 +358,17 @@
return;
}
- boolean resized = true;
+ boolean resized = true; //TODO: remove? not read
if (width == lastWidth && height == lastHeight)
{
// dimension of the SplineGraph is the same
- resized = false;
+ resized = false; //TODO: remove? not used
}
else
{
// dimension changed
- resized = true;
+ resized = true; //TODO: remove? not used
lastWidth = width;
lastHeight = height;
}
1.11 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java
Index: GraphModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GraphModel.java 15 Aug 2003 22:20:16 -0000 1.10
+++ GraphModel.java 5 Oct 2003 01:08:40 -0000 1.11
@@ -278,13 +278,13 @@
*/
protected Sample addNewSample(long sample, long timeStamp, boolean success)
{
- int counter = 0;
+ //NOTUSED int counter = 0;
float average;
long deviation, median;
synchronized (statCalc)
{
statCalc.addValue(sample);
- counter = statCalc.getCount();
+ //NOTUSED counter = statCalc.getCount();
average = (float) statCalc.getMean();
deviation = (long) statCalc.getStandardDeviation();
median = statCalc.getMedian().longValue();
1.8 +2 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java
Index: GraphAccum.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GraphAccum.java 7 Sep 2003 18:52:53 -0000 1.7
+++ GraphAccum.java 5 Oct 2003 01:08:40 -0000 1.8
@@ -281,8 +281,7 @@
{
super.paintComponent(g);
log.debug("Start : paintComponent1");
- Dimension d = this.getSize();
-
+
synchronized (model.getList())
{
// For repainting set this to false because all the points needs to
1.16 +2 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
Index: GraphVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- GraphVisualizer.java 15 Aug 2003 22:20:16 -0000 1.15
+++ GraphVisualizer.java 5 Oct 2003 01:08:40 -0000 1.16
@@ -110,8 +110,7 @@
private JTextField deviationField;
private JTextField throughputField;
private JTextField medianField;
- private boolean perSecond = false;
-
+
/**
* Constructor for the GraphVisualizer object.
*/
1.5 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineModel.java
Index: SplineModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SplineModel.java 16 Aug 2003 09:58:28 -0000 1.4
+++ SplineModel.java 5 Oct 2003 01:08:40 -0000 1.5
@@ -237,7 +237,7 @@
if ((n % (numberOfNodes * refreshPeriod)) == 0)
{
float[] floatNode = new float[numberOfNodes];
- long[] longSample = getSamples();
+ //NOTUSED: long[] longSample = getSamples();
// load each node
int loadFactor = n / numberOfNodes;
1.10 +1 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Graph.java
Index: Graph.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Graph.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Graph.java 15 Sep 2003 23:14:02 -0000 1.9
+++ Graph.java 5 Oct 2003 01:08:40 -0000 1.10
@@ -230,8 +230,6 @@
{
super.paintComponent(g);
- Dimension d = this.getSize();
-
synchronized (model.getSamples())
{
Iterator e = model.getSamples().iterator();
1.18 +2 -4
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
Index: CounterConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CounterConfig.java 15 Sep 2003 23:14:02 -0000 1.17
+++ CounterConfig.java 5 Oct 2003 01:08:40 -0000 1.18
@@ -27,10 +27,8 @@
public final static String PER_USER = "CounterConfig.per_user";
public final static String VAR_NAME = "CounterConfig.name";
- private boolean perUser = false;
private int globalCounter = -1;
- private int currentIterationCount = -1;
-
+
/**
* @see LoopIterationListener#iterationStart(LoopIterationEvent)
*/
1.19 +1 -2
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
Index: UserParameters.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- UserParameters.java 11 Aug 2003 21:30:32 -0000 1.18
+++ UserParameters.java 5 Oct 2003 01:08:40 -0000 1.19
@@ -26,7 +26,6 @@
public static final String NAMES = "UserParameters.names";
public static final String THREAD_VALUES = "UserParameters.thread_values";
public static final String PER_ITERATION = "UserParameters.per_iteration";
- private int counter = 0;
private Integer lock = new Integer(0);
public CollectionProperty getNames()
1.10 +1 -2
jakarta-jmeter/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Index: RegexExtractor.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/extractor/RegexExtractor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RegexExtractor.java 7 Sep 2003 19:03:45 -0000 1.9
+++ RegexExtractor.java 5 Oct 2003 01:08:40 -0000 1.10
@@ -168,7 +168,6 @@
log.debug("template = " + rawTemplate);
Util.split(pieces, matcher, templatePattern, rawTemplate);
PatternMatcherInput input = new PatternMatcherInput(rawTemplate);
- int count = 0;
Iterator iter = pieces.iterator();
boolean startsWith = isFirstElementGroup(rawTemplate);
log.debug(
1.20 +1 -6
jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java
Index: InterleaveControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- InterleaveControl.java 11 Aug 2003 21:30:33 -0000 1.19
+++ InterleaveControl.java 5 Oct 2003 01:08:40 -0000 1.20
@@ -76,7 +76,6 @@
public static final int IGNORE_SUB_CONTROLLERS = 0;
public static final int USE_SUB_CONTROLLERS = 1;
private boolean skipNext;
- private boolean doNotIncrement = false;
private TestElement searchStart = null;
private boolean currentReturnedAtLeastOne;
private boolean stillSame = true;
@@ -364,7 +363,6 @@
"one",
"three" };
int counter = 0;
- int loops = 1;
controller.initialize();
while (counter < order.length)
{
@@ -423,7 +421,6 @@
"two",
"three" };
int counter = 0;
- int loops = 1;
controller.initialize();
while (counter < order.length)
{
@@ -456,7 +453,6 @@
sub_1.addTestElement(sub_3);
String[] order = new String[] { "one", "three", "two", "four" };
int counter = 0;
- int loops = 1;
controller.initialize();
while (counter < order.length)
{
@@ -489,7 +485,6 @@
sub_1.addTestElement(sub_3);
String[] order = new String[] { "one", "two", "three", "four" };
int counter = 0;
- int loops = 1;
controller.initialize();
while (counter < order.length)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
