sebb 2005/03/06 09:34:30
Modified: src/core/org/apache/jmeter/resources Tag: rel-2_0
messages.properties
src/components/org/apache/jmeter/assertions/gui Tag: rel-2_0
BeanShellAssertionGui.java
Log:
Move details of script variables to bottom of screen (more room)
Revision Changes Path
No revision
No revision
1.106.2.17 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.106.2.16
retrieving revision 1.106.2.17
diff -u -r1.106.2.16 -r1.106.2.17
--- messages.properties 6 Mar 2005 12:45:27 -0000 1.106.2.16
+++ messages.properties 6 Mar 2005 17:34:29 -0000 1.106.2.17
@@ -38,7 +38,8 @@
bsf_script_file=Script file to run
bsf_script_language=Scripting language\:
bsf_script_parameters=Parameters to pass to script/file\:
-bsh_assertion_script=Script (IO: Failure[Message], Response. IN:
Response[Data|Code|Message|Headers], RequestHeaders, Sample[Label|rData])
+bsh_assertion_script=Script
+bsh_assertion_script_variables=The following variables are defined for the
script:\nRead/Write: Failure, FailureMessage, SampleResult, log.\nReadOnly:
Response[Data|Code|Message|Headers], RequestHeaders, SampleLabel, SamplerData
bsh_assertion_title=BeanShell Assertion
bsh_function_expression=Expression to evaluate
bsh_sampler_title=BeanShell Sampler
No revision
No revision
1.4.2.1 +10 -2
jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
Index: BeanShellAssertionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- BeanShellAssertionGui.java 5 Mar 2004 01:32:13 -0000 1.4
+++ BeanShellAssertionGui.java 6 Mar 2005 17:34:29 -0000 1.4.2.1
@@ -141,6 +141,14 @@
JPanel panel = new JPanel(new BorderLayout());
panel.add(label, BorderLayout.NORTH);
panel.add(new JScrollPane(scriptField), BorderLayout.CENTER);
+
+ JTextArea explain = new JTextArea(
+
JMeterUtils.getResString("bsh_assertion_script_variables"));
+ explain.setLineWrap(true);
+ explain.setEditable(false);
+ explain.setBackground(this.getBackground());
+ panel.add(explain, BorderLayout.SOUTH);
+
return panel;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
