You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2009/04/25 01:02:12 UTC
svn commit: r768439 - in /jakarta/jmeter/trunk/src:
components/org/apache/jmeter/control/gui/
components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/control/
core/org/apache/jmeter/reporters/ core/org/apache/jmeter/util/
functions/org/apache/...
Author: sebb
Date: Fri Apr 24 23:02:11 2009
New Revision: 768439
URL: http://svn.apache.org/viewvc?rev=768439&view=rev
Log:
Fix various Eclipse warnings: delete unused code; make some vars final and private
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SlowSSLSocket.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java Fri Apr 24 23:02:11 2009
@@ -52,16 +52,19 @@
private JMeterTreeNode selected = null;
- private JComboBox nodes;
+ private final JComboBox nodes;
- private DefaultComboBoxModel nodesModel;
+ private final DefaultComboBoxModel nodesModel;
- private JLabel warningLabel;
+ private final JLabel warningLabel;
/**
* Initializes the gui panel for the ModuleController instance.
*/
public ModuleControllerGui() {
+ nodesModel = new DefaultComboBoxModel();
+ nodes = new JComboBox(nodesModel);
+ warningLabel = new JLabel(""); // $NON-NLS-1$
init();
}
@@ -172,12 +175,9 @@
JPanel modulesPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 20, 5));
JLabel nodesLabel = new JLabel(JMeterUtils.getResString("module_controller_module_to_run")); // $NON-NLS-1$
modulesPanel.add(nodesLabel);
- nodesModel = new DefaultComboBoxModel();
- nodes = new JComboBox(nodesModel);
nodesLabel.setLabelFor(nodes);
reinitialize();
modulesPanel.add(nodes);
- warningLabel = new JLabel(""); // $NON-NLS-1$
modulesPanel.add(warningLabel);
add(modulesPanel);
}
@@ -249,12 +249,9 @@
class TreeNodeWrapper {
- private JMeterTreeNode tn;
+ private final JMeterTreeNode tn;
- private String label;
-
- private TreeNodeWrapper() {
- }
+ private final String label;
public TreeNodeWrapper(JMeterTreeNode tn, String label) {
this.tn = tn;
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java Fri Apr 24 23:02:11 2009
@@ -33,10 +33,10 @@
import java.util.Properties;
import java.util.Set;
-import javax.swing.BorderFactory;
+//import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.ButtonGroup;
-import javax.swing.JButton;
+//import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -83,11 +83,11 @@
/** The model for the arguments table. */
protected transient ObjectTableModel tableModel;
- /** A button for adding new arguments to the table. */
- private JButton add;
-
- /** A button for removing arguments from the table. */
- private JButton delete;
+// /** A button for adding new arguments to the table. */
+// private JButton add;
+//
+// /** A button for removing arguments from the table. */
+// private JButton delete;
public PropertyControlGui() {
super();
@@ -196,27 +196,27 @@
return labelPanel;
}
- /**
- * Create a panel containing the add and delete buttons.
- *
- * @return a GUI panel containing the buttons
- */
- private JPanel makeButtonPanel() {// Not currently used
- add = new JButton(JMeterUtils.getResString("add")); // $NON-NLS-1$
- add.setActionCommand(ADD);
- add.setEnabled(true);
-
- delete = new JButton(JMeterUtils.getResString("delete")); // $NON-NLS-1$
- delete.setActionCommand(DELETE);
-
- JPanel buttonPanel = new JPanel();
- buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
- add.addActionListener(this);
- delete.addActionListener(this);
- buttonPanel.add(add);
- buttonPanel.add(delete);
- return buttonPanel;
- }
+// /**
+// * Create a panel containing the add and delete buttons.
+// *
+// * @return a GUI panel containing the buttons
+// */
+// private JPanel makeButtonPanel() {// Not currently used
+// add = new JButton(JMeterUtils.getResString("add")); // $NON-NLS-1$
+// add.setActionCommand(ADD);
+// add.setEnabled(true);
+//
+// delete = new JButton(JMeterUtils.getResString("delete")); // $NON-NLS-1$
+// delete.setActionCommand(DELETE);
+//
+// JPanel buttonPanel = new JPanel();
+// buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+// add.addActionListener(this);
+// delete.addActionListener(this);
+// buttonPanel.add(add);
+// buttonPanel.add(delete);
+// return buttonPanel;
+// }
/**
* Initialize the components and layout of this component.
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Fri Apr 24 23:02:11 2009
@@ -147,7 +147,6 @@
}
}
} catch (NextIsNullException e) {
- returnValue = null;
}
return returnValue;
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java Fri Apr 24 23:02:11 2009
@@ -50,7 +50,7 @@
public class FileReporter extends JPanel {
private static final Logger log = LoggingManager.getLoggerForClass();
- private Hashtable data = new Hashtable();
+ private final Hashtable data = new Hashtable();
/** initalize a file reporter from a file */
public void init(String file) throws IOException {
@@ -137,9 +137,6 @@
Vector colorList = new Vector();
- private GraphPanel() {
- }
-
public GraphPanel(Hashtable data) {
this.data = data;
Enumeration e = data.keys();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java Fri Apr 24 23:02:11 2009
@@ -49,19 +49,13 @@
serverport = port;
}
- private BeanShellServer() {// do not use!
- super();
- serverport = 0;
- serverfile = "";
- }
-
// For use by the server script
- private static String getprop(String s) {
+ static String getprop(String s) {
return JMeterUtils.getPropDefault(s, s);
}
// For use by the server script
- private static void setprop(String s, String v) {
+ static void setprop(String s, String v) {
JMeterUtils.getJMeterProperties().setProperty(s, v);
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SlowSSLSocket.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SlowSSLSocket.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SlowSSLSocket.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SlowSSLSocket.java Fri Apr 24 23:02:11 2009
@@ -43,12 +43,6 @@
private final SSLSocket sslSock; // Save the actual socket
- // Ensure we can't be called without suitable parameters
- private SlowSSLSocket(){
- CPS=0;
- throw new IllegalArgumentException("No such constructor");
- }
-
/**
* Wrap an SSLSocket with slow input and output streams
* @param sock SSLSocket to be wrapped
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java Fri Apr 24 23:02:11 2009
@@ -38,9 +38,9 @@
private static final Logger log = LoggingManager.getLoggerForClass();
- private ArrayList fileData; // Lines in the file, split into columns
+ private final ArrayList fileData; // Lines in the file, split into columns
- private String fileName; // name of the file
+ private final String fileName; // name of the file
public static final String DELIMITER
= JMeterUtils.getPropDefault("csvread.delimiter", // $NON-NLS-1$
@@ -50,17 +50,14 @@
private int nextRow;
/** Delimiter for this file */
- private String delimiter;
-
- private FileRowColContainer()// Not intended to be called directly
- {
- }
+ private final String delimiter;
public FileRowColContainer(String file, String delim) throws IOException, FileNotFoundException {
log.debug("FRCC(" + file + "," + delim + ")");
fileName = file;
delimiter = delim;
nextRow = 0;
+ fileData = new ArrayList();
load();
}
@@ -69,11 +66,11 @@
fileName = file;
delimiter = DELIMITER;
nextRow = 0;
+ fileData = new ArrayList();
load();
}
private void load() throws IOException, FileNotFoundException {
- fileData = new ArrayList();
BufferedReader myBread = null;
try {
@@ -89,11 +86,11 @@
line = myBread.readLine();
}
} catch (FileNotFoundException e) {
- fileData = null;
+ fileData.clear();
log.warn(e.toString());
throw e;
} catch (IOException e) {
- fileData = null;
+ fileData.clear();
log.warn(e.toString());
throw e;
} finally {
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java Fri Apr 24 23:02:11 2009
@@ -57,13 +57,6 @@
return nextRow;
}
- private XPathFileContainer()// Not intended to be called directly
- {
- fileName=null;
- xpath=null;
- nodeList=null;
- }
-
public XPathFileContainer(String file, String xpath) throws FileNotFoundException, IOException,
ParserConfigurationException, SAXException, TransformerException {
log.debug("XPath(" + file + ") xpath " + xpath + "");
Modified: jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java (original)
+++ jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java Fri Apr 24 23:02:11 2009
@@ -33,13 +33,11 @@
* <p>
*/
public class MonitorGraph extends JComponent implements MouseListener, MonitorGuiListener, Clearable {
- // NOTUSED protected static int width = 500;
+
private MonitorAccumModel MODEL;
private MonitorModel CURRENT;
- private boolean CPU = false;// TODO is this needed? It's never read
-
private boolean HEALTH = true;
private boolean LOAD = true;
@@ -52,33 +50,19 @@
private boolean XGRID = true;
- private int GRAPHMAX = 0;// TODO is this needed? It's never read
-
/**
- *
+ * Needed for Serialization tests.
* @deprecated Only for use in unit testing
*/
public MonitorGraph() {
// log.warn("Only for use in unit testing");
}
- /**
- *
- */
public MonitorGraph(MonitorAccumModel model) {
this.MODEL = model;
- GRAPHMAX = model.getBufferSize();
- init();
- }
-
- private void init() {
repaint();
}
- public void setCpu(boolean cpu) {
- this.CPU = cpu;
- }
-
public void setHealth(boolean health) {
this.HEALTH = health;
}
@@ -95,49 +79,29 @@
this.THREAD = thread;
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
- */
+ /** {@inheritDoc} */
public void mouseClicked(MouseEvent e) {
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent)
- */
+ /** {@inheritDoc} */
public void mouseEntered(MouseEvent e) {
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent)
- */
+ /** {@inheritDoc} */
public void mouseExited(MouseEvent e) {
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
- */
+ /** {@inheritDoc} */
public void mousePressed(MouseEvent e) {
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
- */
+ /** {@inheritDoc} */
public void mouseReleased(MouseEvent e) {
}
/**
- * The method will fist check to see if the graph is visible. If it is, it
+ * The method will first check to see if the graph is visible. If it is, it
* will repaint the graph.
*/
public void updateGui(final MonitorModel model) {
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java Fri Apr 24 23:02:11 2009
@@ -37,11 +37,7 @@
*
*/
public class URLCollection {
- Collection coll;
-
- // Inaccessible default constructor
- private URLCollection() {
- }
+ private final Collection coll;
/**
* Creates a new URLCollection from an existing Collection
@@ -109,7 +105,7 @@
*
*/
private static class UrlIterator implements Iterator {
- Iterator iter;
+ private final Iterator iter;
UrlIterator(Iterator i) {
iter = i;
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java Fri Apr 24 23:02:11 2009
@@ -27,19 +27,13 @@
*
* @version $Revision$
*/
-public class URLString implements Comparable // To allow use in Sorted
- // Collections
-{
+public class URLString implements Comparable {
- private URL url;
+ private final URL url;
- private String urlAsString;
+ private final String urlAsString;
- private int hashCode;
-
- private URLString()// not instantiable
- {
- }
+ private final int hashCode;
public URLString(URL u) {
url = u;
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Fri Apr 24 23:02:11 2009
@@ -582,24 +582,24 @@
return "";// $NON-NLS-1$
}
- /**
- * Returns the remainder of a tokenized string.
- *
- * @param tk
- * String that is partially tokenized.
- * @return The remainder
- */
- private String getRemainder(StringTokenizer tk) {
- StringBuffer strBuff = new StringBuffer();
- if (tk.hasMoreTokens()) {
- strBuff.append(tk.nextToken());
- }
- while (tk.hasMoreTokens()) {
- strBuff.append(" "); // $NON-NLS-1$
- strBuff.append(tk.nextToken());
- }
- return strBuff.toString();
- }
+// /**
+// * Returns the remainder of a tokenized string.
+// *
+// * @param tk
+// * String that is partially tokenized.
+// * @return The remainder
+// */
+// private String getRemainder(StringTokenizer tk) {
+// StringBuffer strBuff = new StringBuffer();
+// if (tk.hasMoreTokens()) {
+// strBuff.append(tk.nextToken());
+// }
+// while (tk.hasMoreTokens()) {
+// strBuff.append(" "); // $NON-NLS-1$
+// strBuff.append(tk.nextToken());
+// }
+// return strBuff.toString();
+// }
private String getUrlWithoutQuery(URL _url) {
String fullUrl = _url.toString();
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Fri Apr 24 23:02:11 2009
@@ -809,12 +809,9 @@
}
class TreeNodeWrapper {
- private JMeterTreeNode tn;
+ private final JMeterTreeNode tn;
- private String label;
-
- private TreeNodeWrapper() {
- }
+ private final String label;
public TreeNodeWrapper(JMeterTreeNode tn, String label) {
this.tn = tn;
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java Fri Apr 24 23:02:11 2009
@@ -23,8 +23,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
@@ -34,7 +32,6 @@
import org.apache.commons.cli.avalon.CLUtil;
import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.control.gui.ReportGui;
-import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.gui.ReportGuiPackage;
import org.apache.jmeter.plugin.JMeterPlugin;
import org.apache.jmeter.plugin.PluginManager;
@@ -45,11 +42,7 @@
import org.apache.jmeter.report.gui.tree.ReportTreeListener;
import org.apache.jmeter.report.gui.tree.ReportTreeModel;
import org.apache.jmeter.report.writers.gui.HTMLReportWriterGui;
-import org.apache.jmeter.samplers.Remoteable;
import org.apache.jmeter.save.SaveService;
-import org.apache.jmeter.testelement.ReportPlan;
-import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractListenerGui;
import org.apache.jorphan.collections.HashTree;
@@ -107,8 +100,6 @@
private static final int JMETER_HOME_OPT = 'd';
- private JMeterReport parent;
-
private static final CLOptionDescriptor[] options = new CLOptionDescriptor[] {
new CLOptionDescriptor("help", CLOptionDescriptor.ARGUMENT_DISALLOWED, HELP_OPT,
"print usage information and exit"),
@@ -142,8 +133,6 @@
new CLOptionDescriptor("homedir", CLOptionDescriptor.ARGUMENT_REQUIRED, JMETER_HOME_OPT,
"the jmeter home directory to use"), };
- transient boolean testEnded = false;
-
/**
*
*/
@@ -198,8 +187,6 @@
public void startNonGui(CLOption testFile, CLOption logFile){
System.setProperty(JMeter.JMETER_NON_GUI, "true");
- JMeterReport driver = new JMeterReport();
- driver.parent = this;
PluginManager.install(this, false);
}
@@ -410,110 +397,4 @@
}
}
-
- /**
- * Code copied from AbstractAction.java and modified to suit TestElements
- *
- * @param tree
- */
- private void convertSubTree(HashTree tree) {// TODO check build dependencies
- Iterator iter = new LinkedList(tree.list()).iterator();
- while (iter.hasNext()) {
- TestElement item = (TestElement) iter.next();
- if (item.isEnabled()) {
- // This is done for GUI runs in JMeterTreeModel.addSubTree()
- if (item instanceof ReportPlan) {
- ReportPlan tp = (ReportPlan) item;
- }
- // TODO handle ReplaceableControllers
- // if (item instanceof ReplaceableController)
- // {
- // System.out.println("Replaceable "+item.getClass().getName());
- // HashTree subTree = tree.getTree(item);
- //
- // if (subTree != null)
- // {
- // ReplaceableController rc =
- // (ReplaceableController) item;//.createTestElement();
- // rc.replace(subTree);
- // convertSubTree(subTree);
- // tree.replace(item, rc.getReplacement());
- // }
- // }
- // else
- {
- // System.out.println("NonReplaceable
- // "+item.getClass().getName());
- convertSubTree(tree.getTree(item));
- // TestElement testElement = item.createTestElement();
- // tree.replace(item, testElement);
- }
- } else {
- // System.out.println("Disabled "+item.getClass().getName());
- tree.remove(item);
- }
- }
- }
-
- /**
- * Listen to test and exit program after test completes, after a 5 second
- * delay to give listeners a chance to close out their files.
- */
- private static class ListenToTest implements TestListener, Runnable, Remoteable {
- int started = 0;
-
- private JMeterReport _parent;
-
- private ListenToTest(JMeterReport parent) {
- _parent = parent;
- }
-
- public synchronized void testEnded(String host) {
- started--;
- log.info("Remote host " + host + " finished");
- if (started == 0) {
- testEnded();
- }
- }
-
- public void testEnded() {
- Thread stopSoon = new Thread(this);
- stopSoon.start();
- }
-
- public synchronized void testStarted(String host) {
- started++;
- log.info("Started remote host: " + host);
- }
-
- public void testStarted() {
- log.info(JMeterUtils.getResString("running_test"));
- }
-
- /**
- * This is a hack to allow listeners a chance to close their files. Must
- * implement a queue for sample responses tied to the engine, and the
- * engine won't deliver testEnded signal till all sample responses have
- * been delivered. Should also improve performance of remote JMeter
- * testing.
- */
- public void run() {
- System.out.println("Tidying up ...");
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- // ignored
- }
- System.out.println("... end of run");
- _parent.testEnded = true;
- }
-
- /**
- * @see TestListener#testIterationStart(LoopIterationEvent)
- */
- public void testIterationStart(LoopIterationEvent event) {
- // ignored
- }
- }
-
}
\ No newline at end of file
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java Fri Apr 24 23:02:11 2009
@@ -19,7 +19,6 @@
package org.apache.jmeter.gui.util;
import java.awt.Component;
-import java.awt.event.KeyEvent;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
@@ -50,68 +49,68 @@
public class ReportMenuBar extends JMenuBar implements LocaleChangeListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- JMenu fileMenu;
+ private JMenu fileMenu;
- JMenuItem file_save_as;
+ private JMenuItem file_save_as;
- JMenuItem file_load;
+ private JMenuItem file_load;
- JMenuItem file_merge;
+ private JMenuItem file_merge;
- JMenuItem file_exit;
+ private JMenuItem file_exit;
- JMenuItem file_close;
+ private JMenuItem file_close;
- JMenu editMenu;
+ private JMenu editMenu;
- JMenu edit_add;
+ private JMenu edit_add;
// JMenu edit_add_submenu;
- JMenuItem edit_remove; // TODO - should this be created?
+ private JMenuItem edit_remove; // TODO - should this be created?
- JMenu runMenu;
+ private JMenu runMenu;
- JMenuItem run_start;
+ private JMenuItem run_start;
- JMenu remote_start;
+ private JMenu remote_start;
- JMenuItem remote_start_all;
+ private JMenuItem remote_start_all;
- Collection remote_engine_start;
+ private final Collection remote_engine_start;
- JMenuItem run_stop;
+ private JMenuItem run_stop;
private JMenuItem run_shut; // all the others could be private too?
- JMenu remote_stop;
+ private JMenu remote_stop;
- JMenuItem remote_stop_all;
+ private JMenuItem remote_stop_all;
- Collection remote_engine_stop;
+ private final Collection remote_engine_stop;
- JMenuItem run_clear;
+ private JMenuItem run_clear;
- JMenuItem run_clearAll;
+ private JMenuItem run_clearAll;
// JMenu reportMenu;
// JMenuItem analyze;
- JMenu optionsMenu;
+ private JMenu optionsMenu;
- JMenu lafMenu;
+ private JMenu lafMenu;
- JMenuItem sslManager;
+ private JMenuItem sslManager;
- JMenu helpMenu;
+ private JMenu helpMenu;
- JMenuItem help_about;
+ private JMenuItem help_about;
- String[] remoteHosts;
+ private String[] remoteHosts;
private JMenu remote_exit;
private JMenuItem remote_exit_all;
- private Collection remote_engine_exit;
+ private final Collection remote_engine_exit;
public ReportMenuBar() {
remote_engine_start = new LinkedList();
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java?rev=768439&r1=768438&r2=768439&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java Fri Apr 24 23:02:11 2009
@@ -18,7 +18,6 @@
package org.apache.jmeter.gui.util;
-import java.awt.event.KeyEvent;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -122,10 +121,6 @@
private ReportMenuFactory() {
}
- public static String doNothing() {
- return "doing nothing";
- }
-
public static void addEditMenu(JPopupMenu menu, boolean removable) {
addSeparator(menu);
if (removable) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org