Author: sebb
Date: Mon Mar 31 07:55:01 2008
New Revision: 643010
URL: http://svn.apache.org/viewvc?rev=643010&view=rev
Log:
Fix Javadoc; use resources for descriptor
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=643010&r1=643009&r2=643010&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Mon Mar 31 07:55:01 2008
@@ -567,7 +567,7 @@
regex_src_body=Body
regex_src_hdrs=Headers
regex_src_url=URL
-regexfunc_param_1=Regular expression used to search results from previous
request
+regexfunc_param_1=Regular expression used to search previous sample - or
variable.
regexfunc_param_2=Template for the replacement string, using groups from the
regular expression. Format is $[group]$. Example $1$.
regexfunc_param_3=Which match to use. An integer 1 or greater, RAND to
indicate JMeter should randomly choose, A float, or ALL indicating all matches
should be used ([1])
regexfunc_param_4=Between text. If ALL is selected, the between text will be
used to generate the results ([""])
@@ -715,6 +715,8 @@
spline_visualizer_minimum=Minimum
spline_visualizer_title=Spline Visualizer
spline_visualizer_waitingmessage=Waiting for samples
+split_function_string=String to split
+split_function_separator=String to split on. Default is , (comma).
ssl_alias_prompt=Please type your preferred alias
ssl_alias_select=Select your alias for the test
ssl_alias_title=Client Alias
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=643010&r1=643009&r2=643010&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
Mon Mar 31 07:55:01 2008
@@ -27,6 +27,7 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
@@ -34,12 +35,24 @@
// @see org.apache.jmeter.functions.PackageTest for unit tests
/**
- * Function to log a message
- *
- * Parameters: - string - log level (optional; defaults to INFO; or DEBUG if
- * unrecognised) - throwable message (optional)
- *
- * Returns: - the input string
+ * Function to split a string into variables
+ * <p>
+ * Parameters:
+ * <ul>
+ * <li>String to split</li>
+ * <li>Variable name prefix</li>
+ * <li>String to split on (optional, default is comma)</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Returns: the input string
+ * </p>
+ * Also sets the variables:
+ * <ul>
+ * <li>VARNAME - the input string</li>
+ * <li>VARNAME_n - number of fields found</li>
+ * <li>VARNAME_1..n - fields</li>
+ * </ul>
*
*/
public class SplitFunction extends AbstractFunction implements Serializable {
@@ -56,9 +69,9 @@
private static final int MAX_PARAMETER_COUNT = 3;
static {
- desc.add("String to split");
- desc.add("Variable name");
- desc.add("Split character (omit for ',')");
+ desc.add(JMeterUtils.getResString("split_function_string")); // output
variable name //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("function_name_param")); // output
variable name //$NON-NLS-1$
+ desc.add(JMeterUtils.getResString("split_function_separator")); //
output variable name //$NON-NLS-1$
}
private Object[] values;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
