Author: sebb
Date: Fri Apr 4 12:16:15 2008
New Revision: 644831
URL: http://svn.apache.org/viewvc?rev=644831&view=rev
Log:
Fix some typos; import correct class
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?rev=644831&r1=644830&r2=644831&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
Fri Apr 4 12:16:15 2008
@@ -43,7 +43,7 @@
public static final String PARAMETERS =
"BeanShellAssertion.parameters"; //$NON-NLS-1$
- public static final String RESET_INTREPRETER =
"BeanShellSampler.resetInterpreter"; //$NON-NLS-1$
+ public static final String RESET_INTERPRETER =
"BeanShellAssertion.resetInterpreter"; //$NON-NLS-1$
// can be specified in jmeter.properties
public static final String INIT_FILE = "beanshell.assertion.init";
//$NON-NLS-1$
@@ -65,7 +65,7 @@
}
public boolean isResetInterpreter() {
- return getPropertyAsBoolean(RESET_INTREPRETER);
+ return getPropertyAsBoolean(RESET_INTERPRETER);
}
/*
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java?rev=644831&r1=644830&r2=644831&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
Fri Apr 4 12:16:15 2008
@@ -29,7 +29,6 @@
import javax.swing.JTextField;
import org.apache.jmeter.assertions.BeanShellAssertion;
-import org.apache.jmeter.protocol.java.sampler.BeanShellSampler;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.util.JMeterUtils;
@@ -52,7 +51,7 @@
scriptField.setText(element.getPropertyAsString(BeanShellAssertion.SCRIPT));
filename.setText(element.getPropertyAsString(BeanShellAssertion.FILENAME));
parameters.setText(element.getPropertyAsString(BeanShellAssertion.PARAMETERS));
-
resetInterpreter.setSelected(element.getPropertyAsBoolean(BeanShellSampler.RESET_INTREPRETER));
+
resetInterpreter.setSelected(element.getPropertyAsBoolean(BeanShellAssertion.RESET_INTERPRETER));
super.configure(element);
}
@@ -73,7 +72,7 @@
te.setProperty(BeanShellAssertion.SCRIPT,
scriptField.getText());
te.setProperty(BeanShellAssertion.FILENAME, filename.getText());
te.setProperty(BeanShellAssertion.PARAMETERS,
parameters.getText());
- te.setProperty(new
BooleanProperty(BeanShellAssertion.RESET_INTREPRETER,
resetInterpreter.isSelected()));
+ te.setProperty(new
BooleanProperty(BeanShellAssertion.RESET_INTERPRETER,
resetInterpreter.isSelected()));
}
public String getLabelResource() {
@@ -96,7 +95,7 @@
private JPanel createResetPanel() {
resetInterpreter = new
JCheckBox(JMeterUtils.getResString("bsh_script_reset_interpreter")); //
$NON-NLS-1$
- resetInterpreter.setName(BeanShellSampler.PARAMETERS);
+ resetInterpreter.setName(BeanShellAssertion.PARAMETERS);
JPanel resetInterpreterPanel = new JPanel(new BorderLayout());
resetInterpreterPanel.add(resetInterpreter, BorderLayout.WEST);
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java?rev=644831&r1=644830&r2=644831&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
Fri Apr 4 12:16:15 2008
@@ -52,7 +52,7 @@
scriptField.setText(element.getPropertyAsString(BeanShellSampler.SCRIPT));
filename.setText(element.getPropertyAsString(BeanShellSampler.FILENAME));
parameters.setText(element.getPropertyAsString(BeanShellSampler.PARAMETERS));
-
resetInterpreter.setSelected(element.getPropertyAsBoolean(BeanShellSampler.RESET_INTREPRETER));
+
resetInterpreter.setSelected(element.getPropertyAsBoolean(BeanShellSampler.RESET_INTERPRETER));
super.configure(element);
}
@@ -73,7 +73,7 @@
te.setProperty(BeanShellSampler.SCRIPT, scriptField.getText());
te.setProperty(BeanShellSampler.FILENAME, filename.getText());
te.setProperty(BeanShellSampler.PARAMETERS,
parameters.getText());
- te.setProperty(new
BooleanProperty(BeanShellSampler.RESET_INTREPRETER,
resetInterpreter.isSelected()));
+ te.setProperty(new
BooleanProperty(BeanShellSampler.RESET_INTERPRETER,
resetInterpreter.isSelected()));
}
/**
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java?rev=644831&r1=644830&r2=644831&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
Fri Apr 4 12:16:15 2008
@@ -48,7 +48,7 @@
public static final String INIT_FILE = "beanshell.sampler.init";
//$NON-NLS-1$
- public static final String RESET_INTREPRETER =
"BeanShellSampler.resetInterpreter"; //$NON-NLS-1$
+ public static final String RESET_INTERPRETER =
"BeanShellSampler.resetInterpreter"; //$NON-NLS-1$
protected String getInitFileProperty() {
return INIT_FILE;
@@ -77,7 +77,7 @@
}
public boolean isResetInterpreter() {
- return getPropertyAsBoolean(RESET_INTREPRETER);
+ return getPropertyAsBoolean(RESET_INTERPRETER);
}
public SampleResult sample(Entry e)// Entry tends to be ignored ...
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]