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 [2/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...
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/IfController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/IfController.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/IfController.java Sat May 5 16:43:53 2007
@@ -30,7 +30,7 @@
/*******************************************************************************
*
* @author Cyrus Montakab created 2003/06/30
- * @version $Date$ $Revision$
+ *
* This is a Conditional Controller; it will execute the set of statements
* (samplers/controllers, etc) while the 'condition' is true.
* In a programming world - this is equivalant of :
@@ -51,7 +51,7 @@
private static final Logger logger = LoggingManager.getLoggerForClass();
- private final static String CONDITION = "IfController.condition";
+ private final static String CONDITION = "IfController.condition"; //$NON-NLS-1$
/**
* constructor
@@ -100,9 +100,9 @@
, "<cmd>", 1, null);
resultStr = Context.toString(cxResultObject);
- if (resultStr.equals("false")) {
+ if (resultStr.equals("false")) { //$NON-NLS-1$
result = false;
- } else if (resultStr.equals("true")) {
+ } else if (resultStr.equals("true")) { //$NON-NLS-1$
result = true;
} else {
throw new Exception(" BAD CONDITION :: " + cond);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/RunTime.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/RunTime.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/RunTime.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/RunTime.java Sat May 5 16:43:53 2007
@@ -24,12 +24,9 @@
import org.apache.jmeter.testelement.property.LongProperty;
import org.apache.jmeter.testelement.property.StringProperty;
-/**
- * @version $Revision$
- */
public class RunTime extends GenericController implements Serializable {
- private final static String SECONDS = "RunTime.seconds";
+ private final static String SECONDS = "RunTime.seconds"; //$NON-NLS-1$
private volatile long startTime = 0;
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java Sat May 5 16:43:53 2007
@@ -26,7 +26,6 @@
/**
* A generic controller component.
*
- * @version $Revision$ on $Date$
*/
public class LogicControllerGui extends AbstractControllerGui {
/**
@@ -49,7 +48,7 @@
}
public String getLabelResource() {
- return "logic_controller_title";
+ return "logic_controller_title"; // $NON-NLS-1$
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/TestPlanGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/TestPlanGui.java Sat May 5 16:43:53 2007
@@ -31,6 +31,7 @@
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
+import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.util.FileListPanel;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.gui.util.VerticalPanel;
@@ -44,7 +45,6 @@
* JMeter GUI component representing the test plan which will be executed when
* the test is run.
*
- * @version $Revision$ Last Updated: $Date$
*/
public class TestPlanGui extends AbstractJMeterGuiComponent {
@@ -82,15 +82,15 @@
*/
public JPopupMenu createPopupMenu() {
JPopupMenu pop = new JPopupMenu();
- JMenu addMenu = new JMenu(JMeterUtils.getResString("Add"));
+ JMenu addMenu = new JMenu(JMeterUtils.getResString("add")); // $NON-NLS-1$
addMenu.add(MenuFactory.makeMenuItem(new ThreadGroupGui().getStaticLabel(), ThreadGroupGui.class.getName(),
- "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.LISTENERS, "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.CONFIG_ELEMENTS, "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.ASSERTIONS, "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.PRE_PROCESSORS, "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.POST_PROCESSORS, "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.TIMERS, "Add"));
+ ActionNames.ADD));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.LISTENERS, ActionNames.ADD));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.CONFIG_ELEMENTS, ActionNames.ADD));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.ASSERTIONS, ActionNames.ADD));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.PRE_PROCESSORS, ActionNames.ADD));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.POST_PROCESSORS, ActionNames.ADD));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.TIMERS, ActionNames.ADD));
pop.add(addMenu);
MenuFactory.addFileMenu(pop);
return pop;
@@ -116,7 +116,7 @@
}
public String getLabelResource() {
- return "test_plan";
+ return "test_plan"; // $NON-NLS-1$
}
/**
@@ -158,13 +158,13 @@
* @return a panel for user-defined variables
*/
private JPanel createVariablePanel() {
- argsPanel = new ArgumentsPanel(JMeterUtils.getResString("user_defined_variables"));
+ argsPanel = new ArgumentsPanel(JMeterUtils.getResString("user_defined_variables")); // $NON-NLS-1$
return argsPanel;
}
protected Container createClassPathPanel() {
- browseJar = new FileListPanel(JMeterUtils.getResString("test_plan_classpath_browse"), ".jar");
+ browseJar = new FileListPanel(JMeterUtils.getResString("test_plan_classpath_browse"), ".jar"); // $NON-NLS-1$ $NON-NLS-2$
return browseJar;
}
@@ -180,11 +180,11 @@
add(createVariablePanel(), BorderLayout.CENTER);
VerticalPanel southPanel = new VerticalPanel();
- serializedMode = new JCheckBox(JMeterUtils.getResString("testplan.serialized"));
+ serializedMode = new JCheckBox(JMeterUtils.getResString("testplan.serialized")); // $NON-NLS-1$
southPanel.add(serializedMode);
- functionalMode = new JCheckBox(JMeterUtils.getResString("functional_mode"));
+ functionalMode = new JCheckBox(JMeterUtils.getResString("functional_mode")); // $NON-NLS-1$
southPanel.add(functionalMode);
- JTextArea explain = new JTextArea(JMeterUtils.getResString("functional_mode_explanation"));
+ JTextArea explain = new JTextArea(JMeterUtils.getResString("functional_mode_explanation")); // $NON-NLS-1$
explain.setEditable(false);
explain.setBackground(this.getBackground());
southPanel.add(explain);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java Sat May 5 16:43:53 2007
@@ -35,7 +35,6 @@
* JMeter GUI component representing a work bench where users can make
* preparations for the test plan.
*
- * @version $Revision$ on $Date$
*/
public class WorkBenchGui extends AbstractJMeterGuiComponent {
/**
@@ -111,7 +110,7 @@
}
public String getLabelResource() {
- return "workbench_title";
+ return "workbench_title"; // $NON-NLS-1$
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java Sat May 5 16:43:53 2007
@@ -43,11 +43,15 @@
* Transforms strings into variable references (in spite of the name, which
* suggests the opposite!)
*
- * @version $Revision$
*/
public class ReplaceFunctionsWithStrings extends AbstractTransformer {
private static final Logger log = LoggingManager.getLoggerForClass();
+ // Functions are wrapped in ${ and }
+ private static final String FUNCTION_REF_PREFIX = "${"; //$NON-NLS-1$
+
+ private static final String FUNCTION_REF_SUFFIX = "}"; //$NON-NLS-1$
+
private boolean regexMatch;// Should we match using regexes?
public ReplaceFunctionsWithStrings(CompoundVariable masterFunction, Map variables) {
@@ -78,13 +82,14 @@
if (regexMatch) {
try {
pattern = compiler.compile(value);
- input = Util.substitute(pm, pattern, new StringSubstitution("${" + key + "}"), input,
- Util.SUBSTITUTE_ALL);
+ input = Util.substitute(pm, pattern,
+ new StringSubstitution(FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX),
+ input, Util.SUBSTITUTE_ALL);
} catch (MalformedPatternException e) {
log.warn("Malformed pattern " + value);
}
} else {
- input = StringUtilities.substitute(input, value, "${" + key + "}");
+ input = StringUtilities.substitute(input, value, FUNCTION_REF_PREFIX + key + FUNCTION_REF_SUFFIX);
}
}
StringProperty newProp = new StringProperty(prop.getName(), input);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java Sat May 5 16:43:53 2007
@@ -27,11 +27,6 @@
import org.apache.jmeter.testelement.property.FunctionProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
-/**
- * @author ano ano
- *
- * @version $Revision$
- */
public class ReplaceStringWithFunctions extends AbstractTransformer {
public ReplaceStringWithFunctions(CompoundVariable masterFunction, Map variables) {
super();
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/SimpleVariable.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/SimpleVariable.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/SimpleVariable.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/util/SimpleVariable.java Sat May 5 16:43:53 2007
@@ -22,9 +22,6 @@
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
-/**
- * @version $Revision$
- */
public class SimpleVariable {
private String name;
@@ -34,7 +31,7 @@
}
public SimpleVariable() {
- this.name = "";
+ this.name = ""; //$NON-NLS-1$
}
public String getName() {
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java Sat May 5 16:43:53 2007
@@ -48,9 +48,6 @@
import org.apache.jorphan.gui.JLabeledTextField;
import org.apache.jorphan.reflect.ClassFinder;
-/**
- * @version $Revision$
- */
public class FunctionHelper extends JDialog implements ActionListener, ChangeListener {
JLabeledChoice functionList;
@@ -63,25 +60,25 @@
JButton generateButton;
public FunctionHelper() {
- super((JFrame) null, JMeterUtils.getResString("function_helper_title"), false);
+ super((JFrame) null, JMeterUtils.getResString("function_helper_title"), false); //$NON-NLS-1$
init();
}
private void init() {
- parameterPanel = new ArgumentsPanel(JMeterUtils.getResString("function_params"));
+ parameterPanel = new ArgumentsPanel(JMeterUtils.getResString("function_params")); //$NON-NLS-1$
initializeFunctionList();
this.getContentPane().setLayout(new BorderLayout(10, 10));
JPanel comboPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
comboPanel.add(functionList);
- JButton helpButton = new JButton(JMeterUtils.getResString("help"));
+ JButton helpButton = new JButton(JMeterUtils.getResString("help")); //$NON-NLS-1$
helpButton.addActionListener(new HelpListener());
comboPanel.add(helpButton);
this.getContentPane().add(comboPanel, BorderLayout.NORTH);
this.getContentPane().add(parameterPanel, BorderLayout.CENTER);
JPanel resultsPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
- cutPasteFunction = new JLabeledTextField(JMeterUtils.getResString("cut_paste_function"), 35);
+ cutPasteFunction = new JLabeledTextField(JMeterUtils.getResString("cut_paste_function"), 35); //$NON-NLS-1$
resultsPanel.add(cutPasteFunction);
- generateButton = new JButton(JMeterUtils.getResString("generate"));
+ generateButton = new JButton(JMeterUtils.getResString("generate")); //$NON-NLS-1$
generateButton.addActionListener(this);
resultsPanel.add(generateButton);
this.getContentPane().add(resultsPanel, BorderLayout.SOUTH);
@@ -102,7 +99,7 @@
functionMap.put(functionNames[count], cl);
count++;
}
- functionList = new JLabeledChoice(JMeterUtils.getResString("choose_function"), functionNames);
+ functionList = new JLabeledChoice(JMeterUtils.getResString("choose_function"), functionNames); //$NON-NLS-1$
functionList.addChangeListener(this);
} catch (IOException e) {
} catch (ClassNotFoundException e) {
@@ -119,7 +116,7 @@
Iterator iter = argumentDesc.iterator();
while (iter.hasNext()) {
String help = (String) iter.next();
- args.addArgument(help, "");
+ args.addArgument(help, ""); //$NON-NLS-1$
}
parameterPanel.configure(args);
parameterPanel.revalidate();
@@ -159,7 +156,7 @@
private class HelpListener implements ActionListener {
public void actionPerformed(ActionEvent e) {
String[] source = new String[] { Help.HELP_FUNCTIONS, functionList.getText() };
- ActionEvent helpEvent = new ActionEvent(source, e.getID(), "help");
+ ActionEvent helpEvent = new ActionEvent(source, e.getID(), "help"); //$NON-NLS-1$
ActionRouter.getInstance().actionPerformed(helpEvent);
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java Sat May 5 16:43:53 2007
@@ -49,7 +49,7 @@
setLayout(new BorderLayout(5, 0));
commentField = new JTextArea();
- JLabel commentLabel = new JLabel(JMeterUtils.getResString("testplan_comments"));
+ JLabel commentLabel = new JLabel(JMeterUtils.getResString("testplan_comments")); //$NON-NLS-1$
commentLabel.setLabelFor(commentField);
VerticalPanel commentPanel = new VerticalPanel();
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/MainFrame.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/MainFrame.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/MainFrame.java Sat May 5 16:43:53 2007
@@ -73,7 +73,6 @@
* JMeter component GUIs.
*
* @author Michael Stover
- * @version $Revision$
*/
public class MainFrame extends JFrame implements TestListener, Remoteable {
@@ -253,8 +252,8 @@
* the host where JMeter threads are stopping
*/
public void showStoppingMessage(String host) {
- stoppingMessage = new JDialog(this, JMeterUtils.getResString("stopping_test_title"), true);
- JLabel stopLabel = new JLabel(JMeterUtils.getResString("stopping_test") + ": " + host);
+ stoppingMessage = new JDialog(this, JMeterUtils.getResString("stopping_test_title"), true); //$NON-NLS-1$
+ JLabel stopLabel = new JLabel(JMeterUtils.getResString("stopping_test") + ": " + host); //$NON-NLS-1$
stopLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
stoppingMessage.getContentPane().add(stopLabel);
stoppingMessage.pack();
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java Sat May 5 16:43:53 2007
@@ -36,11 +36,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.LocaleChangeEvent;
-/**
- *
- * @version $Revision$ Last updated: $Date$
- */
-
public class NamePanel extends JPanel implements JMeterGUIComponent {
/** A text field containing the name. */
private JTextField nameField = new JTextField(15);
@@ -65,7 +60,7 @@
private void init() {
setLayout(new BorderLayout(5, 0));
- nameLabel = new JLabel(JMeterUtils.getResString("name"));
+ nameLabel = new JLabel(JMeterUtils.getResString("name")); // $NON-NLS-1$
nameLabel.setName("name");
nameLabel.setLabelFor(nameField);
@@ -100,7 +95,7 @@
if (nameField != null)
return nameField.getText();
else
- return "";
+ return ""; // $NON-NLS-1$
}
/**
@@ -154,7 +149,7 @@
* @see org.apache.jmeter.gui.JMeterGUIComponent#getLabelResource()
*/
public String getLabelResource() {
- return "root";
+ return "root"; // $NON-NLS-1$
}
/* Implements JMeterGUIComponent.getMenuCategories() */
@@ -206,7 +201,6 @@
* @see org.apache.jmeter.gui.JMeterGUIComponent#getDocAnchor()
*/
public String getDocAnchor() {
- // TODO Auto-generated method stub
return null;
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/OnErrorPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/OnErrorPanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/OnErrorPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/OnErrorPanel.java Sat May 5 16:43:53 2007
@@ -28,10 +28,6 @@
import org.apache.jmeter.testelement.OnErrorTestElement;
import org.apache.jmeter.util.JMeterUtils;
-/**
- *
- * @version $Revision$ $Date$
- */
public class OnErrorPanel extends JPanel {
// Sampler error action buttons
private JRadioButton continueBox;
@@ -42,20 +38,20 @@
private JPanel createOnErrorPanel() {
JPanel panel = new JPanel();
- panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("sampler_on_error_action")));
+ panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("sampler_on_error_action"))); //$NON-NLS-1$
ButtonGroup group = new ButtonGroup();
- continueBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_continue"));
+ continueBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_continue")); //$NON-NLS-1$
group.add(continueBox);
continueBox.setSelected(true);
panel.add(continueBox);
- stopThrdBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_thread"));
+ stopThrdBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_thread")); //$NON-NLS-1$
group.add(stopThrdBox);
panel.add(stopThrdBox);
- stopTestBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_test"));
+ stopTestBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_test")); //$NON-NLS-1$
group.add(stopTestBox);
panel.add(stopTestBox);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/AbstractAction.java Sat May 5 16:43:53 2007
@@ -34,10 +34,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author mstover
- * @version $Revision$
- */
public abstract class AbstractAction implements Command {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -90,8 +86,10 @@
protected void popupShouldSave(ActionEvent e) {
log.debug("popupShouldSave");
if (GuiPackage.getInstance().getTestPlanFile() == null) {
- if (JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils
- .getResString("should_save"), JMeterUtils.getResString("warning"), JOptionPane.YES_NO_OPTION,
+ if (JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
+ JMeterUtils.getResString("should_save"), //$NON-NLS-1$
+ JMeterUtils.getResString("warning"), //$NON-NLS-1$
+ JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(),ActionNames.SAVE));
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Close.java Sat May 5 16:43:53 2007
@@ -33,7 +33,6 @@
*
* @author <a href="mramshaw@alumni.concordia.ca">Martin Ramshaw</a> Created
* June 6, 2002
- * @version $Revision$ Last updated: $Date$
*/
public class Close implements Command {
@@ -68,7 +67,9 @@
GuiPackage guiPackage = GuiPackage.getInstance();
if (guiPackage.isDirty()) {
if (JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils
- .getResString("cancel_new_to_save"), JMeterUtils.getResString("Save?"), JOptionPane.YES_NO_OPTION,
+ .getResString("cancel_new_to_save"), // $NON-NLS-1$
+ JMeterUtils.getResString("save?"), // $NON-NLS-1$
+ JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE));
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ExitCommand.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ExitCommand.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ExitCommand.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ExitCommand.java Sat May 5 16:43:53 2007
@@ -27,11 +27,6 @@
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.JMeterUtils;
-/**
- * @author Brendan Burns
- * @author <a href="mailto:klancast@swbell.net">Keith Lancaster</a>
- * @version $Revision$ updated on $Date$
- */
public class ExitCommand implements Command {
private static Set commands = new HashSet();
@@ -64,7 +59,8 @@
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_DIRTY));
if (GuiPackage.getInstance().isDirty()) {
int chosenOption = JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils
- .getResString("cancel_exit_to_save"), JMeterUtils.getResString("Save?"),
+ .getResString("cancel_exit_to_save"), // $NON-NLS-1$
+ JMeterUtils.getResString("save?"), // $NON-NLS-1$
JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (chosenOption == JOptionPane.NO_OPTION) {
System.exit(0);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java Sat May 5 16:43:53 2007
@@ -88,7 +88,7 @@
private void sslManager() {
SSLManager.reset();
- keyStoreChooser = new JFileChooser(JMeterUtils.getJMeterProperties().getProperty("user.dir"));
+ keyStoreChooser = new JFileChooser(JMeterUtils.getJMeterProperties().getProperty("user.dir")); //$NON-NLS-1$
keyStoreChooser.addChoosableFileFilter(new AcceptPKCS12FileFilter());
keyStoreChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
int retVal = keyStoreChooser.showOpenDialog(GuiPackage.getInstance().getMainFrame());
@@ -116,7 +116,7 @@
* @return description
*/
public String getDescription() {
- return JMeterUtils.getResString("pkcs12_desc");
+ return JMeterUtils.getResString("pkcs12_desc"); //$NON-NLS-1$
}
/**
@@ -127,7 +127,9 @@
* @return true if file is accepted, false otherwise
*/
public boolean accept(File testFile) {
- return testFile.isDirectory() || testFile.getName().endsWith(".p12") || testFile.getName().endsWith(".P12");
+ return testFile.isDirectory()
+ || testFile.getName().endsWith(".p12") //$NON-NLS-1$
+ || testFile.getName().endsWith(".P12"); //$NON-NLS-1$
}
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java Sat May 5 16:43:53 2007
@@ -46,10 +46,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Michael Stover Created March 11, 2001
- * @version $Revision$ Last updated: $Date$
- */
public class JMeterTreeListener implements TreeSelectionListener, MouseListener, KeyListener, MouseMotionListener {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -172,20 +168,20 @@
if (dragging && isValidDragAction(draggedNodes, getCurrentNode())) {
dragging = false;
JPopupMenu dragNdrop = new JPopupMenu();
- JMenuItem item = new JMenuItem(JMeterUtils.getResString("Insert Before")); // $NON-NLS-1$
+ JMenuItem item = new JMenuItem(JMeterUtils.getResString("insert_before")); // $NON-NLS-1$
item.addActionListener(actionHandler);
item.setActionCommand(ActionNames.INSERT_BEFORE);
dragNdrop.add(item);
- item = new JMenuItem(JMeterUtils.getResString("Insert After")); // $NON-NLS-1$
+ item = new JMenuItem(JMeterUtils.getResString("insert_after")); // $NON-NLS-1$
item.addActionListener(actionHandler);
item.setActionCommand(ActionNames.INSERT_AFTER);
dragNdrop.add(item);
- item = new JMenuItem(JMeterUtils.getResString("Add as Child")); // $NON-NLS-1$
+ item = new JMenuItem(JMeterUtils.getResString("add_as_child")); // $NON-NLS-1$
item.addActionListener(actionHandler);
item.setActionCommand(ActionNames.DRAG_ADD);
dragNdrop.add(item);
dragNdrop.addSeparator();
- item = new JMenuItem(JMeterUtils.getResString("Cancel")); // $NON-NLS-1$
+ item = new JMenuItem(JMeterUtils.getResString("cancel")); // $NON-NLS-1$
dragNdrop.add(item);
displayPopUp(e, dragNdrop);
} else {
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sat May 5 16:43:53 2007
@@ -43,11 +43,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Michael Stover
- * @author <a href="mailto:klancast@swbell.net">Keith Lancaster</a>
- * @version $Revision$ updated on $Date$
- */
public class JMeterMenuBar extends JMenuBar implements LocaleChangeListener {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -282,7 +277,7 @@
optionsMenu.add(functionHelper);
optionsMenu.add(lafMenu);
if (SSLManager.isSSLSupported()) {
- sslManager = new JMenuItem(JMeterUtils.getResString("sslManager")); //$NON-NLS-1$
+ sslManager = new JMenuItem(JMeterUtils.getResString("sslmanager")); //$NON-NLS-1$
sslManager.addActionListener(ActionRouter.getInstance());
sslManager.setActionCommand(ActionNames.SSL_MANAGER);
sslManager.setMnemonic('S');
@@ -342,7 +337,7 @@
chineseSimple.setName(Locale.SIMPLIFIED_CHINESE.toString());
languageMenu.add(chineseSimple);
// add chinese (traditional)
- JMenuItem chineseTrad = new JMenuItem(JMeterUtils.getResString("zh_TW")); //$NON-NLS-1$
+ JMenuItem chineseTrad = new JMenuItem(JMeterUtils.getResString("zh_tw")); //$NON-NLS-1$
chineseTrad.addActionListener(ActionRouter.getInstance());
chineseTrad.setActionCommand(ActionNames.CHANGE_LANGUAGE);
chineseTrad.setName(Locale.TRADITIONAL_CHINESE.toString());
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java Sat May 5 16:43:53 2007
@@ -49,14 +49,14 @@
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
-/**
- * @author Michael Stover
- * @author <a href="mailto:klancast@swbell.net">Keith Lancaster</a>
- * @version $Revision$ updated on $Date$
- */
public final class MenuFactory {
private static final Logger log = LoggingManager.getLoggerForClass();
+ /*
+ * Predefined strings for makeMenu().
+ * These are used as menu categories in the menuMap Hashmap,
+ * and also for resource lookup in messages.properties
+ */
public final static String TIMERS = "menu_timer"; //$NON-NLS-1$
public final static String CONTROLLERS = "menu_logic_controller"; //$NON-NLS-1$
@@ -82,9 +82,13 @@
// MENU_ADD_xxx - controls which items are in the ADD menu
// MENU_PARENT_xxx - controls which items are in the Insert Parent menu
private static final String[] MENU_ADD_CONTROLLER = new String[] {
- MenuFactory.CONTROLLERS, MenuFactory.SAMPLERS,
- MenuFactory.ASSERTIONS, MenuFactory.CONFIG_ELEMENTS,
- MenuFactory.TIMERS, MenuFactory.LISTENERS, MenuFactory.PRE_PROCESSORS,
+ MenuFactory.CONTROLLERS,
+ MenuFactory.SAMPLERS,
+ MenuFactory.ASSERTIONS,
+ MenuFactory.CONFIG_ELEMENTS,
+ MenuFactory.TIMERS,
+ MenuFactory.LISTENERS,
+ MenuFactory.PRE_PROCESSORS,
MenuFactory.POST_PROCESSORS };
private static final String[] MENU_PARENT_CONTROLLER = new String[] {
@@ -92,7 +96,9 @@
private static final String[] MENU_ADD_SAMPLER = new String[] {
MenuFactory.CONFIG_ELEMENTS,
- MenuFactory.ASSERTIONS, MenuFactory.TIMERS, MenuFactory.LISTENERS,
+ MenuFactory.ASSERTIONS,
+ MenuFactory.TIMERS,
+ MenuFactory.LISTENERS,
MenuFactory.PRE_PROCESSORS,
MenuFactory.POST_PROCESSORS };
@@ -260,10 +266,25 @@
return pop;
}
+ /**
+ *
+ * @param category - predefined string (used as key for menuMap HashMap and messages.properties lookup)
+ * @param actionCommand - predefined string, e.g. ActionNames.ADD
+ * @see org.apache.jmeter.gui.action.ActionNames
+ * @return
+ */
public static JMenu makeMenu(String category, String actionCommand) {
return makeMenu((Collection) menuMap.get(category), actionCommand, JMeterUtils.getResString(category));
}
+ /**
+ *
+ * @param menuInfo - collection of MenuInfo items
+ * @param actionCommand - predefined string, e.g. ActionNames.ADD
+ * @see org.apache.jmeter.gui.action.ActionNames
+ * @param menuName
+ * @return
+ */
public static JMenu makeMenu(Collection menuInfo, String actionCommand, String menuName) {
Iterator iter = menuInfo.iterator();
JMenu menu = new JMenu(menuName);
@@ -280,6 +301,14 @@
}
}
+ /**
+ *
+ * @param label for the MenuItem
+ * @param name for the MenuItem
+ * @param actionCommand - predefined string, e.g. ActionNames.ADD
+ * @see org.apache.jmeter.gui.action.ActionNames
+ * @return
+ */
public static JMenuItem makeMenuItem(String label, String name, String actionCommand) {
JMenuItem newMenuChoice = new JMenuItem(label);
newMenuChoice.setName(name);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java Sat May 5 16:43:53 2007
@@ -28,10 +28,6 @@
import org.apache.jmeter.util.JMeterUtils;
-/**
- * @author mstover
- * @version $Revision$
- */
public class NumberFieldErrorListener extends FocusAdapter {
private static NumberFieldErrorListener listener = new NumberFieldErrorListener();
@@ -51,8 +47,10 @@
try {
Integer.parseInt(text);
} catch (NumberFormatException nfe) {
- JOptionPane.showMessageDialog(source, JMeterUtils.getResString("You must enter a valid number"),
- JMeterUtils.getResString("Invalid data"), JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showMessageDialog(source,
+ JMeterUtils.getResString("you_must_enter_a_valid_number"), //$NON-NLS-1$
+ JMeterUtils.getResString("invalid_data"), //$NON-NLS-1$
+ JOptionPane.WARNING_MESSAGE);
new FocusRequester(source);
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java Sat May 5 16:43:53 2007
@@ -31,7 +31,6 @@
/**
* Create a Result Action Test Element
*
- * @version $Revision$ Last updated: $Date$
*/
public class ResultActionGui extends AbstractPostProcessorGui {
@@ -46,7 +45,7 @@
* @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
*/
public String getLabelResource() {
- return "resultaction_title";
+ return "resultaction_title"; //$NON-NLS-1$
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java Sat May 5 16:43:53 2007
@@ -40,7 +40,7 @@
}
public String getLabelResource() {
- return "summariser_title";
+ return "summariser_title"; //$NON-NLS-1$
}
public void configure(TestElement el) {
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java Sat May 5 16:43:53 2007
@@ -27,8 +27,6 @@
import javax.swing.text.JTextComponent;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
/**
* This class implements a property editor for possibly null String properties
@@ -45,10 +43,8 @@
* </ul>
*
* @author <a href="mailto:jsalvata@apache.org">Jordi Salvat i Alabart</a>
- * @version $Revision$ updated on $Date$
*/
class ComboStringEditor extends PropertyEditorSupport implements ItemListener {
- protected static Logger log = LoggingManager.getLoggerForClass();
/**
* The list of options to be offered by this editor.
@@ -84,9 +80,9 @@
*/
// Needs to be visible to test cases
- static final Object UNDEFINED = new UniqueObject(JMeterUtils.getResString("property_undefined"));
+ static final Object UNDEFINED = new UniqueObject(JMeterUtils.getResString("property_undefined")); //$NON-NLS-1$
- private static final Object EDIT = new UniqueObject(JMeterUtils.getResString("property_edit"));
+ private static final Object EDIT = new UniqueObject(JMeterUtils.getResString("property_edit")); //$NON-NLS-1$
ComboStringEditor() {
// Create the combo box we will use to edit this property:
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Sat May 5 16:43:53 2007
@@ -94,26 +94,25 @@
* </dl>
*
* @author <a href="mailto:jsalvata@apache.org">Jordi Salvat i Alabart</a>
- * @version $Revision$ updated on $Date$
*/
public class GenericTestBeanCustomizer extends JPanel implements SharedCustomizer, PropertyChangeListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- public static final String GROUP = "group";
+ public static final String GROUP = "group"; //$NON-NLS-1$
- public static final String ORDER = "order";
+ public static final String ORDER = "order"; //$NON-NLS-1$
- public static final String TAGS = "tags";
+ public static final String TAGS = "tags"; //$NON-NLS-1$
- public static final String NOT_UNDEFINED = "notUndefined";
+ public static final String NOT_UNDEFINED = "notUndefined"; //$NON-NLS-1$
- public static final String NOT_EXPRESSION = "notExpression";
+ public static final String NOT_EXPRESSION = "notExpression"; //$NON-NLS-1$
- public static final String NOT_OTHER = "notOther";
+ public static final String NOT_OTHER = "notOther"; //$NON-NLS-1$
- public static final String DEFAULT = "default";
+ public static final String DEFAULT = "default"; //$NON-NLS-1$
- public static final String RESOURCE_BUNDLE = "resourceBundle";
+ public static final String RESOURCE_BUNDLE = "resourceBundle"; //$NON-NLS-1$
public static final String ORDER(String group) {
return "group." + group + ".order";
@@ -240,8 +239,8 @@
}
// Obtain message formats:
- propertyFieldLabelMessage = new MessageFormat(JMeterUtils.getResString("property_as_field_label"));
- propertyToolTipMessage = new MessageFormat(JMeterUtils.getResString("property_tool_tip"));
+ propertyFieldLabelMessage = new MessageFormat(JMeterUtils.getResString("property_as_field_label")); //$NON-NLS-1$
+ propertyToolTipMessage = new MessageFormat(JMeterUtils.getResString("property_tool_tip")); //$NON-NLS-1$
// Initialize the GUI:
init();
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestPlan.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestPlan.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestPlan.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestPlan.java Sat May 5 16:43:53 2007
@@ -40,26 +40,22 @@
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
-/**
- * @author Michael Stover Created March 13, 2001
- * @version $Revision$ Last updated: $Date$
- */
public class TestPlan extends AbstractTestElement implements Serializable, TestListener {
private static Logger log = LoggingManager.getLoggerForClass();
// Does not appear to be needed
- public final static String THREAD_GROUPS = "TestPlan.thread_groups";
+ public final static String THREAD_GROUPS = "TestPlan.thread_groups"; //$NON-NLS-1$
- public final static String FUNCTIONAL_MODE = "TestPlan.functional_mode";
+ public final static String FUNCTIONAL_MODE = "TestPlan.functional_mode"; //$NON-NLS-1$
- public final static String USER_DEFINED_VARIABLES = "TestPlan.user_defined_variables";
+ public final static String USER_DEFINED_VARIABLES = "TestPlan.user_defined_variables"; //$NON-NLS-1$
- public final static String SERIALIZE_THREADGROUPS = "TestPlan.serialize_threadgroups";
+ public final static String SERIALIZE_THREADGROUPS = "TestPlan.serialize_threadgroups"; //$NON-NLS-1$
- public final static String CLASSPATHS = "TestPlan.user_define_classpath";
- private static final String CLASSPATH_SEPARATOR = ",";
+ public final static String CLASSPATHS = "TestPlan.user_define_classpath"; //$NON-NLS-1$
+ private static final String CLASSPATH_SEPARATOR = ","; //$NON-NLS-1$
- public final static String COMMENTS = "TestPlan.comments";
+ public final static String COMMENTS = "TestPlan.comments"; //$NON-NLS-1$
// Does not appear to be needed
public final static String BASEDIR = "basedir";
@@ -86,7 +82,7 @@
// element to a Test Plan.
// Does not appear to be needed
- itemsCanAdd.add(JMeterUtils.getResString("threadgroup"));
+ itemsCanAdd.add(JMeterUtils.getResString("threadgroup")); //$NON-NLS-1$
}
public TestPlan() {
@@ -216,7 +212,8 @@
} else {
plan = new TestPlan(name);
}
- plan.setProperty(new StringProperty(TestElement.GUI_CLASS, "org.apache.jmeter.control.gui.TestPlanGui"));
+ plan.setProperty(new StringProperty(TestElement.GUI_CLASS,
+ "org.apache.jmeter.control.gui.TestPlanGui")); //$NON-NLS-1$
}
return plan;
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java Sat May 5 16:43:53 2007
@@ -51,9 +51,6 @@
import org.apache.jmeter.threads.ThreadGroup;
import org.apache.jmeter.util.JMeterUtils;
-/**
- * @version $Revision$ on $Date$
- */
public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemListener {
LoopControlPanel loopPanel;
@@ -67,10 +64,6 @@
private JTextField rampInput;
- // private final static String SCHEDULER = "scheduler";
- // private final static String START_TIME= "start_time";
- // private final static String END_TIME= "end_time";
-
private JDateField start;
private JDateField end;
@@ -196,7 +189,7 @@
return pop;
}
- public JPanel createControllerPanel() {
+ private JPanel createControllerPanel() {
loopPanel = new LoopControlPanel(false);
LoopController looper = (LoopController) loopPanel.createTestElement();
looper.setLoops(1);
@@ -211,7 +204,7 @@
*/
private JPanel createStartTimePanel() {
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel(JMeterUtils.getResString("starttime"));
+ JLabel label = new JLabel(JMeterUtils.getResString("starttime")); //$NON-NLS-1$
panel.add(label, BorderLayout.WEST);
Date today = new Date();
start = new JDateField(today);
@@ -226,7 +219,7 @@
*/
private JPanel createEndTimePanel() {
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel(JMeterUtils.getResString("endtime"));
+ JLabel label = new JLabel(JMeterUtils.getResString("endtime")); // $NON-NLS-1$
panel.add(label, BorderLayout.WEST);
Date today = new Date();
end = new JDateField(today);
@@ -241,7 +234,7 @@
*/
private JPanel createDurationPanel() {
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel(JMeterUtils.getResString("duration"));
+ JLabel label = new JLabel(JMeterUtils.getResString("duration")); // $NON-NLS-1$
panel.add(label, BorderLayout.WEST);
duration = new JTextField();
panel.add(duration, BorderLayout.CENTER);
@@ -255,7 +248,7 @@
*/
private JPanel createDelayPanel() {
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel(JMeterUtils.getResString("delay"));
+ JLabel label = new JLabel(JMeterUtils.getResString("delay")); // $NON-NLS-1$
panel.add(label, BorderLayout.WEST);
delay = new JTextField();
panel.add(delay, BorderLayout.CENTER);
@@ -263,25 +256,25 @@
}
public String getLabelResource() {
- return "threadgroup";
+ return "threadgroup"; // $NON-NLS-1$
}
private JPanel createOnErrorPanel() {
JPanel panel = new JPanel();
- panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("sampler_on_error_action")));
+ panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("sampler_on_error_action"))); // $NON-NLS-1$
ButtonGroup group = new ButtonGroup();
- continueBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_continue"));
+ continueBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_continue")); // $NON-NLS-1$
group.add(continueBox);
continueBox.setSelected(true);
panel.add(continueBox);
- stopThrdBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_thread"));
+ stopThrdBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_thread")); // $NON-NLS-1$
group.add(stopThrdBox);
panel.add(stopThrdBox);
- stopTestBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_test"));
+ stopTestBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_test")); // $NON-NLS-1$
group.add(stopTestBox);
panel.add(stopTestBox);
@@ -301,16 +294,16 @@
// THREAD PROPERTIES
VerticalPanel threadPropsPanel = new VerticalPanel();
- threadPropsPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
- .getResString("thread_properties")));
+ threadPropsPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+ JMeterUtils.getResString("thread_properties"))); // $NON-NLS-1$
// NUMBER OF THREADS
JPanel threadPanel = new JPanel(new BorderLayout(5, 0));
- JLabel threadLabel = new JLabel(JMeterUtils.getResString("number_of_threads"));
+ JLabel threadLabel = new JLabel(JMeterUtils.getResString("number_of_threads")); // $NON-NLS-1$
threadPanel.add(threadLabel, BorderLayout.WEST);
- threadInput = new JTextField("1", 5);
+ threadInput = new JTextField("1", 5); // $NON-NLS-1$
threadInput.setName(THREAD_NAME);
threadLabel.setLabelFor(threadInput);
threadPanel.add(threadInput, BorderLayout.CENTER);
@@ -320,10 +313,10 @@
// RAMP-UP
JPanel rampPanel = new JPanel(new BorderLayout(5, 0));
- JLabel rampLabel = new JLabel(JMeterUtils.getResString("ramp_up"));
+ JLabel rampLabel = new JLabel(JMeterUtils.getResString("ramp_up")); // $NON-NLS-1$
rampPanel.add(rampLabel, BorderLayout.WEST);
- rampInput = new JTextField("1", 5);
+ rampInput = new JTextField("1", 5); // $NON-NLS-1$
rampInput.setName(RAMP_NAME);
rampLabel.setLabelFor(rampInput);
rampPanel.add(rampInput, BorderLayout.CENTER);
@@ -336,12 +329,12 @@
// mainPanel.add(threadPropsPanel, BorderLayout.NORTH);
// add(mainPanel, BorderLayout.CENTER);
- scheduler = new JCheckBox(JMeterUtils.getResString("scheduler"));
+ scheduler = new JCheckBox(JMeterUtils.getResString("scheduler")); // $NON-NLS-1$
scheduler.addItemListener(this);
threadPropsPanel.add(scheduler);
mainPanel = new VerticalPanel();
- mainPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
- .getResString("scheduler_configuration")));
+ mainPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+ JMeterUtils.getResString("scheduler_configuration"))); // $NON-NLS-1$
mainPanel.add(createStartTimePanel());
mainPanel.add(createEndTimePanel());
mainPanel.add(createDurationPanel());
Modified: jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java Sat May 5 16:43:53 2007
@@ -42,7 +42,6 @@
* The GUI class is not invoked in non-GUI mode, so it should not perform any
* additional setup that a test would need at run-time
*
- * @version $Revision$ $Date$
*/
public class ExampleSamplerGui extends AbstractSamplerGui {
@@ -58,7 +57,7 @@
* @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
*/
public String getLabelResource() {
- return "example_title";
+ return "example_title"; // $NON-NLS-1$
}
/*
@@ -113,7 +112,7 @@
* @return the panel for entering the data
*/
private Component createDataPanel() {
- JLabel label = new JLabel(JMeterUtils.getResString("example_data"));
+ JLabel label = new JLabel(JMeterUtils.getResString("example_data")); //$NON-NLS-1$
data = new JTextArea();
data.setName(ExampleSampler.DATA);
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IntSum.java Sat May 5 16:43:53 2007
@@ -33,18 +33,17 @@
* Provides an intSum function that adds two or more integer values.
*
* @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
- * @version $Id$
*/
public class IntSum extends AbstractFunction implements Serializable {
private static final List desc = new LinkedList();
- private static final String KEY = "__intSum";
+ private static final String KEY = "__intSum"; //$NON-NLS-1$
static {
- desc.add(JMeterUtils.getResString("intsum_param_1"));
- desc.add(JMeterUtils.getResString("intsum_param_2"));
- desc.add(JMeterUtils.getResString("function_name_param"));
+ desc.add(JMeterUtils.getResString("intsum_param_1")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("intsum_param_2")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
}
private Object[] values;
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/IterationCounter.java Sat May 5 16:43:53 2007
@@ -33,7 +33,7 @@
private static final List desc = new LinkedList();
- private static final String KEY = "__counter";
+ private static final String KEY = "__counter"; //$NON-NLS-1$
private transient ThreadLocal perThreadInt;
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JavaScript.java Sat May 5 16:43:53 2007
@@ -40,13 +40,13 @@
private static final List desc = new LinkedList();
- private static final String KEY = "__javaScript";
+ private static final String KEY = "__javaScript"; //$NON-NLS-1$
private static Logger log = LoggingManager.getLoggerForClass();
static {
- desc.add("JavaScript expression to evaluate");
- desc.add(JMeterUtils.getResString("function_name_param"));
+ desc.add(JMeterUtils.getResString("javascript_expression"));//$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
}
private Object[] values;
@@ -78,7 +78,7 @@
try {
Scriptable scope = cx.initStandardObjects(null);
- Object result = cx.evaluateString(scope, script, "<cmd>", 1, null);
+ Object result = cx.evaluateString(scope, script, "<cmd>", 1, null); //$NON-NLS-1$
resultStr = Context.toString(result);
if (varName != null && vars != null) {// vars can be null if run from TestPlan
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/JexlFunction.java Sat May 5 16:43:53 2007
@@ -28,6 +28,7 @@
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -43,13 +44,13 @@
private static Logger log = LoggingManager.getLoggerForClass();
- private static final String KEY = "__jexl";
+ private static final String KEY = "__jexl"; //$NON-NLS-1$
private static final List desc = new LinkedList();
static
{
- desc.add("expression");
+ desc.add(JMeterUtils.getResString("jexl_expression")); //$NON-NLS-1$
}
private Object[] values;
@@ -57,7 +58,7 @@
public String execute(SampleResult result, Sampler sampler)
throws InvalidVariableException
{
- String str = "";
+ String str = ""; //$NON-NLS-1$
CompoundVariable var = (CompoundVariable) values[0];
String exp = var.getRawParameters();
@@ -66,11 +67,11 @@
{
Expression e = ExpressionFactory.createExpression(exp);
JexlContext jc = JexlHelper.createContext();
- jc.getVars().put("ctx", sampler.getThreadContext());
- jc.getVars().put("vars", getVariables());
- jc.getVars().put("theadName", sampler.getThreadName());
- jc.getVars().put("sampler", sampler);
- jc.getVars().put("sampleResult", result);
+ jc.getVars().put("ctx", sampler.getThreadContext()); //$NON-NLS-1$
+ jc.getVars().put("vars", getVariables()); //$NON-NLS-1$
+ jc.getVars().put("theadName", sampler.getThreadName()); //$NON-NLS-1$
+ jc.getVars().put("sampler", sampler); //$NON-NLS-1$
+ jc.getVars().put("sampleResult", result); //$NON-NLS-1$
// Now evaluate the expression, getting the result
Object o = e.evaluate(jc);
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction.java Sat May 5 16:43:53 2007
@@ -38,14 +38,13 @@
*
* Returns: - the input string
*
- * @version $Revision$ Updated: $Date$
*/
public class LogFunction extends AbstractFunction implements Serializable {
private static Logger log = LoggingManager.getLoggerForClass();
private static final List desc = new LinkedList();
- private static final String KEY = "__log";
+ private static final String KEY = "__log"; //$NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 1;
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/LogFunction2.java Sat May 5 16:43:53 2007
@@ -38,14 +38,13 @@
* Returns: - Empty String (so can be used where return value would be a
* nuisance)
*
- * @version $Revision$ Updated: $Date$
*/
public class LogFunction2 extends AbstractFunction implements Serializable {
private static Logger log = LoggingManager.getLoggerForClass();
private static final List desc = new LinkedList();
- private static final String KEY = "__logn";
+ private static final String KEY = "__logn"; //$NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 1;
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/MachineName.java Sat May 5 16:43:53 2007
@@ -35,14 +35,13 @@
private static final List desc = new LinkedList();
- private static final String KEY = "__machineName";
+ private static final String KEY = "__machineName"; //$NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int PARAMETER_COUNT = 1;
static {
- // desc.add("Use fully qualified host name: TRUE/FALSE (Default
- // FALSE)");
- desc.add(JMeterUtils.getResString("function_name_param"));
+ // desc.add("Use fully qualified host name: TRUE/FALSE (Default FALSE)");
+ desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
}
private Object[] values;
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java Sat May 5 16:43:53 2007
@@ -46,16 +46,16 @@
private static final List desc = new LinkedList();
- private static final String KEY = "__property";
+ private static final String KEY = "__property"; //$NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 1;
private static final int MAX_PARAMETER_COUNT = 3;
static {
- desc.add(JMeterUtils.getResString("property_name_param"));
- desc.add(JMeterUtils.getResString("function_name_param"));
- desc.add(JMeterUtils.getResString("property_default_param"));
+ desc.add(JMeterUtils.getResString("property_name_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("property_default_param")); //$NON-NLS-1$
}
private Object[] values;
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property2.java Sat May 5 16:43:53 2007
@@ -47,21 +47,20 @@
* Returns: - the property value, but if not found - the default value, but if
* not present - "1" (suitable for use in ThreadGroup GUI)
*
- * @version $Revision$ Updated: $Date$
*/
public class Property2 extends AbstractFunction implements Serializable {
private static final List desc = new LinkedList();
- private static final String KEY = "__P";
+ private static final String KEY = "__P"; //$NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 1;
private static final int MAX_PARAMETER_COUNT = 2;
static {
- desc.add(JMeterUtils.getResString("property_name_param"));
- desc.add(JMeterUtils.getResString("property_default_param"));
+ desc.add(JMeterUtils.getResString("property_name_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("property_default_param")); //$NON-NLS-1$
}
private Object[] values;
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/SetProperty.java Sat May 5 16:43:53 2007
@@ -36,26 +36,25 @@
* Usage:
*
* Set the property value in the appropriate GUI by using the string:
- * ${__setProperty(propname,propvalue)}
+ * ${__setProperty(propname,propvalue[,returnvalue?])}
*
- * Returns: nothing
+ * Returns: nothing or original value if the 3rd parameter is true
*
- * @version $Revision$ Updated: $Date$
*/
public class SetProperty extends AbstractFunction implements Serializable {
private static final List desc = new LinkedList();
- private static final String KEY = "__setProperty";
+ private static final String KEY = "__setProperty"; //$NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 2;
private static final int MAX_PARAMETER_COUNT = 3;
static {
- desc.add(JMeterUtils.getResString("property_name_param"));
- desc.add(JMeterUtils.getResString("property_value_param"));
- desc.add(JMeterUtils.getResString("property_returnvalue_param"));
+ desc.add(JMeterUtils.getResString("property_name_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("property_value_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("property_returnvalue_param")); //$NON-NLS-1$
}
private Object[] values;
@@ -75,7 +74,7 @@
boolean returnValue = false;// should we return original value?
if (values.length > 2) {
- returnValue = ((CompoundVariable) values[2]).execute().equalsIgnoreCase("true");
+ returnValue = ((CompoundVariable) values[2]).execute().equalsIgnoreCase("true"); //$NON-NLS-1$
}
if (returnValue) { // Only obtain and cast the return if needed
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/ThreadNumber.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/ThreadNumber.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/ThreadNumber.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/ThreadNumber.java Sat May 5 16:43:53 2007
@@ -31,7 +31,7 @@
*/
public class ThreadNumber implements Function, Serializable {
- private static final String KEY = "__threadNum";
+ private static final String KEY = "__threadNum"; //$NON-NLS-1$
private static final List desc = new LinkedList();
@@ -41,7 +41,7 @@
* @see org.apache.jmeter.functions.Function#execute(SampleResult, Sampler)
*/
public String execute(SampleResult previousResult, Sampler currentSampler) throws InvalidVariableException {
- return Thread.currentThread().getName().substring(Thread.currentThread().getName().lastIndexOf("-") + 1);
+ return Thread.currentThread().getName().substring(Thread.currentThread().getName().lastIndexOf("-") + 1); //$NON-NLS-1$
}
/*
Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java Sat May 5 16:43:53 2007
@@ -38,20 +38,19 @@
* - the variable value, but if not found
* - the variable name itself
*
- * @version $Revision: 493781 $ Updated: $Date: 2007-01-07 17:52:05 +0000 (Sun, 07 Jan 2007) $
*/
public class Variable extends AbstractFunction implements Serializable {
private static final List desc = new LinkedList();
- private static final String KEY = "__V";
+ private static final String KEY = "__V"; //$NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 1;
private static final int MAX_PARAMETER_COUNT = 1;
static {
- desc.add(JMeterUtils.getResString("variable_name_param"));
+ desc.add(JMeterUtils.getResString("variable_name_param")); //$NON-NLS-1$
}
private Object[] values;
Modified: jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java Sat May 5 16:43:53 2007
@@ -50,7 +50,6 @@
* The <code>JUnitTestSamplerGui</code> class provides the user interface
* for the {@link JUnitTestSampler}.
*
- * @version $Revision$ on $Date$
*/
public class JUnitTestSamplerGui extends AbstractSamplerGui
implements ChangeListener, ActionListener
@@ -135,7 +134,7 @@
}
public String getDocAnchor() {
- return "JUnit_Sampler";
+ return "JUnit_Sampler"; // TODO - use default ?
}
/**
@@ -170,7 +169,7 @@
}
JLabel label =
- new JLabel(JMeterUtils.getResString("protocol_java_classname"));
+ new JLabel(JMeterUtils.getResString("protocol_java_classname")); //$NON-NLS-1$
classnameCombo = new JComboBox(CLASSLIST.toArray());
classnameCombo.addActionListener(this);
Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java Sat May 5 16:43:53 2007
@@ -45,15 +45,15 @@
private JScrollPane SCROLL = null;
// NOTUSED Font plainText = new Font("plain", Font.PLAIN, 9);
- public static final String INFO_H = JMeterUtils.getResString("monitor_equation_healthy");
+ public static final String INFO_H = JMeterUtils.getResString("monitor_equation_healthy"); //$NON-NLS-1$
- public static final String INFO_A = JMeterUtils.getResString("monitor_equation_active");
+ public static final String INFO_A = JMeterUtils.getResString("monitor_equation_active"); //$NON-NLS-1$
- public static final String INFO_W = JMeterUtils.getResString("monitor_equation_warning");
+ public static final String INFO_W = JMeterUtils.getResString("monitor_equation_warning"); //$NON-NLS-1$
- public static final String INFO_D = JMeterUtils.getResString("monitor_equation_dead");
+ public static final String INFO_D = JMeterUtils.getResString("monitor_equation_dead"); //$NON-NLS-1$
- public static final String INFO_LOAD = JMeterUtils.getResString("monitor_equation_load");
+ public static final String INFO_LOAD = JMeterUtils.getResString("monitor_equation_load"); //$NON-NLS-1$
/**
*
@@ -78,7 +78,7 @@
*/
protected void init() {
this.setLayout(new BorderLayout());
- ImageIcon legend = JMeterUtils.getImage("monitor-legend.gif");
+ ImageIcon legend = JMeterUtils.getImage("monitor-legend.gif"); //$NON-NLS-1$
JLabel label = new JLabel(legend);
label.setPreferredSize(new Dimension(550, 25));
this.add(label, BorderLayout.NORTH);
Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java Sat May 5 16:43:53 2007
@@ -75,7 +75,7 @@
}
public String getLabelResource() {
- return "monitor_health_title";
+ return "monitor_health_title"; // $NON-NLS-1$
}
/**
@@ -140,7 +140,7 @@
*/
public void createHealthPane(MonitorTabPane pane) {
HEALTHPANE = new MonitorHealthPanel(MODEL);
- pane.addTab(JMeterUtils.getResString("monitor_health_tab_title"), HEALTHPANE);
+ pane.addTab(JMeterUtils.getResString("monitor_health_tab_title"), HEALTHPANE); // $NON-NLS-1$
}
/**
@@ -150,7 +150,7 @@
*/
public void createPerformancePane(MonitorTabPane pane) {
PERFPANE = new MonitorPerformancePanel(MODEL, GRAPH);
- pane.addTab(JMeterUtils.getResString("monitor_performance_tab_title"), PERFPANE);
+ pane.addTab(JMeterUtils.getResString("monitor_performance_tab_title"), PERFPANE); // $NON-NLS-1$
}
protected Container makeTitlePanel() {
Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java Sat May 5 16:43:53 2007
@@ -59,41 +59,41 @@
private SampleResult ROOTSAMPLE;
- public static final String LEGEND_HEALTH = JMeterUtils.getResString("monitor_legend_health");
+ public static final String LEGEND_HEALTH = JMeterUtils.getResString("monitor_legend_health"); //$NON-NLS-1$
- public static final String LEGEND_LOAD = JMeterUtils.getResString("monitor_legend_load");
+ public static final String LEGEND_LOAD = JMeterUtils.getResString("monitor_legend_load"); //$NON-NLS-1$
- public static final String LEGEND_MEM = JMeterUtils.getResString("monitor_legend_memory_per");
+ public static final String LEGEND_MEM = JMeterUtils.getResString("monitor_legend_memory_per"); //$NON-NLS-1$
- public static final String LEGEND_THREAD = JMeterUtils.getResString("monitor_legend_thread_per");
+ public static final String LEGEND_THREAD = JMeterUtils.getResString("monitor_legend_thread_per"); //$NON-NLS-1$
- public static final ImageIcon LEGEND_HEALTH_ICON = JMeterUtils.getImage("monitor-green-legend.gif");
+ public static final ImageIcon LEGEND_HEALTH_ICON = JMeterUtils.getImage("monitor-green-legend.gif"); //$NON-NLS-1$
- public static final ImageIcon LEGEND_LOAD_ICON = JMeterUtils.getImage("monitor-blue-legend.gif");
+ public static final ImageIcon LEGEND_LOAD_ICON = JMeterUtils.getImage("monitor-blue-legend.gif"); //$NON-NLS-1$
- public static final ImageIcon LEGEND_MEM_ICON = JMeterUtils.getImage("monitor-orange-legend.gif");
+ public static final ImageIcon LEGEND_MEM_ICON = JMeterUtils.getImage("monitor-orange-legend.gif"); //$NON-NLS-1$
- public static final ImageIcon LEGEND_THREAD_ICON = JMeterUtils.getImage("monitor-red-legend.gif");
+ public static final ImageIcon LEGEND_THREAD_ICON = JMeterUtils.getImage("monitor-red-legend.gif"); //$NON-NLS-1$
- public static final String GRID_LABEL_TOP = JMeterUtils.getResString("monitor_label_left_top");
+ public static final String GRID_LABEL_TOP = JMeterUtils.getResString("monitor_label_left_top"); //$NON-NLS-1$
- public static final String GRID_LABEL_MIDDLE = JMeterUtils.getResString("monitor_label_left_middle");
+ public static final String GRID_LABEL_MIDDLE = JMeterUtils.getResString("monitor_label_left_middle"); //$NON-NLS-1$
- public static final String GRID_LABEL_BOTTOM = JMeterUtils.getResString("monitor_label_left_bottom");
+ public static final String GRID_LABEL_BOTTOM = JMeterUtils.getResString("monitor_label_left_bottom"); //$NON-NLS-1$
- public static final String GRID_LABEL_HEALTHY = JMeterUtils.getResString("monitor_label_right_healthy");
+ public static final String GRID_LABEL_HEALTHY = JMeterUtils.getResString("monitor_label_right_healthy"); //$NON-NLS-1$
- public static final String GRID_LABEL_ACTIVE = JMeterUtils.getResString("monitor_label_right_active");
+ public static final String GRID_LABEL_ACTIVE = JMeterUtils.getResString("monitor_label_right_active"); //$NON-NLS-1$
- public static final String GRID_LABEL_WARNING = JMeterUtils.getResString("monitor_label_right_warning");
+ public static final String GRID_LABEL_WARNING = JMeterUtils.getResString("monitor_label_right_warning"); //$NON-NLS-1$
- public static final String GRID_LABEL_DEAD = JMeterUtils.getResString("monitor_label_right_dead");
+ public static final String GRID_LABEL_DEAD = JMeterUtils.getResString("monitor_label_right_dead"); //$NON-NLS-1$
- public static final String PERF_TITLE = JMeterUtils.getResString("monitor_performance_title");
+ public static final String PERF_TITLE = JMeterUtils.getResString("monitor_performance_title"); //$NON-NLS-1$
- public static final String SERVER_TITLE = JMeterUtils.getResString("monitor_performance_servers");
+ public static final String SERVER_TITLE = JMeterUtils.getResString("monitor_performance_servers"); //$NON-NLS-1$
- protected Font plaintext = new Font("plain", Font.TRUETYPE_FONT, 10);
+ protected Font plaintext = new Font("plain", Font.TRUETYPE_FONT, 10); //$NON-NLS-1$
/**
*
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java Sat May 5 16:43:53 2007
@@ -115,7 +115,7 @@
}
private JPanel createServerPanel() {
- JLabel label = new JLabel(JMeterUtils.getResString("server"));
+ JLabel label = new JLabel(JMeterUtils.getResString("server")); //$NON-NLS-1$
server = new JTextField(10);
label.setLabelFor(server);
@@ -127,7 +127,7 @@
}
private JPanel createLocalFilenamePanel() {
- JLabel label = new JLabel(JMeterUtils.getResString("ftp_local_file"));
+ JLabel label = new JLabel(JMeterUtils.getResString("ftp_local_file")); //$NON-NLS-1$
localFile = new JTextField(10);
label.setLabelFor(localFile);
@@ -139,7 +139,7 @@
}
private JPanel createRemoteFilenamePanel() {
- JLabel label = new JLabel(JMeterUtils.getResString("ftp_remote_file"));
+ JLabel label = new JLabel(JMeterUtils.getResString("ftp_remote_file")); //$NON-NLS-1$
remoteFile = new JTextField(10);
label.setLabelFor(remoteFile);
@@ -154,15 +154,15 @@
ButtonGroup group = new ButtonGroup();
- getBox = new JRadioButton(JMeterUtils.getResString("ftp_get"));
+ getBox = new JRadioButton(JMeterUtils.getResString("ftp_get")); //$NON-NLS-1$
group.add(getBox);
getBox.setSelected(true);
- putBox = new JRadioButton(JMeterUtils.getResString("ftp_put"));
+ putBox = new JRadioButton(JMeterUtils.getResString("ftp_put")); //$NON-NLS-1$
group.add(putBox);
- binaryMode = new JCheckBox(JMeterUtils.getResString("ftp_binary_mode"));
- saveResponseData = new JCheckBox(JMeterUtils.getResString("ftp_save_response_data"));
+ binaryMode = new JCheckBox(JMeterUtils.getResString("ftp_binary_mode")); //$NON-NLS-1$
+ saveResponseData = new JCheckBox(JMeterUtils.getResString("ftp_save_response_data")); //$NON-NLS-1$
JPanel optionsPanel = new HorizontalPanel();
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java Sat May 5 16:43:53 2007
@@ -30,10 +30,6 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-/**
- *
- * @version $Revision$ last updated $Date$
- */
public class FtpTestSamplerGui extends AbstractSamplerGui {
private LoginConfigGui loginPanel;
@@ -78,7 +74,7 @@
}
public String getLabelResource() {
- return "ftp_testing_title";
+ return "ftp_testing_title"; // $NON-NLS-1$
}
private void init() {
@@ -93,7 +89,7 @@
mainPanel.add(ftpDefaultPanel);
loginPanel = new LoginConfigGui(false);
- loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
+ loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config"))); // $NON-NLS-1$
mainPanel.add(loginPanel);
add(mainPanel, BorderLayout.CENTER);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org