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/12/04 12:24:31 UTC
svn commit: r600885 - in
/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions:
BeanShell.java IterationCounter.java JavaScript.java Property.java
StringFromFile.java
Author: sebb
Date: Tue Dec 4 03:24:30 2007
New Revision: 600885
URL: http://svn.apache.org/viewvc?rev=600885&view=rev
Log:
Use optional version of variable name resource
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java?rev=600885&r1=600884&r2=600885&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java Tue Dec 4 03:24:30 2007
@@ -42,7 +42,7 @@
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private static final List desc = new LinkedList();
@@ -52,7 +52,7 @@
static {
desc.add(JMeterUtils.getResString("bsh_function_expression"));// $NON-NLS1$
- desc.add(JMeterUtils.getResString("function_name_param"));// $NON-NLS1$
+ desc.add(JMeterUtils.getResString("function_name_paropt"));// $NON-NLS1$
}
transient private Object[] values;
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=600885&r1=600884&r2=600885&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java Tue Dec 4 03:24:30 2007
@@ -31,7 +31,7 @@
public class IterationCounter extends AbstractFunction implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private static final List desc = new LinkedList();
@@ -49,7 +49,7 @@
static {
desc.add(JMeterUtils.getResString("iteration_counter_arg_1")); //$NON-NLS-1$
- desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_paropt")); //$NON-NLS-1$
}
transient private Object[] variables;
@@ -116,8 +116,8 @@
variables = parameters.toArray();
- if (variables.length < 1) {
- throw new InvalidVariableException("Need at least 1 parameter");
+ if (variables.length < 1 || variables.length > 2) {
+ throw new InvalidVariableException("Expecting 1 or 2 parameters, but found " + variables.length);//$NON-NLS-1$
}
}
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=600885&r1=600884&r2=600885&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java Tue Dec 4 03:24:30 2007
@@ -40,6 +40,8 @@
public class JavaScript extends AbstractFunction implements Serializable {
+ private static final long serialVersionUID = 2L;
+
private static final List desc = new LinkedList();
private static final String KEY = "__javaScript"; //$NON-NLS-1$
@@ -48,7 +50,7 @@
static {
desc.add(JMeterUtils.getResString("javascript_expression"));//$NON-NLS-1$
- desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_paropt")); //$NON-NLS-1$
}
private Object[] values;
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java?rev=600885&r1=600884&r2=600885&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java Tue Dec 4 03:24:30 2007
@@ -44,6 +44,8 @@
*/
public class Property extends AbstractFunction implements Serializable {
+ private static final long serialVersionUID = 2L;
+
private static final List desc = new LinkedList();
private static final String KEY = "__property"; //$NON-NLS-1$
@@ -54,7 +56,7 @@
static {
desc.add(JMeterUtils.getResString("property_name_param")); //$NON-NLS-1$
- desc.add(JMeterUtils.getResString("function_name_param")); //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_paropt")); //$NON-NLS-1$
desc.add(JMeterUtils.getResString("property_default_param")); //$NON-NLS-1$
}
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=600885&r1=600884&r2=600885&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java Tue Dec 4 03:24:30 2007
@@ -63,7 +63,7 @@
public class StringFromFile extends AbstractFunction implements Serializable, TestListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private static final List desc = new LinkedList();
@@ -75,7 +75,7 @@
static {
desc.add(JMeterUtils.getResString("string_from_file_file_name"));//$NON-NLS-1$
- desc.add(JMeterUtils.getResString("function_name_param"));//$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_paropt"));//$NON-NLS-1$
desc.add(JMeterUtils.getResString("string_from_file_seq_start"));//$NON-NLS-1$
desc.add(JMeterUtils.getResString("string_from_file_seq_final"));//$NON-NLS-1$
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org