Author: pmouawad
Date: Fri Mar 4 22:51:47 2016
New Revision: 1733672
URL: http://svn.apache.org/viewvc?rev=1733672&view=rev
Log:
Remove commented code
Contribution by Benoit Wiart
#resolve #154
https://github.com/apache/jmeter/pull/154/
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
Fri Mar 4 22:51:47 2016
@@ -62,11 +62,6 @@ public class PropertyControlGui extends
private static final String COLUMN_NAMES_1 = "value"; // $NON-NLS-1$
- // TODO: add and delete not currently supported
- private static final String ADD = "add"; // $NON-NLS-1$
-
- private static final String DELETE = "delete"; // $NON-NLS-1$
-
private static final String SYSTEM = "system"; // $NON-NLS-1$
private static final String JMETER = "jmeter"; // $NON-NLS-1$
@@ -83,12 +78,6 @@ public class PropertyControlGui extends
/** 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;
-
public PropertyControlGui() {
super();
init();
@@ -107,17 +96,12 @@ public class PropertyControlGui extends
@Override
public void actionPerformed(ActionEvent action) {
String command = action.getActionCommand();
- if (ADD.equals(command)){
- return;
- }
- if (DELETE.equals(command)){
- return;
- }
+
if (SYSTEM.equals(command)){
setUpData();
return;
}
- if (JMETER.equals(command)){
+ else if (JMETER.equals(command)){
setUpData();
return;
}
@@ -130,6 +114,7 @@ public class PropertyControlGui extends
modifyTestElement(el);
return el;
}
+
@Override
public void configure(TestElement element) {
super.configure(element);
@@ -200,27 +185,6 @@ public class PropertyControlGui extends
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;
-// }
/**
* Initialize the components and layout of this component.
@@ -240,6 +204,7 @@ public class PropertyControlGui extends
add(p, BorderLayout.CENTER);
table.revalidate();
}
+
private void initializeTableModel() {
tableModel = new ObjectTableModel(new String[] { COLUMN_NAMES_0,
COLUMN_NAMES_1 },
new Functor[] {
@@ -247,7 +212,7 @@ public class PropertyControlGui extends
new Functor(Map.Entry.class, "getValue") // $NON-NLS-1$
},
new Functor[] {
- null, //new Functor("setName"), // $NON-NLS-1$
+ null, // $NON-NLS-1$
new Functor(Map.Entry.class,"setValue", new Class[] {
Object.class }) // $NON-NLS-1$
},
new Class[] { String.class, String.class });
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Fri Mar 4 22:51:47 2016
@@ -320,14 +320,11 @@ public class SplineVisualizer extends Ab
return;
}
- // boolean resized = true;
if (width == lastWidth && height == lastHeight) {
// dimension of the SplineGraph is the same
- // resized = false;
} else {
// dimension changed
- // resized = true;
lastWidth = width;
lastHeight = height;
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Fri Mar 4 22:51:47 2016
@@ -222,93 +222,3 @@ public class StatVisualizer extends Abst
}
}
-/**
- * Pulled this mainly out of a Core Java book to implement a sorted table -
- * haven't implemented this yet, it needs some non-trivial work done to it to
- * support our dynamically-sizing TableModel for this visualizer.
- *
- */
-
-//class SortFilterModel extends AbstractTableModel {
-// private TableModel model;
-//
-// private int sortColumn;
-//
-// private Row[] rows;
-//
-// public SortFilterModel(TableModel m) {
-// model = m;
-// rows = new Row[model.getRowCount()];
-// for (int i = 0; i < rows.length; i++) {
-// rows[i] = new Row();
-// rows[i].index = i;
-// }
-// }
-//
-// public SortFilterModel() {
-// }
-//
-// public void setValueAt(Object aValue, int r, int c) {
-// model.setValueAt(aValue, rows[r].index, c);
-// }
-//
-// public Object getValueAt(int r, int c) {
-// return model.getValueAt(rows[r].index, c);
-// }
-//
-// public boolean isCellEditable(int r, int c) {
-// return model.isCellEditable(rows[r].index, c);
-// }
-//
-// public int getRowCount() {
-// return model.getRowCount();
-// }
-//
-// public int getColumnCount() {
-// return model.getColumnCount();
-// }
-//
-// public String getColumnName(int c) {
-// return model.getColumnName(c);
-// }
-//
-// public Class getColumnClass(int c) {
-// return model.getColumnClass(c);
-// }
-//
-// public void sort(int c) {
-// sortColumn = c;
-// Arrays.sort(rows);
-// fireTableDataChanged();
-// }
-//
-// public void addMouseListener(final JTable table) {
-// table.getTableHeader().addMouseListener(new MouseAdapter() {
-// public void mouseClicked(MouseEvent event) {
-// if (event.getClickCount() < 2) {
-// return;
-// }
-// int tableColumn = table.columnAtPoint(event.getPoint());
-// int modelColumn =
table.convertColumnIndexToModel(tableColumn);
-//
-// sort(modelColumn);
-// }
-// });
-// }
-//
-// private class Row implements Comparable {
-// public int index;
-//
-// public int compareTo(Object other) {
-// Row otherRow = (Row) other;
-// Object a = model.getValueAt(index, sortColumn);
-// Object b = model.getValueAt(otherRow.index, sortColumn);
-//
-// if (a instanceof Comparable) {
-// return ((Comparable) a).compareTo(b);
-// } else {
-// return index - otherRow.index;
-// }
-// }
-// }
-//} // class SortFilterModel
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
Fri Mar 4 22:51:47 2016
@@ -40,8 +40,6 @@ public class XMLDefaultMutableTreeNode e
private static final long serialVersionUID = 240L;
private static final Logger log = LoggingManager.getLoggerForClass();
- // private static final int LIMIT_STR_SIZE = 100;
- // private boolean isRoot;
private transient Node xmlNode;
/**
Modified:
jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
(original)
+++
jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
Fri Mar 4 22:51:47 2016
@@ -35,8 +35,7 @@ import org.apache.jmeter.monitor.model.W
import org.apache.jmeter.monitor.model.WorkersImpl;
public class MonitorHandler extends DefaultHandler {
- // private boolean startDoc = false;
- // private boolean endDoc = false;
+
private final ObjectFactory factory;
private Stack<Object> stacktree;
@@ -57,8 +56,6 @@ public class MonitorHandler extends Defa
private Workers workers;
- // private List workerslist;
-
/**
* @param factory {@link ObjectFactory} to use
*/
@@ -69,7 +66,6 @@ public class MonitorHandler extends Defa
@Override
public void startDocument() throws SAXException {
- // this.startDoc = true;
// Reset all work variables so reusing the instance starts afresh.
this.stacktree = new Stack<>();
this.status = null;
@@ -85,8 +81,6 @@ public class MonitorHandler extends Defa
/** {@inheritDoc} */
@Override
public void endDocument() throws SAXException {
- // this.startDoc = false;
- // this.endDoc = true;
}
/**
Modified:
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
(original)
+++
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
Fri Mar 4 22:51:47 2016
@@ -101,8 +101,6 @@ public class JavaTest extends AbstractJa
/** The label to store in the sample result. */
private String label;
- /** The default value of the Label parameter. */
- // private static final String LABEL_DEFAULT = "JavaTest";
/** The name used to store the Label parameter. */
private static final String LABEL_NAME = "Label";
Modified:
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java
(original)
+++
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java
Fri Mar 4 22:51:47 2016
@@ -23,8 +23,6 @@ import javax.mail.event.TransportEvent;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger; // this comes out of logkit.jar and not
-// commons-logger
-
/**
* This class implements a listener for SMTP events and a monitor for all
* threads sending mail. The main purpose is to synchronize the send action
with
Modified:
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
(original)
+++
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
Fri Mar 4 22:51:47 2016
@@ -53,8 +53,6 @@ public class TCPConfigGui extends Abstra
private JCheckBox reUseConnection;
- // NOTUSED yet private JTextField filename;
-
private TristateCheckBox setNoDelay;
private TristateCheckBox closeConnection;
@@ -90,15 +88,12 @@ public class TCPConfigGui extends Abstra
// Default to original behaviour, i.e. re-use connection
reUseConnection.setSelected(element.getPropertyAsBoolean(TCPSampler.RE_USE_CONNECTION,
TCPSampler.RE_USE_CONNECTION_DEFAULT));
serverPanel.setPort(element.getPropertyAsString(TCPSampler.PORT));
- // filename.setText(element.getPropertyAsString(TCPSampler.FILENAME));
serverPanel.setResponseTimeout(element.getPropertyAsString(TCPSampler.TIMEOUT));
serverPanel.setConnectTimeout(element.getPropertyAsString(TCPSampler.TIMEOUT_CONNECT));
setNoDelay.setTristateFromProperty(element, TCPSampler.NODELAY);
-//
setNoDelay.setSelected(element.getPropertyAsBoolean(TCPSampler.NODELAY));
requestData.setInitialText(element.getPropertyAsString(TCPSampler.REQUEST));
requestData.setCaretPosition(0);
closeConnection.setTristateFromProperty(element,
TCPSampler.CLOSE_CONNECTION);
-//
closeConnection.setSelected(element.getPropertyAsBoolean(TCPSampler.CLOSE_CONNECTION,
TCPSampler.CLOSE_CONNECTION_DEFAULT));
soLinger.setText(element.getPropertyAsString(TCPSampler.SO_LINGER));
eolByte.setText(element.getPropertyAsString(TCPSampler.EOL_BYTE));
}
@@ -123,14 +118,11 @@ public class TCPConfigGui extends Abstra
element.setProperty(TCPSampler.SERVER, serverPanel.getServer());
element.setProperty(TCPSampler.RE_USE_CONNECTION,
reUseConnection.isSelected());
element.setProperty(TCPSampler.PORT, serverPanel.getPort());
- // element.setProperty(TCPSampler.FILENAME, filename.getText());
setNoDelay.setPropertyFromTristate(element, TCPSampler.NODELAY);
-// element.setProperty(TCPSampler.NODELAY, setNoDelay.isSelected());
element.setProperty(TCPSampler.TIMEOUT,
serverPanel.getResponseTimeout());
element.setProperty(TCPSampler.TIMEOUT_CONNECT,
serverPanel.getConnectTimeout(),"");
element.setProperty(TCPSampler.REQUEST, requestData.getText());
closeConnection.setPropertyFromTristate(element,
TCPSampler.CLOSE_CONNECTION); // Don't use default for saving tristates
-// element.setProperty(TCPSampler.CLOSE_CONNECTION,
closeConnection.isSelected(), TCPSampler.CLOSE_CONNECTION_DEFAULT);
element.setProperty(TCPSampler.SO_LINGER, soLinger.getText(), "");
element.setProperty(TCPSampler.EOL_BYTE, eolByte.getText(), "");
}
@@ -239,21 +231,6 @@ public class TCPConfigGui extends Abstra
return reqDataPanel;
}
- // private JPanel createFilenamePanel()//Not used yet
- // {
- //
- // JLabel label = new
JLabel(JMeterUtils.getResString("file_to_retrieve")); // $NON-NLS-1$
- //
- // filename = new JTextField(10);
- // filename.setName(FILENAME);
- // label.setLabelFor(filename);
- //
- // JPanel filenamePanel = new JPanel(new BorderLayout(5, 0));
- // filenamePanel.add(label, BorderLayout.WEST);
- // filenamePanel.add(filename, BorderLayout.CENTER);
- // return filenamePanel;
- // }
-
private void init() { // WARNING: called from ctor so must not be
overridden (i.e. must be private or final)
setLayout(new BorderLayout(0, 5));
@@ -279,7 +256,6 @@ public class TCPConfigGui extends Abstra
mainPanel.add(optionsPanel);
mainPanel.add(createRequestPanel());
- // mainPanel.add(createFilenamePanel());
add(mainPanel, BorderLayout.CENTER);
}
}
Modified:
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?rev=1733672&r1=1733671&r2=1733672&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
(original)
+++
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Fri Mar 4 22:51:47 2016
@@ -98,12 +98,7 @@ public class TCPSampler extends Abstract
private static final String ERRKEY = "ERR"; //$NON-NLS-1$ key for HashMap
- // If set, this is the regex that is used to extract the status from the
- // response
- // NOT implemented yet private static final String STATUS_REGEX =
- // JMeterUtils.getPropDefault("tcp.status.regex","");
-
- // Otherwise, the response is scanned for these strings
+ // the response is scanned for these strings
private static final String STATUS_PREFIX =
JMeterUtils.getPropDefault("tcp.status.prefix", ""); //$NON-NLS-1$
private static final String STATUS_SUFFIX =
JMeterUtils.getPropDefault("tcp.status.suffix", ""); //$NON-NLS-1$
