sebb 2003/10/04 18:05:32
Modified: src/core/org/apache/jmeter/gui/tree JMeterTreeListener.java
JMeterTreeModel.java
src/core/org/apache/jmeter/engine LagDetector.java
RemoteJMeterEngineImpl.java
src/core/org/apache/jmeter/gui MainFrame.java
GUIFactory.java
src/core/org/apache/jmeter/reporters FileReporter.java
ResultCollector.java
src/core/org/apache/jmeter/config/gui ArgumentsPanel.java
src/core/org/apache/jmeter/gui/action AddToTree.java
Copy.java ActionRouter.java
src/core/org/apache/jmeter/testelement TestPlan.java
WorkBench.java
src/core/org/apache/jmeter/engine/util CompoundVariable.java
SimpleVariable.java
src/core/org/apache/jmeter/gui/util ButtonPanel.java
MenuFactory.java
src/core/org/apache/jmeter/threads ThreadGroup.java
JMeterContextService.java
src/core/org/apache/jmeter/save SaveService.java
src/core/org/apache/jmeter JMeter.java
src/core/org/apache/jmeter/functions AbstractFunction.java
Log:
Removing unused items
Revision Changes Path
1.10 +3 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
Index: JMeterTreeListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JMeterTreeListener.java 7 Sep 2003 18:54:53 -0000 1.9
+++ JMeterTreeListener.java 5 Oct 2003 01:05:31 -0000 1.10
@@ -373,6 +373,7 @@
|| (MouseEvent.BUTTON3_MASK == e.getModifiers());
}
+/* NOTUSED
private void updateMainMenu(JPopupMenu menu)
{
try
@@ -386,6 +387,7 @@
log.error("", e);
}
}
+*/
private void displayPopUp(MouseEvent e)
{
1.20 +1 -4
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Index: JMeterTreeModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JMeterTreeModel.java 27 Jun 2003 19:21:47 -0000 1.19
+++ JMeterTreeModel.java 5 Oct 2003 01:05:31 -0000 1.20
@@ -74,8 +74,6 @@
import org.apache.jmeter.util.NameUpdater;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.ListedHashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
/**
*
@@ -84,7 +82,6 @@
*/
public class JMeterTreeModel extends DefaultTreeModel
{
- private static Logger log = LoggingManager.getLoggerForClass();
public JMeterTreeModel()
{
1.4 +1 -2
jakarta-jmeter/src/core/org/apache/jmeter/engine/LagDetector.java
Index: LagDetector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/LagDetector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LagDetector.java 25 Jun 2003 21:18:04 -0000 1.3
+++ LagDetector.java 5 Oct 2003 01:05:31 -0000 1.4
@@ -106,7 +106,6 @@
public void run()
{
running = true;
- long totalTime = 0;
long time;
totalLag = 0;
count = 0;
1.11 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
Index: RemoteJMeterEngineImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RemoteJMeterEngineImpl.java 7 Sep 2003 18:54:53 -0000 1.10
+++ RemoteJMeterEngineImpl.java 5 Oct 2003 01:05:31 -0000 1.11
@@ -134,7 +134,7 @@
{
try
{
- RemoteJMeterEngine engine = new RemoteJMeterEngineImpl();
+ new RemoteJMeterEngineImpl();
while (true)
{
Thread.sleep(Long.MAX_VALUE);
1.23 +1 -5 jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MainFrame.java 7 Sep 2003 18:54:54 -0000 1.22
+++ MainFrame.java 5 Oct 2003 01:05:31 -0000 1.23
@@ -96,8 +96,6 @@
import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.ComponentUtil;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
/**
* The main JMeter frame, containing the menu bar, test tree, and an area for
@@ -108,8 +106,6 @@
*/
public class MainFrame extends JFrame implements TestListener, Remoteable
{
- /** Logging. */
- private static transient Logger log = LoggingManager.getLoggerForClass();
/** The menu bar. */
private JMeterMenuBar menuBar;
1.5 +1 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/GUIFactory.java
Index: GUIFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/GUIFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GUIFactory.java 18 Aug 2003 19:40:42 -0000 1.4
+++ GUIFactory.java 5 Oct 2003 01:05:31 -0000 1.5
@@ -173,7 +173,6 @@
{
// TODO: This method doesn't appear to be used.
JMeterGUIComponent gui = (JMeterGUIComponent) guiClass.newInstance();
- JComponent component = (JComponent) gui;
GUI_MAP.put(key, gui);
}
}
1.10 +2 -3
jakarta-jmeter/src/core/org/apache/jmeter/reporters/FileReporter.java
Index: FileReporter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/FileReporter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FileReporter.java 7 Sep 2003 18:54:53 -0000 1.9
+++ FileReporter.java 5 Oct 2003 01:05:31 -0000 1.10
@@ -453,8 +453,7 @@
Y1 = height - Y1 - base;
Y2 = height - Y2 - base;
g.drawLine(start, Y1, start + increment, Y2);
- Integer value = (Integer) v.elementAt(i);
-
+
start += increment;
}
}
1.27 +1 -2
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ResultCollector.java 10 Sep 2003 15:18:56 -0000 1.26
+++ ResultCollector.java 5 Oct 2003 01:05:31 -0000 1.27
@@ -107,7 +107,6 @@
NoThreadClone
{
transient private static Logger log = LoggingManager.getLoggerForClass();
- private final static String COLLECTED = "collected";
public final static String FILENAME = "filename";
private static boolean functionalMode = false;
public static final String ERROR_LOGGING = "ResultCollector.error_logging";
1.21 +1 -5
jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
Index: ArgumentsPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ArgumentsPanel.java 18 Aug 2003 12:49:54 -0000 1.20
+++ ArgumentsPanel.java 5 Oct 2003 01:05:31 -0000 1.21
@@ -79,8 +79,6 @@
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.ObjectTableModel;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
/**
* A GUI panel allowing the user to enter name-value argument pairs. These
@@ -94,8 +92,6 @@
extends AbstractConfigGui
implements ActionListener
{
- /** Logging. */
- private static transient Logger log =LoggingManager.getLoggerForClass();
/** The title label for this component. */
private JLabel tableLabel;
1.9 +2 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddToTree.java
Index: AddToTree.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddToTree.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AddToTree.java 27 Jun 2003 19:12:54 -0000 1.8
+++ AddToTree.java 5 Oct 2003 01:05:31 -0000 1.9
@@ -56,7 +56,6 @@
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -82,8 +81,6 @@
{
allJMeterComponentCommands = new HashMap();
allJMeterComponentCommands.put("Add", "Add");
- List classes;
-
}
/**
1.5 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Copy.java
Index: Copy.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Copy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Copy.java 27 Jun 2003 19:12:54 -0000 1.4
+++ Copy.java 5 Oct 2003 01:05:31 -0000 1.5
@@ -39,8 +39,8 @@
public void doAction(ActionEvent e)
{
- String action = e.getActionCommand();
- JMeterTreeNode draggedNode =
+ //NOTUSED String action = e.getActionCommand();
+ JMeterTreeNode draggedNode = //NOTUSED - can it be deleted?
GuiPackage.getInstance().getTreeListener().getDraggedNode();
JMeterTreeListener treeListener =
GuiPackage.getInstance().getTreeListener();
1.18 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Index: ActionRouter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ActionRouter.java 18 Aug 2003 19:40:41 -0000 1.17
+++ ActionRouter.java 5 Oct 2003 01:05:31 -0000 1.18
@@ -81,7 +81,7 @@
{
private Map commands = new HashMap();
private static ActionRouter router;
- private static AddToTree add = new AddToTree();
+ private static AddToTree add = new AddToTree();//NOTUSED add - but keep for
side effects...
transient private static Logger log = LoggingManager.getLoggerForClass();
private Map preActionListeners = new HashMap();
private Map postActionListeners = new HashMap();
1.8 +2 -4
jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java
Index: TestPlan.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestPlan.java 28 Jun 2003 19:13:59 -0000 1.7
+++ TestPlan.java 5 Oct 2003 01:05:31 -0000 1.8
@@ -2,7 +2,6 @@
import java.io.Serializable;
import java.util.Collection;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -34,8 +33,7 @@
private List configs = new LinkedList();
private static List itemsCanAdd = new LinkedList();
private static TestPlan plan;
- private Map userDefinedVariables = new HashMap();
-
+
static {
// WARNING! This String value must be identical to the String value
// returned in org.apache.jmeter.threads.ThreadGroup.getClassLabel()
1.5 +1 -4
jakarta-jmeter/src/core/org/apache/jmeter/testelement/WorkBench.java
Index: WorkBench.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/WorkBench.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WorkBench.java 28 Jun 2003 19:13:59 -0000 1.4
+++ WorkBench.java 5 Oct 2003 01:05:31 -0000 1.5
@@ -1,7 +1,6 @@
package org.apache.jmeter.testelement;
import java.io.Serializable;
-import java.util.List;
/**
* @author Michael Stover
@@ -10,8 +9,6 @@
*/
public class WorkBench extends AbstractTestElement implements Serializable
{
- private static List itemsCanAdd = null;
- private boolean isRootNode;
/**
* Constructor for the WorkBench object.
1.21 +6 -8
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Index: CompoundVariable.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CompoundVariable.java 18 Aug 2003 19:40:41 -0000 1.20
+++ CompoundVariable.java 5 Oct 2003 01:05:31 -0000 1.21
@@ -68,12 +68,10 @@
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.ClassFinder;
import org.apache.log.Logger;
-import org.apache.oro.text.regex.Perl5Compiler;
/**
@@ -98,8 +96,6 @@
private boolean hasFunction, isDynamic;
private String staticSubstitution;
//private Perl5Util util = new Perl5Util();
- private Perl5Compiler compiler = new Perl5Compiler();
- private static final String unescapePattern = "[\\\\]([${}\\\\,])";
private String permanentResults = "";
LinkedList compiledComponents = new LinkedList();
@@ -299,10 +295,12 @@
{
return "";
}
-
- private JMeterVariables getVariables() //TODO: not used
+ /*
+ * NOT USED
+ *
+ private JMeterVariables getVariables()
{
return JMeterContextService.getContext().getVariables();
}
-
+ */
}
1.6 +1 -6
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/SimpleVariable.java
Index: SimpleVariable.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/SimpleVariable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleVariable.java 18 Aug 2003 19:40:41 -0000 1.5
+++ SimpleVariable.java 5 Oct 2003 01:05:31 -0000 1.6
@@ -1,8 +1,5 @@
package org.apache.jmeter.engine.util;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
@@ -13,8 +10,6 @@
public class SimpleVariable
{
- private static final String KEY = "__unknownFunction";
- private Map varMap = new HashMap();
private String name;
public SimpleVariable(String name)
1.5 +3 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/ButtonPanel.java
Index: ButtonPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/ButtonPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ButtonPanel.java 27 Jun 2003 20:37:40 -0000 1.4
+++ ButtonPanel.java 5 Oct 2003 01:05:31 -0000 1.5
@@ -105,10 +105,11 @@
}
}
+/* NOTUSED
private void initButtonMap()
{
}
-
+*/
private void init()
{
add = new JButton(JMeterUtils.getResString("add"));
1.22 +10 -10
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MenuFactory.java 7 Sep 2003 18:54:54 -0000 1.21
+++ MenuFactory.java 5 Oct 2003 01:05:31 -0000 1.22
@@ -110,15 +110,15 @@
postProcessors,
preProcessors;
- private static JMenu timerMenu;
- private static JMenu controllerMenu;
- private static JMenu generativeControllerMenu;
- private static JMenu listenerMenu;
- private static JMenu assertionMenu;
- private static JMenu configMenu;
- private static JMenu insertControllerMenu;
- private static JMenu postProcessorMenu;
- private static JMenu preProcessorMenu;
+ //private static JMenu timerMenu;
+ //private static JMenu controllerMenu;
+ //private static JMenu generativeControllerMenu;
+ //private static JMenu listenerMenu;
+ //private static JMenu assertionMenu;
+ //private static JMenu configMenu;
+ //private static JMenu insertControllerMenu;
+ //private static JMenu postProcessorMenu;
+ //private static JMenu preProcessorMenu;
static {
try
1.16 +2 -3
jakarta-jmeter/src/core/org/apache/jmeter/threads/ThreadGroup.java
Index: ThreadGroup.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/ThreadGroup.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ThreadGroup.java 7 Sep 2003 18:54:54 -0000 1.15
+++ ThreadGroup.java 5 Oct 2003 01:05:31 -0000 1.16
@@ -101,7 +101,6 @@
private final int DEFAULT_NUM_THREADS = 1;
private final int DEFAULT_RAMP_UP = 0;
private SampleQueue queue = null;
- private int threadsStarted = 0;
private LinkedList listeners = new LinkedList();
private LinkedList remoteListeners = new LinkedList();
1.6 +3 -1
jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContextService.java
Index: JMeterContextService.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContextService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMeterContextService.java 18 Aug 2003 19:40:42 -0000 1.5
+++ JMeterContextService.java 5 Oct 2003 01:05:31 -0000 1.6
@@ -67,6 +67,8 @@
static private JMeterContextService _instance = null;
static private Map contextMap = new HashMap();
+//TODO: consider using ThreadLocal instead?
+
/**
* Private constructor to prevent instantiation.
*/
1.29 +10 -1 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SaveService.java 10 Sep 2003 15:18:56 -0000 1.28
+++ SaveService.java 5 Oct 2003 01:05:31 -0000 1.29
@@ -885,6 +885,9 @@
return config;
}
+ /*
+ *
+ * NOTUSED
private static Configuration createConfigForCollection(
String propertyName,
Collection list)
@@ -920,7 +923,11 @@
}
return config;
}
+ */
+ /*
+ * NOTUSED
+ *
private static Configuration createConfigForString(String value)
{
DefaultConfiguration config =
@@ -930,6 +937,8 @@
config.setAttribute(XML_SPACE, PRESERVE);
return config;
}
+ */
+
private static Configuration createConfigForString(
String name,
1.17 +4 -4 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JMeter.java 27 Jun 2003 21:37:12 -0000 1.16
+++ JMeter.java 5 Oct 2003 01:05:32 -0000 1.17
@@ -73,7 +73,6 @@
import org.apache.jmeter.control.gui.WorkBenchGui;
import org.apache.jmeter.engine.ClientJMeterEngine;
import org.apache.jmeter.engine.JMeterEngine;
-import org.apache.jmeter.engine.RemoteJMeterEngine;
import org.apache.jmeter.engine.RemoteJMeterEngineImpl;
import org.apache.jmeter.engine.StandardJMeterEngine;
import org.apache.jmeter.engine.event.LoopIterationEvent;
@@ -238,7 +237,8 @@
JMeterTreeModel treeModel = new JMeterTreeModel();
JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
treeLis.setActionHandler(ActionRouter.getInstance());
- GuiPackage guiPack = GuiPackage.getInstance(treeLis, treeModel);
+ //NOTUSED: GuiPackage guiPack =
+ GuiPackage.getInstance(treeLis, treeModel);
org.apache.jmeter.gui.MainFrame main =
new org.apache.jmeter.gui.MainFrame(
ActionRouter.getInstance(),
@@ -456,7 +456,7 @@
{
try
{
- RemoteJMeterEngine engine = new RemoteJMeterEngineImpl();
+ new RemoteJMeterEngineImpl();
while (true)
{
Thread.sleep(Long.MAX_VALUE);
1.7 +2 -5
jakarta-jmeter/src/core/org/apache/jmeter/functions/AbstractFunction.java
Index: AbstractFunction.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/functions/AbstractFunction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractFunction.java 25 Jun 2003 21:24:11 -0000 1.6
+++ AbstractFunction.java 5 Oct 2003 01:05:32 -0000 1.7
@@ -2,10 +2,8 @@
import java.net.URLDecoder;
import java.util.Collection;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.StringTokenizer;
import org.apache.jmeter.samplers.SampleResult;
@@ -20,8 +18,7 @@
*/
public abstract class AbstractFunction implements Function
{
- private Map threadVariables = new HashMap();
-
+
/**
* @see Function#execute(SampleResult, Sampler)
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
