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 2006/04/05 23:08:33 UTC
svn commit: r391811 -
/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/
Author: sebb
Date: Wed Apr 5 14:08:31 2006
New Revision: 391811
URL: http://svn.apache.org/viewcvs?rev=391811&view=rev
Log:
Tidy up; add NLS markers
Modified:
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/CSVRead.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/FileWrapper.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/IterationCounter.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/Random.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/StringFromFile.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPath.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathWrapper.java
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/CSVRead.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/CSVRead.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/CSVRead.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/CSVRead.java Wed Apr 5 14:08:31 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
@@ -54,17 +53,17 @@
* @version $Revision$ Last Updated: $Date$
*/
public class CSVRead extends AbstractFunction implements Serializable {
- transient private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
- private static final String KEY = "__CSVRead"; // Function name
+ private static final String KEY = "__CSVRead"; // Function name //$NON-NLS-1$
private static final List desc = new LinkedList();
private Object[] values; // Parameter list
static {
- desc.add(JMeterUtils.getResString("csvread_file_file_name"));
- desc.add(JMeterUtils.getResString("column_number"));
+ desc.add(JMeterUtils.getResString("csvread_file_file_name")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("column_number")); //$NON-NLS-1$
}
public CSVRead() {
@@ -80,7 +79,7 @@
*/
public synchronized String execute(SampleResult previousResult, Sampler currentSampler)
throws InvalidVariableException {
- String myValue = "";
+ String myValue = ""; //$NON-NLS-1$
String fileName = ((org.apache.jmeter.engine.util.CompoundVariable) values[0]).execute();
String columnOrNext = ((org.apache.jmeter.engine.util.CompoundVariable) values[1]).execute();
@@ -88,16 +87,16 @@
log.debug("execute (" + fileName + " , " + columnOrNext + ") ");
// Process __CSVRead(filename,*ALIAS)
- if (columnOrNext.startsWith("*")) {
+ if (columnOrNext.startsWith("*")) { //$NON-NLS-1$
FileWrapper.open(fileName, columnOrNext);
/*
* All done, so return
*/
- return "";
+ return ""; //$NON-NLS-1$
}
// if argument is 'next' - go to the next line
- if (columnOrNext.equals("next()") || columnOrNext.equals("next")) {
+ if (columnOrNext.equals("next()") || columnOrNext.equals("next")) { //$NON-NLS-1$ //$NON-NLS-2$
FileWrapper.endRow(fileName);
/*
@@ -109,7 +108,7 @@
* otherwise the wrong line can be retrieved when using multiple
* threads.
*/
- return "";
+ return ""; //$NON-NLS-1$
}
try {
@@ -166,8 +165,7 @@
* for functions to detect that a run is starting seems to be the
* setParameters() call.
*/
- FileWrapper.clearAll();// TODO only clear the relevant entry - if
- // possible...
+ FileWrapper.clearAll();// TODO only clear the relevant entry - if possible...
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/FileWrapper.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/FileWrapper.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/FileWrapper.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/FileWrapper.java Wed Apr 5 14:08:31 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -38,7 +37,7 @@
*/
public class FileWrapper {
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private FileRowColContainer container;
@@ -46,7 +45,7 @@
private static final int NO_LINE = -1;
- private static String defaultFile = ""; // for omitted file names
+ private static String defaultFile = ""; // for omitted file names //$NON-NLS-1$
/*
* This Map serves two purposes:
@@ -149,7 +148,7 @@
FileWrapper fw = (FileWrapper) (my).get(file);
if (fw == null) // First call
{
- if (file.startsWith("*")) {
+ if (file.startsWith("*")) { //$NON-NLS-1$
log.warn("Cannot perform initial open using alias " + file);
} else {
file = checkDefault(file);
@@ -185,9 +184,8 @@
if (fw == null) // Not yet open
{
return -1;
- } else {
- return fw.currentRow;
}
+ return fw.currentRow;
}
/**
@@ -202,6 +200,6 @@
i.remove();
}
fileContainers.clear();
- defaultFile = "";
+ defaultFile = ""; //$NON-NLS-1$
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/IterationCounter.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/IterationCounter.java Wed Apr 5 14:08:31 2006
@@ -41,8 +41,8 @@
};
static {
- desc.add(JMeterUtils.getResString("iteration_counter_arg_1"));
- desc.add(JMeterUtils.getResString("function_name_param"));
+ desc.add(JMeterUtils.getResString("iteration_counter_arg_1")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
}
transient private Object[] variables;
@@ -74,12 +74,12 @@
boolean perThread = Boolean.valueOf(((CompoundVariable) variables[0]).execute()).booleanValue();
- String varName = "";
+ String varName = ""; //$NON-NLS-1$
if (variables.length >=2) {// Ensure variable has been provided
varName = ((CompoundVariable) variables[1]).execute();
}
- String counterString = "";
+ String counterString = ""; //$NON-NLS-1$
if (perThread) {
int threadCounter;
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/Random.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/Random.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/Random.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/Random.java Wed Apr 5 14:08:31 2006
@@ -38,12 +38,12 @@
private static final List desc = new LinkedList();
- private static final String KEY = "__Random";
+ private static final String KEY = "__Random"; //$NON-NLS-1$
static {
- desc.add(JMeterUtils.getResString("minimum_param"));
- desc.add(JMeterUtils.getResString("maximum_param"));
- desc.add(JMeterUtils.getResString("function_name_param"));
+ desc.add(JMeterUtils.getResString("minimum_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("maximum_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
}
private transient CompoundVariable varName, minimum, maximum;
@@ -96,11 +96,10 @@
if (values.length < 3) {
throw new InvalidVariableException();
- } else {
- varName = (CompoundVariable) values[2];
- minimum = (CompoundVariable) values[0];
- maximum = (CompoundVariable) values[1];
}
+ varName = (CompoundVariable) values[2];
+ minimum = (CompoundVariable) values[0];
+ maximum = (CompoundVariable) values[1];
}
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java Wed Apr 5 14:08:31 2006
@@ -44,13 +44,13 @@
import org.apache.oro.text.regex.Util;
public class RegexFunction extends AbstractFunction implements Serializable {
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
- public static final String ALL = "ALL";
+ public static final String ALL = "ALL"; //$NON-NLS-1$
- public static final String RAND = "RAND";
+ public static final String RAND = "RAND"; //$NON-NLS-1$
- public static final String KEY = "__regexFunction";
+ public static final String KEY = "__regexFunction"; //$NON-NLS-1$
private Object[] values;// Parameters are stored here
@@ -73,16 +73,17 @@
private static final int MAX_PARAMETER_COUNT = 6;
static {
- desc.add(JMeterUtils.getResString("regexfunc_param_1"));// regex
- desc.add(JMeterUtils.getResString("regexfunc_param_2"));// template
- desc.add(JMeterUtils.getResString("regexfunc_param_3"));// which match
- desc.add(JMeterUtils.getResString("regexfunc_param_4"));// between text
- desc.add(JMeterUtils.getResString("regexfunc_param_5"));// default text
- desc.add(JMeterUtils.getResString("function_name_param"));
+ desc.add(JMeterUtils.getResString("regexfunc_param_1"));// regex //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("regexfunc_param_2"));// template //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("regexfunc_param_3"));// which match //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("regexfunc_param_4"));// between text //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("regexfunc_param_5"));// default text //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
}
public RegexFunction() {
- templatePattern = patternCache.getPattern("\\$(\\d+)\\$", Perl5Compiler.READ_ONLY_MASK);
+ templatePattern = patternCache.getPattern("\\$(\\d+)\\$", //$NON-NLS-1$
+ Perl5Compiler.READ_ONLY_MASK);
}
// For serialised objects, do the same work as the constructor:
@@ -94,8 +95,8 @@
public synchronized String execute(SampleResult previousResult, Sampler currentSampler)
throws InvalidVariableException {
- String valueIndex = "", defaultValue = "", between = "";
- String name = "";
+ String valueIndex = "", defaultValue = "", between = ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ String name = ""; //$NON-NLS-1$
Pattern searchPattern;
Object[] tmplt;
try {
@@ -106,8 +107,8 @@
if (values.length > 2) {
valueIndex = ((CompoundVariable) values[2]).execute();
}
- if (valueIndex.equals("")) {
- valueIndex = "1";
+ if (valueIndex.equals("")) { //$NON-NLS-1$
+ valueIndex = "1"; //$NON-NLS-1$
}
if (values.length > 3) {
@@ -116,7 +117,7 @@
if (values.length > 4) {
String dv = ((CompoundVariable) values[4]).execute();
- if (!dv.equals("")) {
+ if (!dv.equals("")) { //$NON-NLS-1$
defaultValue = dv;
}
}
@@ -146,13 +147,13 @@
collectAllMatches.add(match);
}
} catch (NumberFormatException e) {//TODO: can this occur?
- log.error("", e);
+ log.error("", e); //$NON-NLS-1$
return defaultValue;
} catch (UnsupportedEncodingException e) {
log.error("Can't convert ResponseData", e);
return defaultValue;
} finally {
- vars.put(name + "_matchNr", "" + collectAllMatches.size());
+ vars.put(name + "_matchNr", "" + collectAllMatches.size()); //$NON-NLS-1$ //$NON-NLS-2$
}
if (collectAllMatches.size() == 0) {
@@ -195,7 +196,7 @@
private void saveGroups(MatchResult result, String namep, JMeterVariables vars) {
if (result != null) {
for (int x = 0; x < result.groups(); x++) {
- vars.put(namep + "_g" + x, result.group(x));
+ vars.put(namep + "_g" + x, result.group(x)); //$NON-NLS-1$
}
}
}
@@ -262,7 +263,8 @@
}
private boolean isFirstElementGroup(String rawData) {
- Pattern pattern = patternCache.getPattern("^\\$\\d+\\$", Perl5Compiler.READ_ONLY_MASK);
+ Pattern pattern = patternCache.getPattern("^\\$\\d+\\$", //$NON-NLS-1$
+ Perl5Compiler.READ_ONLY_MASK);
return new Perl5Matcher().contains(rawData, pattern);
}
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/StringFromFile.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/StringFromFile.java Wed Apr 5 14:08:31 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
@@ -58,7 +57,7 @@
* @version $Revision$ Updated on: $Date$
*/
public class StringFromFile extends AbstractFunction implements Serializable, TestListener {
- private static Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static final List desc = new LinkedList();
@@ -341,7 +340,7 @@
}
public void testEnded() {
- this.testEnded("");
+ this.testEnded(""); //$NON-NLS-1$
}
public void testEnded(String host) {
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPath.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPath.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPath.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPath.java Wed Apr 5 14:08:31 2006
@@ -45,21 +45,21 @@
*
*/
public class XPath extends AbstractFunction implements Serializable {
- transient private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
// static {
// LoggingManager.setPriority("DEBUG","jmeter");
// LoggingManager.setTarget(new java.io.PrintWriter(System.out));
// }
- private static final String KEY = "__XPath"; // Function name
+ private static final String KEY = "__XPath"; // Function name //$NON-NLS-1$
private static final List desc = new LinkedList();
private Object[] values; // Parameter list
static {
- desc.add(JMeterUtils.getResString("xpath_file_file_name"));
- desc.add(JMeterUtils.getResString("xpath_expression"));
+ desc.add(JMeterUtils.getResString("xpath_file_file_name")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("xpath_expression")); //$NON-NLS-1$
}
public XPath() {
@@ -75,7 +75,7 @@
*/
public synchronized String execute(SampleResult previousResult, Sampler currentSampler)
throws InvalidVariableException {
- String myValue = "";
+ String myValue = ""; //$NON-NLS-1$
String fileName = ((org.apache.jmeter.engine.util.CompoundVariable) values[0]).execute();
String xpathString = ((org.apache.jmeter.engine.util.CompoundVariable) values[1]).execute();
@@ -130,8 +130,7 @@
* for functions to detect that a run is starting seems to be the
* setParameters() call.
*/
- XPathWrapper.clearAll();// TODO only clear the relevant entry - if
- // possible...
+ XPathWrapper.clearAll();// TODO only clear the relevant entry - if possible...
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathFileContainer.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathFileContainer.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathFileContainer.java Wed Apr 5 14:08:31 2006
@@ -41,7 +41,7 @@
*/
public class XPathFileContainer {
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ private static Logger log = LoggingManager.getLoggerForClass();
private NodeList nodeList;
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathWrapper.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathWrapper.java?rev=391811&r1=391810&r2=391811&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathWrapper.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/XPathWrapper.java Wed Apr 5 14:08:31 2006
@@ -37,7 +37,7 @@
*/
public class XPathWrapper {
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
/*
* This Map serves two purposes:
@@ -102,7 +102,7 @@
// TODO improve the error handling
if (xpfc == null) {
log.error("XPathWrapper is null!");
- return "";
+ return ""; //$NON-NLS-1$
}
my.put(key,xpfc); // save our local copy
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org