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 2007/05/06 01:43:58 UTC
svn commit: r535575 [1/3] - in /jakarta/jmeter/branches/rel-2-2/src:
components/org/apache/jmeter/assertions/
components/org/apache/jmeter/assertions/gui/
components/org/apache/jmeter/control/
components/org/apache/jmeter/control/gui/ components/org/ap...
Author: sebb
Date: Sat May 5 16:43:53 2007
New Revision: 535575
URL: http://svn.apache.org/viewvc?view=rev&rev=535575
Log:
Add NLS markers
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/XMLAssertion.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ForeachController.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/InterleaveControl.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ModuleController.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ThroughputController.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/UserParameters.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantTimer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/UniformRandomTimer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/Arguments.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/LoginConfig.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/IfController.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/RunTime.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/SimpleVariable.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/MainFrame.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/OnErrorPanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ExitCommand.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestPlan.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/ThreadNumber.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java Sat May 5 16:43:53 2007
@@ -23,7 +23,6 @@
* one calculated from the response OR when the expected hex is left empty.
*
* @author <a href="mailto:jh@domek.be">Jorg Heymans</a>
- * @version $Revision$ last updated $Date$
*/
package org.apache.jmeter.assertions;
@@ -78,7 +77,7 @@
result.setFailure(true);
Object[] arguments = { md5Result, getAllowedMD5Hex() };
- String message = MessageFormat.format(JMeterUtils.getResString("md5hex_assertion_failure"), arguments);
+ String message = MessageFormat.format(JMeterUtils.getResString("md5hex_assertion_failure"), arguments); // $NON-NLS-1$
result.setFailureMessage(message);
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/SizeAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/SizeAssertion.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/SizeAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/SizeAssertion.java Sat May 5 16:43:53 2007
@@ -31,7 +31,6 @@
* Checks if the results of a Sample matches a particular size.
*
* @author <a href="mailto:wolfram.rittmeyer@web.de">Wolfram Rittmeyer</a>
- * @version $Revision$, $Date$
*/
public class SizeAssertion extends AbstractTestElement implements Serializable, Assertion {
@@ -75,7 +74,7 @@
if ((!(compareSize(resultSize)) && (getAllowedSize() > 0))) {
result.setFailure(true);
Object[] arguments = { new Long(resultSize), comparatorErrorMessage, new Long(getAllowedSize()) };
- String message = MessageFormat.format(JMeterUtils.getResString("size_assertion_failure"), arguments);
+ String message = MessageFormat.format(JMeterUtils.getResString("size_assertion_failure"), arguments); //$NON-NLS-1$
result.setFailureMessage(message);
}
return result;
@@ -119,7 +118,7 @@
*/
public void setAllowedSize(long size) throws IllegalArgumentException {
if (size < 0L) {
- throw new IllegalArgumentException(JMeterUtils.getResString("argument_must_not_be_negative"));
+ throw new IllegalArgumentException(JMeterUtils.getResString("argument_must_not_be_negative")); //$NON-NLS-1$
}
if (size == Long.MAX_VALUE) {
setProperty(new LongProperty(SIZE_KEY, 0));
@@ -142,27 +141,27 @@
switch (comp) {
case EQUAL:
result = (resultSize == getAllowedSize());
- comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_equal");
+ comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_equal"); //$NON-NLS-1$
break;
case NOTEQUAL:
result = (resultSize != getAllowedSize());
- comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_notequal");
+ comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_notequal"); //$NON-NLS-1$
break;
case GREATERTHAN:
result = (resultSize > getAllowedSize());
- comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_greater");
+ comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_greater"); //$NON-NLS-1$
break;
case LESSTHAN:
result = (resultSize < getAllowedSize());
- comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_less");
+ comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_less"); //$NON-NLS-1$
break;
case GREATERTHANEQUAL:
result = (resultSize >= getAllowedSize());
- comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_greaterequal");
+ comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_greaterequal"); //$NON-NLS-1$
break;
case LESSTHANEQUAL:
result = (resultSize <= getAllowedSize());
- comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_lessequal");
+ comparatorErrorMessage = JMeterUtils.getResString("size_assertion_comparator_error_lessequal"); //$NON-NLS-1$
break;
}
return result;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/XMLAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/XMLAssertion.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/XMLAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/XMLAssertion.java Sat May 5 16:43:53 2007
@@ -33,11 +33,12 @@
* Checks if the result is a well-formed XML content using jdom
*
* @author <a href="mailto:gottfried@szing.at">Gottfried Szing</a>
- * @version $Revision$, $Date$
*/
public class XMLAssertion extends AbstractTestElement implements Serializable, Assertion {
private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final char NEW_LINE = '\n'; // $NON-NLS-1$
+
// one builder for all requests in a thread
private static ThreadLocal myBuilder = new ThreadLocal() {
protected Object initialValue() {
@@ -85,7 +86,7 @@
*/
private byte[] getResultBody(byte[] resultData) {
for (int i = 0; i < (resultData.length - 1); i++) {
- if (resultData[i] == '\n' && resultData[i + 1] == '\n') {
+ if (resultData[i] == NEW_LINE && resultData[i + 1] == NEW_LINE) {
return getByteArraySlice(resultData, (i + 2), resultData.length - 1);
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java Sat May 5 16:43:53 2007
@@ -44,11 +44,10 @@
/**
* GUI interface for a {@link ResponseAssertion}.
*
- * @version $Revision$ on $Date$
*/
public class AssertionGui extends AbstractAssertionGui {
/** The name of the table column in the list of patterns. */
- private static final String COL_NAME = JMeterUtils.getResString("assertion_patterns_to_test");
+ private static final String COL_NAME = JMeterUtils.getResString("assertion_patterns_to_test"); //$NON-NLS-1$
/** Radio button indicating that the text response should be tested. */
private JRadioButton responseStringButton;
@@ -111,7 +110,7 @@
}
public String getLabelResource() {
- return "assertion_title";
+ return "assertion_title"; // $NON-NLS-1$
}
/* Implements JMeterGUIComponent.createTestElement() */
@@ -265,12 +264,12 @@
*/
private JPanel createFieldPanel() {
JPanel panel = new JPanel();
- panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("assertion_resp_field")));
+ panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("assertion_resp_field"))); //$NON-NLS-1$
- responseStringButton = new JRadioButton(JMeterUtils.getResString("assertion_text_resp"));
- urlButton = new JRadioButton(JMeterUtils.getResString("assertion_url_samp"));
- responseCodeButton = new JRadioButton(JMeterUtils.getResString("assertion_code_resp"));
- responseMessageButton = new JRadioButton(JMeterUtils.getResString("assertion_message_resp"));
+ responseStringButton = new JRadioButton(JMeterUtils.getResString("assertion_text_resp")); //$NON-NLS-1$
+ urlButton = new JRadioButton(JMeterUtils.getResString("assertion_url_samp")); //$NON-NLS-1$
+ responseCodeButton = new JRadioButton(JMeterUtils.getResString("assertion_code_resp")); //$NON-NLS-1$
+ responseMessageButton = new JRadioButton(JMeterUtils.getResString("assertion_message_resp")); //$NON-NLS-1$
ButtonGroup group = new ButtonGroup();
group.add(responseStringButton);
@@ -285,7 +284,7 @@
responseStringButton.setSelected(true);
- assumeSuccess = new JCheckBox(JMeterUtils.getResString("assertion_assume_success"));
+ assumeSuccess = new JCheckBox(JMeterUtils.getResString("assertion_assume_success")); //$NON-NLS-1$
panel.add(assumeSuccess);
return panel;
@@ -299,24 +298,24 @@
*/
private JPanel createTypePanel() {
JPanel panel = new JPanel();
- panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("assertion_pattern_match_rules")));
+ panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("assertion_pattern_match_rules"))); //$NON-NLS-1$
ButtonGroup group = new ButtonGroup();
- containsBox = new JRadioButton(JMeterUtils.getResString("assertion_contains"));
+ containsBox = new JRadioButton(JMeterUtils.getResString("assertion_contains")); //$NON-NLS-1$
group.add(containsBox);
containsBox.setSelected(true);
panel.add(containsBox);
- matchesBox = new JRadioButton(JMeterUtils.getResString("assertion_matches"));
+ matchesBox = new JRadioButton(JMeterUtils.getResString("assertion_matches")); //$NON-NLS-1$
group.add(matchesBox);
panel.add(matchesBox);
- equalsBox = new JRadioButton(JMeterUtils.getResString("assertion_equals"));
+ equalsBox = new JRadioButton(JMeterUtils.getResString("assertion_equals")); //$NON-NLS-1$
group.add(equalsBox);
panel.add(equalsBox);
- notBox = new JCheckBox(JMeterUtils.getResString("assertion_not"));
+ notBox = new JCheckBox(JMeterUtils.getResString("assertion_not")); //$NON-NLS-1$
panel.add(notBox);
return panel;
@@ -340,7 +339,7 @@
JPanel panel = new JPanel();
panel.setLayout(new BorderLayout());
- panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("assertion_patterns_to_test")));
+ panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("assertion_patterns_to_test"))); //$NON-NLS-1$
panel.add(new JScrollPane(stringTable), BorderLayout.CENTER);
panel.add(createButtonPanel(), BorderLayout.SOUTH);
@@ -354,10 +353,10 @@
* @return the new panel with add and delete buttons
*/
private JPanel createButtonPanel() {
- addPattern = new JButton(JMeterUtils.getResString("add"));
+ addPattern = new JButton(JMeterUtils.getResString("add")); //$NON-NLS-1$
addPattern.addActionListener(new AddPatternListener());
- deletePattern = new JButton(JMeterUtils.getResString("delete"));
+ deletePattern = new JButton(JMeterUtils.getResString("delete")); //$NON-NLS-1$
deletePattern.addActionListener(new ClearPatternsListener());
deletePattern.setEnabled(false);
@@ -370,8 +369,6 @@
/**
* An ActionListener for deleting a pattern.
*
- * @author
- * @version $Revision$ Last updated: $Date$
*/
private class ClearPatternsListener implements ActionListener {
public void actionPerformed(ActionEvent e) {
@@ -390,7 +387,6 @@
/**
* An ActionListener for adding a pattern.
*
- * @version $Revision$ Last updated: $Date$
*/
private class AddPatternListener implements ActionListener {
public void actionPerformed(ActionEvent e) {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java Sat May 5 16:43:53 2007
@@ -31,15 +31,11 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-/**
- * @version $Revision$ $Date$
- */
public class BeanShellAssertionGui extends AbstractAssertionGui {
private JTextField filename;// script file name (if present)
- private JTextField parameters;// parameters to pass to script file (or
- // script)
+ private JTextField parameters;// parameters to pass to script file (or script)
private JTextArea scriptField;// script area
@@ -74,12 +70,12 @@
}
public String getLabelResource() {
- return "bsh_assertion_title";
+ return "bsh_assertion_title"; // $NON-NLS-1$
}
private JPanel createFilenamePanel()// TODO ought to be a FileChooser ...
{
- JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_file"));
+ JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_file")); //$NON-NLS-1$
filename = new JTextField(10);
filename.setName(BeanShellAssertion.FILENAME);
@@ -92,7 +88,7 @@
}
private JPanel createParameterPanel() {
- JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_parameters"));
+ JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_parameters")); //$NON-NLS-1$
parameters = new JTextField(10);
parameters.setName(BeanShellAssertion.PARAMETERS);
@@ -126,14 +122,14 @@
scriptField.setLineWrap(true);
scriptField.setWrapStyleWord(true);
- JLabel label = new JLabel(JMeterUtils.getResString("bsh_assertion_script"));
+ JLabel label = new JLabel(JMeterUtils.getResString("bsh_assertion_script")); //$NON-NLS-1$
label.setLabelFor(scriptField);
JPanel panel = new JPanel(new BorderLayout());
panel.add(label, BorderLayout.NORTH);
panel.add(new JScrollPane(scriptField), BorderLayout.CENTER);
- JTextArea explain = new JTextArea(JMeterUtils.getResString("bsh_assertion_script_variables"));
+ JTextArea explain = new JTextArea(JMeterUtils.getResString("bsh_assertion_script_variables")); //$NON-NLS-1$
explain.setLineWrap(true);
explain.setEditable(false);
explain.setBackground(this.getBackground());
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java Sat May 5 16:43:53 2007
@@ -80,7 +80,7 @@
* Returns the label to be shown within the JTree-Component.
*/
public String getLabelResource() {
- return "html_assertion_title";
+ return "html_assertion_title"; // $NON-NLS-1$
}
/**
@@ -205,7 +205,7 @@
docTypeBox = new JComboBox(new Object[] { "omit", "auto", "strict", "loose" });
docTypeBox.addFocusListener(this);
// docTypePanel.add(new
- // JLabel(JMeterUtils.getResString("duration_assertion_label")));
+ // JLabel(JMeterUtils.getResString("duration_assertion_label"))); //$NON-NLS-1$
docTypePanel.add(new JLabel("Doctype:"));
docTypePanel.add(docTypeBox);
assertionPanel.add(docTypePanel);
@@ -234,17 +234,17 @@
// thresholds
HorizontalPanel thresholdPanel = new HorizontalPanel();
thresholdPanel.add(new JLabel("Error threshold:"));
- errorThresholdField = new JTextField("0", 5);
+ errorThresholdField = new JTextField("0", 5); // $NON-NLS-1$
errorThresholdField.addFocusListener(this);
thresholdPanel.add(errorThresholdField);
thresholdPanel.add(new JLabel("Warning threshold:"));
- warningThresholdField = new JTextField("0", 5);
+ warningThresholdField = new JTextField("0", 5); // $NON-NLS-1$
warningThresholdField.addFocusListener(this);
thresholdPanel.add(warningThresholdField);
assertionPanel.add(thresholdPanel);
// file panel
- filePanel = new FilePanel(JMeterUtils.getResString("file_visualizer_output_file"), ".txt");
+ filePanel = new FilePanel(JMeterUtils.getResString("file_visualizer_output_file"), ".txt"); //$NON-NLS-1$ //$NON-NLS-2$
filePanel.addChangeListener(this);
assertionPanel.add(filePanel);
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java Sat May 5 16:43:53 2007
@@ -19,8 +19,6 @@
/**
* GUI class supporting the MD5Hex assertion functionality.
*
- * @version $Revision$ updated on $Date$
- *
*/
package org.apache.jmeter.assertions.gui;
@@ -55,10 +53,10 @@
// USER_INPUT
HorizontalPanel md5HexPanel = new HorizontalPanel();
- md5HexPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
- .getResString("md5hex_assertion_md5hex_test")));
+ md5HexPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+ JMeterUtils.getResString("md5hex_assertion_md5hex_test"))); // $NON-NLS-1$
- md5HexPanel.add(new JLabel(JMeterUtils.getResString("md5hex_assertion_label")));
+ md5HexPanel.add(new JLabel(JMeterUtils.getResString("md5hex_assertion_label"))); //$NON-NLS-1$
md5HexInput = new JTextField(25);
// md5HexInput.addFocusListener(this);
@@ -76,7 +74,7 @@
}
public String getLabelResource() {
- return "md5hex_assertion_title";
+ return "md5hex_assertion_title"; // $NON-NLS-1$
}
/*
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java Sat May 5 16:43:53 2007
@@ -22,9 +22,6 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.gui.layout.VerticalLayout;
-/**
- * @version $Revision$, $Date$
- */
public class XMLAssertionGui extends AbstractAssertionGui {
/**
* The constructor.
@@ -37,7 +34,7 @@
* Returns the label to be shown within the JTree-Component.
*/
public String getLabelResource() {
- return "xml_assertion_title";
+ return "xml_assertion_title"; // $NON-NLS-1$
}
public TestElement createTestElement() {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java Sat May 5 16:43:53 2007
@@ -66,7 +66,7 @@
*/
public JCheckBox getNamespace() {
if (namespace == null) {
- namespace = new JCheckBox(JMeterUtils.getResString("xml_namespace_button"));
+ namespace = new JCheckBox(JMeterUtils.getResString("xml_namespace_button")); //$NON-NLS-1$
}
return namespace;
}
@@ -76,7 +76,7 @@
*/
public JCheckBox getTolerant() {
if (tolerant == null) {
- tolerant = new JCheckBox(JMeterUtils.getResString("xml_tolerant_button"));
+ tolerant = new JCheckBox(JMeterUtils.getResString("xml_tolerant_button")); //$NON-NLS-1$
tolerant.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -92,7 +92,7 @@
*/
public JCheckBox getValidate() {
if (validate == null) {
- validate = new JCheckBox(JMeterUtils.getResString("xml_validate_button"));
+ validate = new JCheckBox(JMeterUtils.getResString("xml_validate_button")); //$NON-NLS-1$
}
return validate;
}
@@ -102,7 +102,7 @@
*/
public JCheckBox getWhitespace() {
if (whitespace == null) {
- whitespace = new JCheckBox(JMeterUtils.getResString("xml_whitespace_button"));
+ whitespace = new JCheckBox(JMeterUtils.getResString("xml_whitespace_button")); //$NON-NLS-1$
}
return whitespace;
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ForeachController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ForeachController.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ForeachController.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ForeachController.java Sat May 5 16:43:53 2007
@@ -27,24 +27,18 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Dolf Smits
- * @author Michael Stover
- * @author Thad Smith
- * @version $Revision$
- */
public class ForeachController extends GenericController implements Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
- private final static String INPUTVAL = "ForeachController.inputVal";
+ private final static String INPUTVAL = "ForeachController.inputVal";// $NON-NLS-1$
- private final static String RETURNVAL = "ForeachController.returnVal";
+ private final static String RETURNVAL = "ForeachController.returnVal";// $NON-NLS-1$
- private final static String USE_SEPARATOR = "ForeachController.useSeparator";
+ private final static String USE_SEPARATOR = "ForeachController.useSeparator";// $NON-NLS-1$
private int loopCount = 0;
- private static final String DEFAULT_SEPARATOR = "_";
+ private static final String DEFAULT_SEPARATOR = "_";// $NON-NLS-1$
public ForeachController() {
}
@@ -130,7 +124,7 @@
*/
private boolean emptyList() {
JMeterContext context = getThreadContext();
- String inputVariable = getInputVal() + getSeparator() + "1";
+ String inputVariable = getInputVal() + getSeparator() + "1";// $NON-NLS-1$
if (context.getVariables().get(inputVariable) != null) {
return false;
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/InterleaveControl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/InterleaveControl.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/InterleaveControl.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/InterleaveControl.java Sat May 5 16:43:53 2007
@@ -24,12 +24,8 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.IntegerProperty;
-/**
- * @author Michael Stover Created March 13, 2001
- * @version $Revision$ Last updated: $Date$
- */
public class InterleaveControl extends GenericController implements Serializable {
- private static final String STYLE = "InterleaveControl.style";
+ private static final String STYLE = "InterleaveControl.style";// $NON-NLS-1$
public static final int IGNORE_SUB_CONTROLLERS = 0;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ModuleController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ModuleController.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ModuleController.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ModuleController.java Sat May 5 16:43:53 2007
@@ -32,8 +32,6 @@
import org.apache.jmeter.testelement.property.NullProperty;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.ListedHashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
/**
* The goal of ModuleController is to add modularity to JMeter. The general idea
@@ -48,12 +46,10 @@
* (which user logs in, which account is created, etc.) of the module.
*
* @author Thad Smith
- * @version $Revision$
*/
public class ModuleController extends GenericController implements ReplaceableController {
- private static final Logger log = LoggingManager.getLoggerForClass();
- private static final String NODE_PATH = "ModuleController.node_path";
+ private static final String NODE_PATH = "ModuleController.node_path";// $NON-NLS-1$
private JMeterTreeNode selectedNode = null;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ThroughputController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ThroughputController.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ThroughputController.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/ThroughputController.java Sat May 5 16:43:53 2007
@@ -38,7 +38,6 @@
* (BYPERCENT)
*
* @author Thad Smith
- * @version $Revision$
*/
public class ThroughputController extends GenericController implements Serializable, LoopIterationListener,
TestListener {
@@ -47,13 +46,13 @@
public static final int BYPERCENT = 1;
- private static final String STYLE = "ThroughputController.style";
+ private static final String STYLE = "ThroughputController.style";// $NON-NLS-1$
- private static final String PERTHREAD = "ThroughputController.perThread";
+ private static final String PERTHREAD = "ThroughputController.perThread";// $NON-NLS-1$
- private static final String MAXTHROUGHPUT = "ThroughputController.maxThroughput";
+ private static final String MAXTHROUGHPUT = "ThroughputController.maxThroughput";// $NON-NLS-1$
- private static final String PERCENTTHROUGHPUT = "ThroughputController.percentThroughput";
+ private static final String PERCENTTHROUGHPUT = "ThroughputController.percentThroughput";// $NON-NLS-1$
private int globalNumExecutions;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java Sat May 5 16:43:53 2007
@@ -22,12 +22,11 @@
/**
* GUI for RandomOrderController.
*
- * @version $Revision$ updated on $Date$
*/
public class RandomOrderControllerGui extends LogicControllerGui {
public String getLabelResource() {
- return "random_order_control_title";
+ return "random_order_control_title"; // $NON-NLS-1$
}
/*
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java Sat May 5 16:43:53 2007
@@ -113,7 +113,7 @@
}
public String getLabelResource() {
- return "throughput_control_title";
+ return "throughput_control_title"; // $NON-NLS-1$
}
private void init() {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java Sat May 5 16:43:53 2007
@@ -44,10 +44,6 @@
// @see org.apache.jmeter.extractor.TestRegexExtractor for unit tests
-/**
- *
- * @version $Revision$
- */
public class RegexExtractor extends AbstractTestElement implements PostProcessor, Serializable {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java Sat May 5 16:43:53 2007
@@ -51,7 +51,7 @@
private JCheckBox tolerant;
public String getLabelResource() {
- return "xpath_extractor_title";
+ return "xpath_extractor_title"; //$NON-NLS-1$
}
public XPathExtractorGui(){
@@ -106,7 +106,7 @@
Box box = Box.createVerticalBox();
box.add(makeTitlePanel());
- tolerant = new JCheckBox(JMeterUtils.getResString("xpath_extractor_tolerant"));
+ tolerant = new JCheckBox(JMeterUtils.getResString("xpath_extractor_tolerant"));//$NON-NLS-1$
box.add(tolerant);
add(box, BorderLayout.NORTH);
add(makeParameterPanel(), BorderLayout.CENTER);
@@ -114,9 +114,9 @@
private JPanel makeParameterPanel() {
- xpathQueryField = new JLabeledTextField(JMeterUtils.getResString("xpath_extractor_query"));
- defaultField = new JLabeledTextField(JMeterUtils.getResString("default_value_field"));
- refNameField = new JLabeledTextField(JMeterUtils.getResString("ref_name_field"));
+ xpathQueryField = new JLabeledTextField(JMeterUtils.getResString("xpath_extractor_query"));//$NON-NLS-1$
+ defaultField = new JLabeledTextField(JMeterUtils.getResString("default_value_field"));//$NON-NLS-1$
+ refNameField = new JLabeledTextField(JMeterUtils.getResString("ref_name_field"));//$NON-NLS-1$
JPanel panel = new JPanel(new GridBagLayout());
GridBagConstraints gbc = new GridBagConstraints();
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/UserParameters.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/UserParameters.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/UserParameters.java Sat May 5 16:43:53 2007
@@ -34,17 +34,14 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @version $Revision$
- */
public class UserParameters extends AbstractTestElement implements Serializable, PreProcessor, LoopIterationListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- public static final String NAMES = "UserParameters.names";
+ public static final String NAMES = "UserParameters.names";// $NON-NLS-1$
- public static final String THREAD_VALUES = "UserParameters.thread_values";
+ public static final String THREAD_VALUES = "UserParameters.thread_values";// $NON-NLS-1$
- public static final String PER_ITERATION = "UserParameters.per_iteration";
+ public static final String PER_ITERATION = "UserParameters.per_iteration";// $NON-NLS-1$
/*
* Although the lock appears to be an instance lock, in fact the lock is
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java Sat May 5 16:43:53 2007
@@ -47,13 +47,10 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @version $Revision$
- */
public class UserParametersGui extends AbstractPreProcessorGui {
private static Logger log = LoggingManager.getLoggerForClass();
- private String THREAD_COLUMNS = JMeterUtils.getResString("user");
+ private String THREAD_COLUMNS_PREFIX = JMeterUtils.getResString("user") + "_"; // $NON-NLS-1$ $NON-NLS-2$
private JTable paramTable;
@@ -71,7 +68,7 @@
}
public String getLabelResource() {
- return "user_parameters_title";
+ return "user_parameters_title"; // $NON-NLS-1$
}
public void configure(TestElement el) {
@@ -87,7 +84,7 @@
}
int count = 2;
while (iter.hasNext()) {
- String colName = THREAD_COLUMNS + "_" + count;
+ String colName = THREAD_COLUMNS_PREFIX + count;
tableModel.addNewColumn(colName, String.class);
tableModel.setColumnData(count, (List) iter.next().getObjectValue());
count++;
@@ -115,12 +112,12 @@
paramTable.getCellEditor().stopCellEditing();
}
((UserParameters) params).setNames(new CollectionProperty(UserParameters.NAMES, tableModel
- .getColumnData(JMeterUtils.getResString("name"))));
+ .getColumnData(JMeterUtils.getResString("name")))); // $NON-NLS-1$
CollectionProperty threadLists = new CollectionProperty(UserParameters.THREAD_VALUES, new ArrayList());
log.debug("making threadlists from gui = " + threadLists);
for (int x = 1; x < tableModel.getColumnCount(); x++) {
- threadLists.addItem(tableModel.getColumnData(THREAD_COLUMNS + "_" + x));
- log.debug("Adding column to threadlist: " + tableModel.getColumnData(THREAD_COLUMNS + "_" + x));
+ threadLists.addItem(tableModel.getColumnData(THREAD_COLUMNS_PREFIX + x));
+ log.debug("Adding column to threadlist: " + tableModel.getColumnData(THREAD_COLUMNS_PREFIX + x));
log.debug("Threadlists now = " + threadLists);
}
log.debug("In the end, threadlists = " + threadLists);
@@ -146,7 +143,7 @@
JPanel vertPanel = new VerticalPanel();
vertPanel.add(makeTitlePanel());
- perIterationCheck = new JCheckBox(JMeterUtils.getResString("update_per_iter"), true);
+ perIterationCheck = new JCheckBox(JMeterUtils.getResString("update_per_iter"), true); // $NON-NLS-1$
Box perIterationPanel = Box.createHorizontalBox();
perIterationPanel.add(perIterationCheck);
perIterationPanel.add(Box.createHorizontalGlue());
@@ -157,7 +154,7 @@
}
private JPanel makeParameterPanel() {
- JLabel tableLabel = new JLabel(JMeterUtils.getResString("user_parameters_table"));
+ JLabel tableLabel = new JLabel(JMeterUtils.getResString("user_parameters_table")); // $NON-NLS-1$
initTableModel();
paramTable = new JTable(tableModel);
// paramTable.setRowSelectionAllowed(true);
@@ -177,17 +174,17 @@
}
protected void initTableModel() {
- tableModel = new PowerTableModel(new String[] { JMeterUtils.getResString("name"),
- THREAD_COLUMNS + "_" + numUserColumns }, new Class[] { String.class, String.class });
+ tableModel = new PowerTableModel(new String[] { JMeterUtils.getResString("name"), // $NON-NLS-1$
+ THREAD_COLUMNS_PREFIX + numUserColumns }, new Class[] { String.class, String.class });
}
private JPanel makeButtonPanel() {
JPanel buttonPanel = new JPanel();
buttonPanel.setLayout(new GridLayout(2, 2));
- addParameterButton = new JButton(JMeterUtils.getResString("add_parameter"));
- addUserButton = new JButton(JMeterUtils.getResString("add_user"));
- deleteRowButton = new JButton(JMeterUtils.getResString("delete_parameter"));
- deleteColumnButton = new JButton(JMeterUtils.getResString("delete_user"));
+ addParameterButton = new JButton(JMeterUtils.getResString("add_parameter")); // $NON-NLS-1$
+ addUserButton = new JButton(JMeterUtils.getResString("add_user")); // $NON-NLS-1$
+ deleteRowButton = new JButton(JMeterUtils.getResString("delete_parameter")); // $NON-NLS-1$
+ deleteColumnButton = new JButton(JMeterUtils.getResString("delete_user")); // $NON-NLS-1$
buttonPanel.add(addParameterButton);
buttonPanel.add(deleteRowButton);
buttonPanel.add(addUserButton);
@@ -228,7 +225,7 @@
cellEditor.stopCellEditing();
}
- tableModel.addNewColumn(THREAD_COLUMNS + "_" + tableModel.getColumnCount(), String.class);
+ tableModel.addNewColumn(THREAD_COLUMNS_PREFIX + tableModel.getColumnCount(), String.class);
tableModel.fireTableDataChanged();
// Enable DELETE (which may already be enabled, but it won't hurt)
@@ -283,7 +280,9 @@
int colSelected = paramTable.getSelectedColumn();
if (colSelected == 0 || colSelected == 1) {
- JOptionPane.showMessageDialog(null, JMeterUtils.getResString("column_delete_disallowed"), "Error",
+ JOptionPane.showMessageDialog(null,
+ JMeterUtils.getResString("column_delete_disallowed"), // $NON-NLS-1$
+ "Error",
JOptionPane.ERROR_MESSAGE);
return;
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java Sat May 5 16:43:53 2007
@@ -39,9 +39,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
-/**
- * @version $Revision$
- */
public class TestActionGui extends AbstractSamplerGui {
// Gui components
private JComboBox targetBox;
@@ -61,19 +58,19 @@
private int duration;
// String in the panel
- private static final String targetLabel = JMeterUtils.getResString("test_action_target");
+ private static final String targetLabel = JMeterUtils.getResString("test_action_target"); // $NON-NLS-1$
- private static final String threadTarget = JMeterUtils.getResString("test_action_target_thread");
+ private static final String threadTarget = JMeterUtils.getResString("test_action_target_thread"); // $NON-NLS-1$
- private static final String testTarget = JMeterUtils.getResString("test_action_target_test");
+ private static final String testTarget = JMeterUtils.getResString("test_action_target_test"); // $NON-NLS-1$
- private static final String actionLabel = JMeterUtils.getResString("test_action_action");
+ private static final String actionLabel = JMeterUtils.getResString("test_action_action"); // $NON-NLS-1$
- private static final String pauseAction = JMeterUtils.getResString("test_action_pause");
+ private static final String pauseAction = JMeterUtils.getResString("test_action_pause"); // $NON-NLS-1$
- private static final String stopAction = JMeterUtils.getResString("test_action_stop");
+ private static final String stopAction = JMeterUtils.getResString("test_action_stop"); // $NON-NLS-1$
- private static final String durationLabel = JMeterUtils.getResString("test_action_duration");
+ private static final String durationLabel = JMeterUtils.getResString("test_action_duration"); // $NON-NLS-1$
public TestActionGui() {
super();
@@ -83,7 +80,7 @@
}
public String getLabelResource() {
- return "test_action_title";
+ return "test_action_title"; // $NON-NLS-1$
}
public void configure(TestElement element) {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Sat May 5 16:43:53 2007
@@ -208,7 +208,7 @@
* @return the description of this timer class.
*/
public String toString() {
- return JMeterUtils.getResString("constant_throughput_timer_memo");
+ return JMeterUtils.getResString("constant_throughput_timer_memo"); //$NON-NLS-1$
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantTimer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantTimer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/ConstantTimer.java Sat May 5 16:43:53 2007
@@ -31,11 +31,10 @@
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
- * @version $Revision$ $Date$
*/
public class ConstantTimer extends AbstractTestElement implements Timer, Serializable, LoopIterationListener {
- public final static String DELAY = "ConstantTimer.delay";
+ public final static String DELAY = "ConstantTimer.delay"; //$NON-NLS-1$
private long delay = 0;
@@ -93,7 +92,7 @@
* @return the description of this timer class.
*/
public String toString() {
- return JMeterUtils.getResString("constant_timer_memo");
+ return JMeterUtils.getResString("constant_timer_memo"); //$NON-NLS-1$
}
/**
@@ -105,16 +104,4 @@
delay = getPropertyAsLong(DELAY);
}
-
- /*
- * This method doesn't appear to be used anymore. jeremy_a@bigfoot.com 02
- * May 2003
- *
- * Make changes to variables available elsewhere.
- *
- * @see ThreadListener#setJMeterVariables(JMeterVariables) public void
- * setJMeterVariables(JMeterVariables jmVars) {
- * //vars.addJMeterVariables(jmVars); }
- */
-
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java Sat May 5 16:43:53 2007
@@ -29,7 +29,6 @@
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
- * @version $Id$
*/
public class GaussianRandomTimer extends RandomTimer implements Serializable {
public long delay() {
@@ -37,6 +36,6 @@
}
public String toString() {
- return JMeterUtils.getResString("gaussian_timer_memo");
+ return JMeterUtils.getResString("gaussian_timer_memo"); //$NON-NLS-1$
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/UniformRandomTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/UniformRandomTimer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/UniformRandomTimer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/UniformRandomTimer.java Sat May 5 16:43:53 2007
@@ -28,7 +28,6 @@
* distributed variation.
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision$ $Date$
*/
public class UniformRandomTimer extends RandomTimer implements Serializable {
public long delay() {
@@ -36,7 +35,7 @@
}
public String toString() {
- return JMeterUtils.getResString("uniform_timer_memo");
+ return JMeterUtils.getResString("uniform_timer_memo"); //$NON-NLS-1$
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java Sat May 5 16:43:53 2007
@@ -63,7 +63,7 @@
}
public String getLabelResource() {
- return "constant_timer_title";
+ return "constant_timer_title"; // $NON-NLS-1$
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java Sat May 5 16:43:53 2007
@@ -38,7 +38,6 @@
/**
* Implementation of a gaussian random timer.
*
- * @version $Revision$ last updated $Date$
*/
public class GaussianRandomTimerGui extends AbstractTimerGui {
@@ -46,9 +45,9 @@
private static final String RANGE_FIELD = "Range Field";
- public static final String DEFAULT_DELAY = "300";
+ private static final String DEFAULT_DELAY = "300"; // $NON-NLS-1$
- public static final String DEFAULT_RANGE = "100.0";
+ private static final String DEFAULT_RANGE = "100.0"; // $NON-NLS-1$
private JTextField delayField;
@@ -121,8 +120,8 @@
JPanel threadDelayPropsPanel = new JPanel();
threadDelayPropsPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- threadDelayPropsPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
- .getResString("thread_delay_properties")));//$NON-NLS-1$
+ threadDelayPropsPanel.setBorder(BorderFactory.createTitledBorder(
+ JMeterUtils.getResString("thread_delay_properties")));//$NON-NLS-1$
// DELAY DEVIATION
Box delayDevPanel = Box.createHorizontalBox();
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java Sat May 5 16:43:53 2007
@@ -36,17 +36,17 @@
/**
* Implementation of a uniform random timer.
*
- * @version $Id$
*/
public class UniformRandomTimerGui extends AbstractTimerGui {
+ // TODO - are these gui item names needed?
private static final String DELAY_FIELD = "Delay Field";
private static final String RANGE_FIELD = "Range Field";
- public static final String DEFAULT_DELAY = "0"; // TODO: make private?
+ private static final String DEFAULT_DELAY = "0"; // $NON-NLS-1$
- public static final String DEFAULT_RANGE = "100.0";// TODO: make private?
+ private static final String DEFAULT_RANGE = "100.0";// $NON-NLS-1$
private JTextField delayField;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java Sat May 5 16:43:53 2007
@@ -34,10 +34,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
-/**
- *
- * @version $Revision$ on $Date$
- */
public class AssertionVisualizer extends AbstractVisualizer implements Clearable {
private JTextArea textArea;
@@ -74,7 +70,7 @@
if (item.isFailure() || item.isError()) {
display.append("\n\t"); // $NON-NLS-1$
- display.append(item.getName() != null ? item.getName() + " : " : "");
+ display.append(item.getName() != null ? item.getName() + " : " : "");// $NON-NLS-1$
display.append(item.getFailureMessage());
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java Sat May 5 16:43:53 2007
@@ -45,8 +45,6 @@
* distribution of data points. Results tend to clump together.
*
* Created May 25, 2004
- *
- * @version $Revision:
*/
public class DistributionGraphVisualizer extends AbstractVisualizer implements ImageVisualizer, GraphListener,
Clearable {
@@ -109,7 +107,7 @@
}
public String getLabelResource() {
- return "distribution_graph_title";
+ return "distribution_graph_title"; // $NON-NLS-1$
}
public synchronized void clear() {
@@ -213,7 +211,7 @@
private Box createGraphInfoPanel() {
Box graphInfoPanel = Box.createHorizontalBox();
this.noteField = new JTextField();
- graphInfoPanel.add(this.createInfoLabel("distribution_note1", this.noteField));
+ graphInfoPanel.add(this.createInfoLabel("distribution_note1", this.noteField)); // $NON-NLS-1$
return graphInfoPanel;
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java Sat May 5 16:43:53 2007
@@ -45,8 +45,6 @@
*
*
* Created 2001/08/11
- *
- * @version $Revision$ $Date$
*/
public class GraphAccumVisualizer extends AbstractVisualizer implements ImageVisualizer, GraphAccumListener, Clearable {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -70,7 +68,7 @@
}
public String getLabelResource() {
- return "graph_full_results_title";
+ return "graph_full_results_title"; // $NON-NLS-1$
}
public void add(SampleResult res) {
@@ -161,7 +159,7 @@
mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
// TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("graph_full_results_title"));
+ JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("graph_full_results_title")); // $NON-NLS-1$
Font curFont = panelTitleLabel.getFont();
int curFontSize = curFont.getSize();
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java Sat May 5 16:43:53 2007
@@ -50,7 +50,6 @@
*
* Created February 8, 2001
*
- * @version $Revision$ $Date$
*/
public class GraphVisualizer extends AbstractVisualizer implements ImageVisualizer, ItemListener, Clearable {
@@ -62,7 +61,7 @@
private JTextField noSamplesField = null;
- private String minute = JMeterUtils.getResString("minute");
+ private String minute = JMeterUtils.getResString("minute"); // $NON-NLS-1$
private Graph graph;
@@ -115,7 +114,7 @@
dataField.setText(Long.toString(s.getData()));
averageField.setText(Long.toString(s.getAverage()));
deviationField.setText(Long.toString(s.getDeviation()));
- throughputField.setText(Double.toString(60 * s.getThroughput()) + "/" + minute);
+ throughputField.setText(Double.toString(60 * s.getThroughput()) + "/" + minute); // $NON-NLS-1$
medianField.setText(Long.toString(s.getMedian()));
updateYAxis();
}
@@ -125,7 +124,7 @@
}
public String getLabelResource() {
- return "graph_results_title";
+ return "graph_results_title"; // $NON-NLS-1$
}
public void itemStateChanged(ItemEvent e) {
@@ -147,11 +146,11 @@
// this.graph.clear();
model.clear();
graph.clear();
- dataField.setText("0000");
- averageField.setText("0000");
- deviationField.setText("0000");
- throughputField.setText("0/" + minute);
- medianField.setText("0000");
+ dataField.setText("0000"); //$NON-NLS-1$
+ averageField.setText("0000"); //$NON-NLS-1$
+ deviationField.setText("0000"); //$NON-NLS-1$
+ throughputField.setText("0/" + minute); //$NON-NLS-1$
+ medianField.setText("0000"); //$NON-NLS-1$
updateYAxis();
repaint();
}
@@ -165,7 +164,7 @@
*/
private void updateYAxis() {
maxYField.setText(Long.toString(graph.getGraphMax()));
- minYField.setText("0");
+ minYField.setText("0"); //$NON-NLS-1$
}
/**
@@ -206,8 +205,8 @@
maxYField = createYAxisField(5);
minYField = createYAxisField(3);
- graphYAxisPanel.add(createYAxisPanel("graph_results_ms", maxYField), BorderLayout.NORTH);
- graphYAxisPanel.add(createYAxisPanel("graph_results_ms", minYField), BorderLayout.SOUTH);
+ graphYAxisPanel.add(createYAxisPanel("graph_results_ms", maxYField), BorderLayout.NORTH); // $NON-NLS-1$
+ graphYAxisPanel.add(createYAxisPanel("graph_results_ms", minYField), BorderLayout.SOUTH); // $NON-NLS-1$
return graphYAxisPanel;
}
@@ -268,12 +267,12 @@
JPanel chooseGraphsPanel = new JPanel();
chooseGraphsPanel.setLayout(new FlowLayout());
- JLabel selectGraphsLabel = new JLabel(JMeterUtils.getResString("graph_choose_graphs"));
- data = createChooseCheckBox("graph_results_data", Color.black);
- average = createChooseCheckBox("graph_results_average", Color.blue);
- deviation = createChooseCheckBox("graph_results_deviation", Color.red);
- throughput = createChooseCheckBox("graph_results_throughput", JMeterColor.dark_green);
- median = createChooseCheckBox("graph_results_median", JMeterColor.purple);
+ JLabel selectGraphsLabel = new JLabel(JMeterUtils.getResString("graph_choose_graphs")); //$NON-NLS-1$
+ data = createChooseCheckBox("graph_results_data", Color.black); // $NON-NLS-1$
+ average = createChooseCheckBox("graph_results_average", Color.blue); // $NON-NLS-1$
+ deviation = createChooseCheckBox("graph_results_deviation", Color.red); // $NON-NLS-1$
+ throughput = createChooseCheckBox("graph_results_throughput", JMeterColor.dark_green); // $NON-NLS-1$
+ median = createChooseCheckBox("graph_results_median", JMeterColor.purple); // $NON-NLS-1$
chooseGraphsPanel.add(selectGraphsLabel);
chooseGraphsPanel.add(data);
@@ -337,16 +336,16 @@
throughputField = createInfoField(JMeterColor.dark_green, 15);
medianField = createInfoField(JMeterColor.purple, 5);
- graphInfoPanel.add(createInfoColumn(createInfoLabel("graph_results_no_samples", noSamplesField),
- noSamplesField, createInfoLabel("graph_results_deviation", deviationField), deviationField));
+ graphInfoPanel.add(createInfoColumn(createInfoLabel("graph_results_no_samples", noSamplesField), // $NON-NLS-1$
+ noSamplesField, createInfoLabel("graph_results_deviation", deviationField), deviationField)); // $NON-NLS-1$
graphInfoPanel.add(Box.createHorizontalGlue());
- graphInfoPanel.add(createInfoColumn(createInfoLabel("graph_results_latest_sample", dataField), dataField,
- createInfoLabel("graph_results_throughput", throughputField), throughputField));
+ graphInfoPanel.add(createInfoColumn(createInfoLabel("graph_results_latest_sample", dataField), dataField, // $NON-NLS-1$
+ createInfoLabel("graph_results_throughput", throughputField), throughputField)); // $NON-NLS-1$
graphInfoPanel.add(Box.createHorizontalGlue());
- graphInfoPanel.add(createInfoColumn(createInfoLabel("graph_results_average", averageField), averageField,
- createInfoLabel("graph_results_median", medianField), medianField));
+ graphInfoPanel.add(createInfoColumn(createInfoLabel("graph_results_average", averageField), averageField, // $NON-NLS-1$
+ createInfoLabel("graph_results_median", medianField), medianField)); // $NON-NLS-1$
graphInfoPanel.add(Box.createHorizontalGlue());
return graphInfoPanel;
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java Sat May 5 16:43:53 2007
@@ -28,7 +28,6 @@
* This listener can record results to a file but not to the UI. It is meant to
* provide an efficient means of recording data by eliminating GUI overhead.
*
- * @version $Revision$ $Date$
******************************************************************************/
public class SimpleDataWriter extends AbstractVisualizer implements Clearable {
@@ -42,7 +41,7 @@
}
public String getLabelResource() {
- return "simple_data_writer_title";
+ return "simple_data_writer_title"; // $NON-NLS-1$
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java Sat May 5 16:43:53 2007
@@ -24,10 +24,6 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
-/**
- * @author Michael Stover
- * @version $Revision$
- */
public class SplineModel implements Clearable {
public final int DEFAULT_NUMBER_OF_NODES = 10;
@@ -77,7 +73,7 @@
}
public String getClassLabel() {
- return JMeterUtils.getResString("spline_visualizer_title");
+ return JMeterUtils.getResString("spline_visualizer_title");// $NON-NLS-1$
}
public long getMinimum() {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Sat May 5 16:43:53 2007
@@ -73,13 +73,12 @@
* borrowed code from to start me off (and much code may still exist). Thank
* you!
*
- * @version $Revision$ on $Date$
*/
public class StatGraphVisualizer extends AbstractVisualizer implements Clearable,
ActionListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- private final String[] COLUMNS = { JMeterUtils.getResString("URL"), //$NON-NLS-1$
+ private final String[] COLUMNS = { JMeterUtils.getResString("url"), //$NON-NLS-1$
JMeterUtils.getResString("aggregate_report_count"), //$NON-NLS-1$
JMeterUtils.getResString("average"), //$NON-NLS-1$
JMeterUtils.getResString("aggregate_report_median"), //$NON-NLS-1$
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Sat May 5 16:43:53 2007
@@ -54,7 +54,6 @@
* borrowed code from to start me off (and much code may still exist). Thank
* you!
*
- * @version $Revision$ on $Date$
*/
public class StatVisualizer extends AbstractVisualizer implements Clearable {
private final String[] COLUMNS = {
@@ -114,9 +113,9 @@
null, // 90%
null, // Min
null, // Max
- new NumberRenderer("#0.00%"), // Error %age
- new RateRenderer("#.0"), // Throughpur
- new NumberRenderer("#.0"), // pageSize
+ new NumberRenderer("#0.00%"), // Error %age //$NON-NLS-1$
+ new RateRenderer("#.0"), // Throughput //$NON-NLS-1$
+ new NumberRenderer("#.0"), // pageSize //$NON-NLS-1$
};
public static boolean testFunctors(){
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java Sat May 5 16:43:53 2007
@@ -55,18 +55,19 @@
*
* created March 10, 2002
*
- * @version $Revision$ Updated on $Date$
*/
public class TableVisualizer extends AbstractVisualizer implements Clearable {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final ImageIcon imageSuccess = JMeterUtils.getImage(
- JMeterUtils.getPropDefault("viewResultsTree.success", "icon_success_sml.gif"),
- JMeterUtils.getResString("table_visualizer_success"));
+ JMeterUtils.getPropDefault("viewResultsTree.success", //$NON-NLS-1$
+ "icon_success_sml.gif"), //$NON-NLS-1$
+ JMeterUtils.getResString("table_visualizer_success")); //$NON-NLS-1$
private static final ImageIcon imageFailure = JMeterUtils.getImage(
- JMeterUtils.getPropDefault("viewResultsTree.failure", "icon_warning_sml.gif"),
- JMeterUtils.getResString("table_visualizer_warning"));
+ JMeterUtils.getPropDefault("viewResultsTree.failure", //$NON-NLS-1$
+ "icon_warning_sml.gif"), //$NON-NLS-1$
+ JMeterUtils.getResString("table_visualizer_warning")); //$NON-NLS-1$
private final String[] COLUMNS = new String[] {
JMeterUtils.getResString("table_visualizer_sample_num"), // $NON-NLS-1$
@@ -95,7 +96,7 @@
private long currentData = 0;
- private Format format = new SimpleDateFormat("HH:mm:ss.SSS");
+ private Format format = new SimpleDateFormat("HH:mm:ss.SSS"); //$NON-NLS-1$
// Column renderers
private static final TableCellRenderer[] RENDERERS =
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Sat May 5 16:43:53 2007
@@ -166,10 +166,12 @@
private JTabbedPane rightSide;
private static final ImageIcon imageSuccess = JMeterUtils.getImage(
- JMeterUtils.getPropDefault("viewResultsTree.success", "icon_success_sml.gif"));
+ JMeterUtils.getPropDefault("viewResultsTree.success", //$NON-NLS-1$
+ "icon_success_sml.gif")); //$NON-NLS-1$
private static final ImageIcon imageFailure = JMeterUtils.getImage(
- JMeterUtils.getPropDefault("viewResultsTree.failure", "icon_warning_sml.gif"));
+ JMeterUtils.getPropDefault("viewResultsTree.failure", //$NON-NLS-1$
+ "icon_warning_sml.gif")); //$NON-NLS-1$
public ViewResultsFullVisualizer() {
super();
@@ -366,8 +368,7 @@
// get the text response and image icon
// to determine which is NOT null
- if ((SampleResult.TEXT).equals(res.getDataType())) // equals(null)
- // is OK
+ if ((SampleResult.TEXT).equals(res.getDataType())) // equals(null) is OK
{
String response = getResponseAsString(res);
if (command.equals(TEXT_COMMAND)) {
@@ -668,7 +669,7 @@
private void setupTabPaneForSampleResult() {
// Set the title for the first tab
- rightSide.setTitleAt(0, JMeterUtils.getResString("view_results_tab_sampler"));
+ rightSide.setTitleAt(0, JMeterUtils.getResString("view_results_tab_sampler")); //$NON-NLS-1$
// Add the other tabs if not present
if(rightSide.indexOfTab(JMeterUtils.getResString("view_results_tab_request")) < 0) { // $NON-NLS-1$
rightSide.addTab(JMeterUtils.getResString("view_results_tab_request"), requestPane); // $NON-NLS-1$
@@ -680,7 +681,7 @@
private void setupTabPaneForAssertionResult() {
// Set the title for the first tab
- rightSide.setTitleAt(0, JMeterUtils.getResString("view_results_tab_assertion"));
+ rightSide.setTitleAt(0, JMeterUtils.getResString("view_results_tab_assertion")); //$NON-NLS-1$
// Remove the other tabs if present
int requestTabIndex = rightSide.indexOfTab(JMeterUtils.getResString("view_results_tab_request")); // $NON-NLS-1$
if(requestTabIndex >= 0) {
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/Arguments.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/Arguments.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/Arguments.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/Arguments.java Sat May 5 16:43:53 2007
@@ -27,8 +27,6 @@
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.TestElementProperty;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
// Mark Walsh, 2002-08-03 add method:
// addArgument(String name, Object value, Object metadata)
@@ -38,14 +36,10 @@
/**
* A set of Argument objects.
*
- * @author Michael Stover
- * @author Mark Walsh
- * @version $Revision$
*/
public class Arguments extends ConfigTestElement implements Serializable {
- private static Logger log = LoggingManager.getLoggerForClass();
/** The name of the property used to store the arguments. */
- public static final String ARGUMENTS = "Arguments.arguments";
+ public static final String ARGUMENTS = "Arguments.arguments"; //$NON-NLS-1$
/**
* Create a new Arguments object with no arguments.
@@ -162,13 +156,16 @@
PropertyIterator iter = getArguments().iterator();
while (iter.hasNext()) {
Argument arg = (Argument) iter.next().getObjectValue();
- if (arg.getMetaData() == null) {
- str.append(arg.getName() + "=" + arg.getValue());
+ final String metaData = arg.getMetaData();
+ str.append(arg.getName());
+ if (metaData == null) {
+ str.append("="); //$NON-NLS-1$
} else {
- str.append(arg.getName() + arg.getMetaData() + arg.getValue());
+ str.append(metaData);
}
+ str.append(arg.getValue());
if (iter.hasNext()) {
- str.append("&");
+ str.append("&"); //$NON-NLS-1$
}
}
return str.toString();
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/LoginConfig.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/LoginConfig.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/LoginConfig.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/LoginConfig.java Sat May 5 16:43:53 2007
@@ -22,10 +22,6 @@
import org.apache.jmeter.testelement.property.StringProperty;
-/**
- * @author Michael Stover
- * @version $Revision$
- */
public class LoginConfig extends ConfigTestElement implements Serializable
// TODO: move this to components -- the only reason why it's in core is because
// it's used as a guinea pig by a couple of tests.
@@ -75,6 +71,6 @@
}
public String toString() {
- return getUsername() + "=" + getPassword();
+ return getUsername() + "=" + getPassword(); //$NON-NLS-1$
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java Sat May 5 16:43:53 2007
@@ -35,7 +35,6 @@
* A GUI component allowing the user to enter a username and password for a
* login.
*
- * @version $Revision$ on $Date$
*/
public class LoginConfigGui extends AbstractConfigGui {
/** Field allowing the user to enter a username. */
@@ -74,7 +73,7 @@
}
public String getLabelResource() {
- return "login_config_element";
+ return "login_config_element"; // $NON-NLS-1$
}
/**
@@ -141,7 +140,7 @@
*/
private JPanel createUsernamePanel() {
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel(JMeterUtils.getResString("username"));
+ JLabel label = new JLabel(JMeterUtils.getResString("username")); // $NON-NLS-1$
label.setLabelFor(username);
panel.add(label, BorderLayout.WEST);
panel.add(username, BorderLayout.CENTER);
@@ -155,7 +154,7 @@
*/
private JPanel createPasswordPanel() {
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel(JMeterUtils.getResString("password"));
+ JLabel label = new JLabel(JMeterUtils.getResString("password")); // $NON-NLS-1$
label.setLabelFor(password);
panel.add(label, BorderLayout.WEST);
panel.add(password, BorderLayout.CENTER);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java Sat May 5 16:43:53 2007
@@ -73,9 +73,9 @@
private boolean displayName = true;
/** The names of the columns in the table. */
- private static final String COLUMN_NAMES_0 = JMeterUtils.getResString("name");
+ private static final String COLUMN_NAMES_0 = JMeterUtils.getResString("name"); // $NON-NLS-1$
- private static final String COLUMN_NAMES_1 = JMeterUtils.getResString("value");
+ private static final String COLUMN_NAMES_1 = JMeterUtils.getResString("value"); // $NON-NLS-1$
// NOTUSED private static final String COLUMN_NAMES_2 =
// JMeterUtils.getResString("metadata");
@@ -103,7 +103,7 @@
}
public String getLabelResource() {
- return "simple_config_element";
+ return "simple_config_element"; // $NON-NLS-1$
}
/**
@@ -209,12 +209,12 @@
* @return a GUI panel containing the buttons
*/
private JPanel createButtonPanel() {
- add = new JButton(JMeterUtils.getResString("add"));
+ add = new JButton(JMeterUtils.getResString("add")); //$NON-NLS-1$
add.setActionCommand(ADD);
add.addActionListener(this);
add.setEnabled(true);
- delete = new JButton(JMeterUtils.getResString("delete"));
+ delete = new JButton(JMeterUtils.getResString("delete")); // $NON-NLS-1$
delete.setActionCommand(DELETE);
delete.addActionListener(this);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org