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 2010/02/23 17:09:13 UTC
svn commit: r915405 [1/3] - in /jakarta/jmeter/trunk/src:
components/org/apache/jmeter/assertions/
components/org/apache/jmeter/assertions/gui/
components/org/apache/jmeter/config/ components/org/apache/jmeter/control/
components/org/apache/jmeter/extr...
Author: sebb
Date: Tue Feb 23 16:09:09 2010
New Revision: 915405
URL: http://svn.apache.org/viewvc?rev=915405&view=rev
Log:
Remove trailing spaces
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SubstitutionElement.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/NamedTreeNode.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuInfo.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollectorHelper.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/Interruptible.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBean.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/VariablesCollection.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ShutdownClient.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/HeapDumper.java
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
jakarta/jmeter/trunk/src/junit/test/AfterAnnotatedTest.java
jakarta/jmeter/trunk/src/junit/test/BeforeAnnotatedTest.java
jakarta/jmeter/trunk/src/junit/test/DummyAnnotatedTest.java
jakarta/jmeter/trunk/src/junit/test/SetupTestError.java
jakarta/jmeter/trunk/src/junit/test/SetupTestFail.java
jakarta/jmeter/trunk/src/junit/test/TearDownTestFail.java
jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java
jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java
jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPage.java
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java Tue Feb 23 16:09:09 2010
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
@@ -29,9 +29,9 @@
public class BSFAssertion extends BSFTestElement implements Cloneable, Assertion, TestBean
{
private static final Logger log = LoggingManager.getLoggerForClass();
-
+
private static final long serialVersionUID = 234L;
-
+
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
try {
@@ -40,7 +40,7 @@
result.setFailure(true);
result.setError(true);
result.setFailureMessage("BSF Manager not found");
- return result;
+ return result;
}
mgr.declareBean("SampleResult", response, SampleResult.class);
mgr.declareBean("AssertionResult", result, AssertionResult.class);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java Tue Feb 23 16:09:09 2010
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
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=915405&r1=915404&r2=915405&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 Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
@@ -30,7 +30,7 @@
/**
* A sampler which understands BeanShell
- *
+ *
*/
public class BeanShellAssertion extends BeanShellTestElement implements Assertion {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -42,7 +42,7 @@
public static final String SCRIPT = "BeanShellAssertion.query"; //$NON-NLS-1$
public static final String PARAMETERS = "BeanShellAssertion.parameters"; //$NON-NLS-1$
-
+
public static final String RESET_INTERPRETER = "BeanShellAssertion.resetInterpreter"; //$NON-NLS-1$
// can be specified in jmeter.properties
@@ -67,7 +67,7 @@
public String getParameters() {
return getPropertyAsString(PARAMETERS);
}
-
+
@Override
public boolean isResetInterpreter() {
return getPropertyAsBoolean(RESET_INTERPRETER);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java Tue Feb 23 16:09:09 2010
@@ -37,7 +37,7 @@
LoopIterationListener {
private static final long serialVersionUID = 240L;
-
+
private transient List<SampleResult> responses;
private transient final StringSubstitution emptySub = new StringSubstitution(""); //$NON-NLS-1$
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java Tue Feb 23 16:09:09 2010
@@ -38,7 +38,7 @@
p = property("compareTime"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, new Long(-1));
- p.setValue(NOT_EXPRESSION, Boolean.FALSE);
+ p.setValue(NOT_EXPRESSION, Boolean.FALSE);
p = property("stringsToSkip"); //$NON-NLS-1$
p.setPropertyEditorClass(TableEditor.class);
p.setValue(TableEditor.CLASSNAME,SubstitutionElement.class.getName());
@@ -50,7 +50,7 @@
p.setValue(NOT_UNDEFINED,Boolean.TRUE);
p.setValue(DEFAULT,new ArrayList<Object>());
p.setValue(MULTILINE,Boolean.TRUE);
-
+
}
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java Tue Feb 23 16:09:09 2010
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
@@ -32,9 +32,9 @@
public class JSR223Assertion extends JSR223TestElement implements Cloneable, Assertion, TestBean
{
private static final Logger log = LoggingManager.getLoggerForClass();
-
+
private static final long serialVersionUID = 234L;
-
+
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
try {
@@ -43,7 +43,7 @@
result.setFailure(true);
result.setError(true);
result.setFailureMessage("JSR223 Manager not found");
- return result;
+ return result;
}
mgr.put("SampleResult", response);
mgr.put("AssertionResult", result);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java Tue Feb 23 16:09:09 2010
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
@@ -84,7 +84,7 @@
// Mask should contain all types (but not NOT)
private final static int TYPE_MASK = CONTAINS | EQUALS | MATCH | SUBSTRING;
-
+
private static final int EQUALS_SECTION_DIFF_LEN
= JMeterUtils.getPropDefault("assertion.equals_section_diff_len", 100);
@@ -192,7 +192,7 @@
/***************************************************************************
* !ToDoo (Method description)
- *
+ *
* @return !ToDo (Return description)
**************************************************************************/
public String getTestField() {
@@ -201,7 +201,7 @@
/***************************************************************************
* !ToDoo (Method description)
- *
+ *
* @return !ToDo (Return description)
**************************************************************************/
public int getTestType() {
@@ -214,7 +214,7 @@
/***************************************************************************
* !ToDoo (Method description)
- *
+ *
* @return !ToDo (Return description)
**************************************************************************/
public CollectionProperty getTestStrings() {
@@ -275,7 +275,7 @@
/**
* Make sure the response satisfies the specified assertion requirements.
- *
+ *
* @param response
* an instance of SampleResult
* @return an instance of AssertionResult
@@ -302,10 +302,10 @@
} else if (isTestFieldResponseHeaders()) {
toCheck = response.getResponseHeaders();
} else { // Assume it is the URL
- toCheck = "";
+ toCheck = "";
final URL url = response.getURL();
if (url != null){
- toCheck = url.toString();
+ toCheck = url.toString();
}
}
@@ -327,7 +327,7 @@
if (debugEnabled){
log.debug("Type:" + (contains?"Contains":"Match") + (notTest? "(not)": ""));
}
-
+
try {
// Get the Matcher for this thread
Perl5Matcher localMatcher = JMeterUtils.getMatcher();
@@ -367,18 +367,18 @@
/**
* Generate the failure reason from the TestType
- *
+ *
* @param stringPattern
- * @return the message for the assertion report
+ * @return the message for the assertion report
*/
// TODO strings should be resources
private String getFailText(String stringPattern, String toCheck) {
-
+
StringBuilder sb = new StringBuilder(200);
sb.append("Test failed: ");
if (isScopeVariable()){
- sb.append("variable(").append(getVariableName()).append(')');
+ sb.append("variable(").append(getVariableName()).append(')');
} else if (isTestFieldResponseData()) {
sb.append("text");
} else if (isTestFieldResponseCode()) {
@@ -418,15 +418,15 @@
}
sb.append("/");
-
+
if (isEqualsType()){
sb.append(equalsComparisonText(toCheck, stringPattern));
} else {
sb.append(stringPattern);
}
-
+
sb.append("/");
-
+
return sb.toString();
}
@@ -506,7 +506,7 @@
} else {
recDeltaSeq += pad.toString();
}
-
+
text.append("\n\n");
text.append(RECEIVED_STR);
text.append(startingEqSeq);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SubstitutionElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SubstitutionElement.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SubstitutionElement.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SubstitutionElement.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
@@ -22,36 +22,34 @@
public class SubstitutionElement extends AbstractTestElement {
private static final long serialVersionUID = 1;
-
+
// These constants are used both for the JMX file and for the setters/getters
public static final String REGEX = "regex"; // $NON-NLS-1$
-
+
public static final String SUBSTITUTE = "substitute"; // $NON-NLS-1$
public SubstitutionElement() {
super();
}
-
+
public String getRegex()
{
return getProperty(REGEX).getStringValue();
}
-
+
public void setRegex(String regex)
{
setProperty(REGEX,regex);
}
-
+
public String getSubstitute()
{
return getProperty(SUBSTITUTE).getStringValue();
}
-
+
public void setSubstitute(String sub)
{
setProperty(SUBSTITUTE,sub);
}
-
-
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions;
@@ -43,7 +43,7 @@
/**
* Checks if the result is a well-formed XML content and whether it matches an
* XPath
- *
+ *
*/
public class XPathAssertion extends AbstractTestElement implements Serializable, Assertion {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -91,7 +91,7 @@
Document doc = null;
boolean isXML = JOrphanUtils.isXML(responseData);
-
+
try {
doc = XPathUtil.makeDocument(new ByteArrayInputStream(responseData), isValidating(),
isWhitespace(), isNamespace(), isTolerant(), isQuiet(), showWarnings() , reportErrors(), isXML
@@ -112,7 +112,7 @@
result.setFailureMessage(new StringBuilder("ParserConfigurationException: ").append(e.getMessage())
.toString());
return result;
- } catch (TidyException e) {
+ } catch (TidyException e) {
result.setError(true);
result.setFailureMessage(e.getMessage());
return result;
@@ -180,7 +180,7 @@
/**
* Get The XPath String that will be used in matching the document
- *
+ *
* @return String xpath String
*/
public String getXPathString() {
@@ -189,7 +189,7 @@
/**
* Set the XPath String this will be used as an xpath
- *
+ *
* @param xpath
* String
*/
@@ -199,7 +199,7 @@
/**
* Set whether to ignore element whitespace
- *
+ *
* @param whitespace
*/
public void setWhitespace(boolean whitespace) {
@@ -208,7 +208,7 @@
/**
* Set use validation
- *
+ *
* @param validate
*/
public void setValidating(boolean validate) {
@@ -217,7 +217,7 @@
/**
* Set whether this is namespace aware
- *
+ *
* @param namespace
*/
public void setNamespace(boolean namespace) {
@@ -226,7 +226,7 @@
/**
* Set tolerant mode if required
- *
+ *
* @param tolerant
* true/false
*/
@@ -240,7 +240,7 @@
/**
* Is this whitepsace ignored.
- *
+ *
* @return boolean
*/
public boolean isWhitespace() {
@@ -249,7 +249,7 @@
/**
* Is this validating
- *
+ *
* @return boolean
*/
public boolean isValidating() {
@@ -258,7 +258,7 @@
/**
* Is this namespace aware?
- *
+ *
* @return boolean
*/
public boolean isNamespace() {
@@ -267,7 +267,7 @@
/**
* Is this using tolerant mode?
- *
+ *
* @return boolean
*/
public boolean isTolerant() {
@@ -276,7 +276,7 @@
/**
* Negate the XPath test, that is return true if something is not found.
- *
+ *
* @return boolean negated
*/
public boolean isNegated() {
@@ -286,23 +286,23 @@
public void setReportErrors(boolean val) {
setProperty(REPORT_ERRORS_KEY, val, false);
}
-
+
public boolean reportErrors() {
return getPropertyAsBoolean(REPORT_ERRORS_KEY, false);
}
-
+
public void setShowWarnings(boolean val) {
setProperty(SHOW_WARNINGS_KEY, val, false);
}
-
+
public boolean showWarnings() {
return getPropertyAsBoolean(SHOW_WARNINGS_KEY, false);
}
-
+
public void setQuiet(boolean val) {
setProperty(QUIET_KEY, val, true);
}
-
+
public boolean isQuiet() {
return getPropertyAsBoolean(QUIET_KEY, true);
}
@@ -310,7 +310,7 @@
public void setDownloadDTDs(boolean val) {
setProperty(DOWNLOAD_DTDS, val, false);
}
-
+
public boolean isDownloadDTDs() {
return getPropertyAsBoolean(DOWNLOAD_DTDS, false);
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -44,12 +44,12 @@
/**
* GUI interface for a {@link ResponseAssertion}.
- *
+ *
*/
public class AssertionGui extends AbstractAssertionGui {
private static final long serialVersionUID = 240L;
- /** The name of the table column in the list of patterns. */
+ /** The name of the table column in the list of patterns. */
private static final String COL_RESOURCE_NAME = "assertion_patterns_to_test"; //$NON-NLS-1$
/** Radio button indicating that the text response should be tested. */
@@ -138,7 +138,7 @@
ResponseAssertion ra = (ResponseAssertion) el;
saveScopeSettings(ra);
-
+
ra.clearTestStrings();
String[] testStrings = tableModel.getData().getColumn(COL_RESOURCE_NAME);
for (int i = 0; i < testStrings.length; i++) {
@@ -176,14 +176,14 @@
}
}
}
-
+
/**
* Implements JMeterGUIComponent.clearGui
*/
@Override
public void clearGui() {
super.clearGui();
-
+
tableModel.clearData();
responseStringButton.setSelected(true);
@@ -192,17 +192,17 @@
responseMessageButton.setSelected(false);
responseHeadersButton.setSelected(false);
assumeSuccess.setSelected(false);
-
+
containsBox.setSelected(true);
notBox.setSelected(false);
- }
+ }
/**
* A newly created component can be initialized with the contents of a Test
* Element object by calling this method. The component is responsible for
* querying the Test Element object for the relevant information to display
* in its GUI.
- *
+ *
* @param el
* the TestElement to configure
*/
@@ -212,7 +212,7 @@
ResponseAssertion model = (ResponseAssertion) el;
showScopeSettings(model);
-
+
if (model.isContainsType()) {
containsBox.setSelected(true);
} else if (model.isEqualsType()) {
@@ -274,7 +274,7 @@
/**
* Create a panel allowing the user to choose which response field should be
* tested.
- *
+ *
* @return a new panel for selecting the response field
*/
private JPanel createFieldPanel() {
@@ -311,7 +311,7 @@
/**
* Create a panel allowing the user to choose what type of test should be
* performed.
- *
+ *
* @return a new panel for selecting the type of assertion test
*/
private JPanel createTypePanel() {
@@ -346,7 +346,7 @@
/**
* Create a panel allowing the user to supply a list of string patterns to
* test against.
- *
+ *
* @return a new panel for adding string patterns
*/
private JPanel createStringPanel() {
@@ -372,7 +372,7 @@
/**
* Create a panel with buttons to add and delete string patterns.
- *
+ *
* @return the new panel with add and delete buttons
*/
private JPanel createButtonPanel() {
@@ -391,7 +391,7 @@
/**
* An ActionListener for deleting a pattern.
- *
+ *
*/
private class ClearPatternsListener implements ActionListener {
public void actionPerformed(ActionEvent e) {
@@ -409,7 +409,7 @@
/**
* An ActionListener for adding a pattern.
- *
+ *
*/
private class AddPatternListener implements ActionListener {
public void actionPerformed(ActionEvent e) {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -59,7 +59,7 @@
/**
* Modifies a given TestElement to mirror the data in the gui components.
- *
+ *
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
public void modifyTestElement(TestElement el) {
@@ -77,9 +77,9 @@
@Override
public void clearGui() {
super.clearGui();
-
+
duration.setText(""); //$NON-NLS-1$
- }
+ }
@Override
public void configure(TestElement el) {
@@ -106,15 +106,15 @@
getDurationAttributesTitle()));
JPanel labelPanel = new JPanel(new BorderLayout(5, 0));
- JLabel durationLabel =
- new JLabel(JMeterUtils.getResString("duration_assertion_label")); // $NON-NLS-1$
+ JLabel durationLabel =
+ new JLabel(JMeterUtils.getResString("duration_assertion_label")); // $NON-NLS-1$
labelPanel.add(durationLabel, BorderLayout.WEST);
duration = new JTextField();
labelPanel.add(duration, BorderLayout.CENTER);
durationLabel.setLabelFor(duration);
durationPanel.add(labelPanel);
-
+
mainPanel.add(durationPanel);
add(mainPanel, BorderLayout.CENTER);
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -100,7 +100,7 @@
/**
* Modifies a given TestElement to mirror the data in the gui components.
- *
+ *
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
public void modifyTestElement(TestElement inElement) {
@@ -159,11 +159,11 @@
warningThresholdField.setText("0"); //$NON-NLS-1$
filePanel.setFilename(""); //$NON-NLS-1$
errorsOnly.setSelected(false);
- }
+ }
/**
* Configures the associated test element.
- *
+ *
* @param inElement
*/
@Override
@@ -261,7 +261,7 @@
/**
* This method is called if one of the threshold field looses the focus
- *
+ *
* @param inEvent
*/
public void focusLost(FocusEvent inEvent) {
@@ -313,7 +313,7 @@
/**
* This method is called from erros-only checkbox
- *
+ *
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent e) {
@@ -335,7 +335,7 @@
if (fieldName.equals(WARNING_THRESHOLD_FIELD)) {
validateInteger(warningThresholdField);
}
-
+
if (fieldName.equals(ERROR_THRESHOLD_FIELD)) {
validateInteger(errorThresholdField);
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java Tue Feb 23 16:09:09 2010
@@ -13,12 +13,12 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
/**
* GUI class supporting the MD5Hex assertion functionality.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -55,7 +55,7 @@
// USER_INPUT
HorizontalPanel md5HexPanel = new HorizontalPanel();
- md5HexPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+ md5HexPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils.getResString("md5hex_assertion_md5hex_test"))); // $NON-NLS-1$
md5HexPanel.add(new JLabel(JMeterUtils.getResString("md5hex_assertion_label"))); //$NON-NLS-1$
@@ -103,14 +103,14 @@
}
((MD5HexAssertion) element).setAllowedMD5Hex(md5HexString);
}
-
+
/**
* Implements JMeterGUIComponent.clearGui
*/
@Override
public void clearGui() {
super.clearGui();
-
+
md5HexInput.setText(""); //$NON-NLS-1$
- }
+ }
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -67,7 +67,7 @@
/**
* Modifies a given TestElement to mirror the data in the gui components.
- *
+ *
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
public void modifyTestElement(TestElement el) {
@@ -84,14 +84,14 @@
assertion.setCompOper(getState());
saveScopeSettings(assertion);
}
-
+
/**
* Implements JMeterGUIComponent.clearGui
*/
@Override
public void clearGui() {
super.clearGui();
-
+
size.setText(""); //$NON-NLS-1$
equalButton.setSelected(true);
notequalButton.setSelected(false);
@@ -100,7 +100,7 @@
greaterthanequalButton.setSelected(false);
lessthanequalButton.setSelected(false);
execState = SizeAssertion.EQUAL;
- }
+ }
@Override
public void configure(TestElement el) {
@@ -150,7 +150,7 @@
add(makeTitlePanel());
add(createScopePanel(true));
-
+
// USER_INPUT
JPanel sizePanel = new JPanel();
sizePanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
@@ -213,7 +213,7 @@
isInvalid = true;
}
if (isInvalid) {
- JOptionPane.showMessageDialog(null,
+ JOptionPane.showMessageDialog(null,
JMeterUtils.getResString("size_assertion_input_error"), //$NON-NLS-1$
"Error",
JOptionPane.ERROR_MESSAGE);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -36,15 +36,15 @@
private JCheckBox validate, tolerant, whitespace, namespace;
private JCheckBox quiet; // Should Tidy be quiet?
-
+
private JCheckBox reportErrors; // Report Tidy errors as Assertion failure?
-
+
private JCheckBox showWarnings; // Show Tidy warnings ?
-
+
private JCheckBox downloadDTDs; // Should we download external DTDs?
/**
- *
+ *
*/
public XMLConfPanel() {
super();
@@ -62,7 +62,7 @@
tolerant.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
tolerant();
- }
+ }
});
downloadDTDs = new JCheckBox(JMeterUtils.getResString("xml_download_dtds")); //$NON-NLS-1$
Box tidyOptions = Box.createHorizontalBox();
@@ -71,14 +71,14 @@
tidyOptions.add(quiet);
tidyOptions.add(reportErrors);
tidyOptions.add(showWarnings);
-
+
Box untidyOptions = Box.createHorizontalBox();
untidyOptions.setBorder(BorderFactory.createEtchedBorder());
untidyOptions.add(namespace);
untidyOptions.add(validate);
untidyOptions.add(whitespace);
untidyOptions.add(downloadDTDs);
-
+
Box options = Box.createVerticalBox();
options.add(tidyOptions);
options.add(untidyOptions);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -36,7 +36,7 @@
/**
* XMLSchemaAssertionGUI.java author <a href="mailto:d.maung@mdl.com">Dave Maung</a>
- *
+ *
*/
public class XMLSchemaAssertionGUI extends AbstractAssertionGui {
@@ -73,7 +73,7 @@
/**
* Modifies a given TestElement to mirror the data in the gui components.
- *
+ *
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
public void modifyTestElement(TestElement inElement) {
@@ -89,13 +89,13 @@
@Override
public void clearGui() {
super.clearGui();
-
+
xmlSchema.setText(""); //$NON-NLS-1$
- }
+ }
/**
* Configures the GUI from the associated test element.
- *
+ *
* @param el -
* the test element (should be XMLSchemaAssertion)
*/
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.assertions.gui;
@@ -94,7 +94,7 @@
/**
* Modifies a given TestElement to mirror the data in the gui components.
- *
+ *
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
public void modifyTestElement(TestElement el) {
@@ -106,18 +106,18 @@
xml.modifyTestElement(assertion);
}
}
-
+
/**
* Implements JMeterGUIComponent.clearGui
*/
@Override
public void clearGui() {
super.clearGui();
-
+
xpath.setXPath("/"); //$NON-NLS-1$
xpath.setNegated(false);
-
+
xml.setDefaultValues();
- }
+ }
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java Tue Feb 23 16:09:09 2010
@@ -118,15 +118,15 @@
}
final String names = getVariableNames();
if (names == null || names.length()==0) {
- String header = server.reserveFile(_fileName, getFileEncoding(), alias, true);
+ String header = server.reserveFile(_fileName, getFileEncoding(), alias, true);
try {
vars = CSVSaveService.csvSplitString(header, getDelimiter().charAt(0));
} catch (IOException e) {
log.warn("Could not split CSV header line",e);
- }
+ }
} else {
server.reserveFile(_fileName, getFileEncoding(), alias);
- vars = JOrphanUtils.split(names, ","); // $NON-NLS-1$
+ vars = JOrphanUtils.split(names, ","); // $NON-NLS-1$
}
}
try {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java Tue Feb 23 16:09:09 2010
@@ -43,11 +43,11 @@
private String maximumValue;
private String variableName;
-
+
private String outputFormat;
private String randomSeed;
-
+
private boolean perThread;
// This class is not cloned per thread, so this is shared
@@ -65,15 +65,15 @@
return new Random(getRandomSeedAsLong());
}};
}
-
+
private int n;
private long minimum;
-
+
private Object readResolve(){
perThreadRandom = initThreadLocal();
return this;
}
-
+
/*
* nextInt(n) returns values in the range [0,n),
* so n must be set to max-min+1
@@ -95,7 +95,7 @@
}
n = (int)rangeL;
}
-
+
/** {@inheritDoc} */
public void iterationStart(LoopIterationEvent iterEvent) {
Random randGen=null;
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java Tue Feb 23 16:09:09 2010
@@ -68,7 +68,7 @@
return integer;
}
}
-
+
// These items are shared between threads in a group by the clone() method
// They are initialised by testStarted() so don't need to be serialised
private transient MutableInteger globalNumExecutions;
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Tue Feb 23 16:09:09 2010
@@ -175,7 +175,7 @@
}
return inputString;
}
-
+
private List<MatchResult> processMatches(String regex, SampleResult result, int matchNumber, JMeterVariables vars) {
if (log.isDebugEnabled()) {
log.debug("Regex = " + regex);
@@ -189,7 +189,7 @@
if (isScopeVariable()){
String inputString=vars.get(getVariableName());
matchStrings(matchNumber, matcher, pattern, matches, found,
- inputString);
+ inputString);
} else {
List<SampleResult> sampleList = getSampleList(result);
for (SampleResult sr : sampleList) {
@@ -324,7 +324,7 @@
combined.add(new Integer(currentResult.group(1)));// add match as Integer
beginOffset = currentResult.endOffset(0);
}
-
+
if (beginOffset < rawTemplate.length()) { // trailing string is not empty
combined.add(rawTemplate.substring(beginOffset, rawTemplate.length()));
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java Tue Feb 23 16:09:09 2010
@@ -152,14 +152,14 @@
for(int i=0; i < matchCount; i++){
value = matches.get(i);
if (value != null) {
- vars.put(concat(refName,i+1),matches.get(i));
+ vars.put(concat(refName,i+1),matches.get(i));
}
}
}
vars.remove(concat(refName,matchCount+1)); // Just in case
// Clear any other remaining variables
for(int i=matchCount+2; i <= prevCount; i++) {
- vars.remove(concat(refName,i));
+ vars.remove(concat(refName,i));
}
}catch(IOException e){// e.g. DTD not reachable
final String errorMessage = "IOException on ("+getXPathQuery()+")";
@@ -307,7 +307,7 @@
* @param d the document
* @param query the query to execute
* @param matchStrings list of matched strings (may include nulls)
- *
+ *
* @throws TransformerException
*/
private void getValuesForXPath(Document d,String query, List<String> matchStrings)
@@ -322,7 +322,7 @@
Node match = matches.item(i);
if ( match instanceof Element){
if (getFragment()){
- val = getValueForNode(match);
+ val = getValueForNode(match);
} else {
// elements have empty nodeValue, but we are usually interested in their content
final Node firstChild = match.getFirstChild();
@@ -331,7 +331,7 @@
} else {
val = match.getNodeValue(); // TODO is this correct?
}
- }
+ }
} else {
val = match.getNodeValue();
}
@@ -348,7 +348,7 @@
}
public void setWhitespace(boolean selected) {
- setProperty(WHITESPACE, selected, false);
+ setProperty(WHITESPACE, selected, false);
}
public boolean isWhitespace() {
@@ -369,8 +369,8 @@
public boolean isDownloadDTDs() {
return getPropertyAsBoolean(DOWNLOAD_DTDS, false);
- }
-
+ }
+
private String getValueForNode(Node node) {
StringWriter sw = new StringWriter();
try {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java Tue Feb 23 16:09:09 2010
@@ -44,19 +44,19 @@
private static final long serialVersionUID = 240L;
- private final JLabeledTextField defaultField =
+ private final JLabeledTextField defaultField =
new JLabeledTextField(JMeterUtils.getResString("default_value_field"));//$NON-NLS-1$
- private final JLabeledTextField xpathQueryField =
+ private final JLabeledTextField xpathQueryField =
new JLabeledTextField(JMeterUtils.getResString("xpath_extractor_query"));//$NON-NLS-1$
- private final JLabeledTextField refNameField =
+ private final JLabeledTextField refNameField =
new JLabeledTextField(JMeterUtils.getResString("ref_name_field"));//$NON-NLS-1$
// Should we return fragment as text, rather than text of fragment?
- private final JCheckBox getFragment =
+ private final JCheckBox getFragment =
new JCheckBox(JMeterUtils.getResString("xpath_extractor_fragment"));//$NON-NLS-1$
-
+
private final XMLConfPanel xml = new XMLConfPanel();
public String getLabelResource() {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Tue Feb 23 16:09:09 2010
@@ -79,7 +79,7 @@
context.getEngine().stopTest();
} else {
log.info("Stopping all threads");
- context.getEngine().askThreadsToStop();
+ context.getEngine().askThreadsToStop();
}
}
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java Tue Feb 23 16:09:09 2010
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.jmeter.visualizers;
@@ -28,20 +28,20 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-public class BSFListener extends BSFTestElement
+public class BSFListener extends BSFTestElement
implements Cloneable, SampleListener, TestBean, Visualizer {
// N.B. Needs to implement Visualizer so that TestBeanGUI can find the correct GUI class
private static final Logger log = LoggingManager.getLoggerForClass();
-
+
private static final long serialVersionUID = 234L;
-
+
public void sampleOccurred(SampleEvent event) {
try {
BSFManager mgr = getManager();
if (mgr == null) {
log.error("Problem creating BSF manager");
- return;
+ return;
}
mgr.declareBean("sampleEvent", event, SampleEvent.class);
SampleResult result = event.getResult();
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java Tue Feb 23 16:09:09 2010
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.jmeter.visualizers;
@@ -31,14 +31,14 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-public class JSR223Listener extends JSR223TestElement
+public class JSR223Listener extends JSR223TestElement
implements Cloneable, SampleListener, TestBean, Visualizer {
// N.B. Needs to implement Visualizer so that TestBeanGUI can find the correct GUI class
private static final Logger log = LoggingManager.getLoggerForClass();
-
+
private static final long serialVersionUID = 234L;
-
+
public void sampleOccurred(SampleEvent event) {
try {
ScriptEngineManager sem = getManager();
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java Tue Feb 23 16:09:09 2010
@@ -44,7 +44,7 @@
private static final ImageIcon imageFailure = JMeterUtils.getImage(
JMeterUtils.getPropDefault("viewResultsTree.failure", //$NON-NLS-1$
"icon_warning_sml.gif")); //$NON-NLS-1$
-
+
public TreeNodeRenderer() {
super();
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Tue Feb 23 16:09:09 2010
@@ -744,7 +744,7 @@
println("Creating summariser <" + summariserName + ">");
summer = new Summariser(summariserName);
}
-
+
if (logFile != null) {
ResultCollector logger = new ResultCollector(summer);
logger.setFilename(logFile);
@@ -756,7 +756,7 @@
tree.add(tree.getArray()[0], summer);
}
}
-
+
List<JMeterEngine> engines = new LinkedList<JMeterEngine>();
tree.add(tree.getArray()[0], new ListenToTest(parent, (remoteStart && remoteStop) ? engines : null));
println("Created the tree successfully using "+testFile);
@@ -842,7 +842,7 @@
// Replacement only needs to occur when starting the engine
// @see StandardJMeterEngine.run()
if (item.getUserObject() instanceof ReplaceableController) {
- ReplaceableController rc =
+ ReplaceableController rc =
(ReplaceableController) item.getTestElement();
HashTree subTree = tree.getTree(item);
@@ -1019,7 +1019,7 @@
/**
* Check if JMeter is running in non-GUI mode.
- *
+ *
* @return true if JMeter is running in non-GUI mode.
*/
public static boolean isNonGUI(){
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Argument.java Tue Feb 23 16:09:09 2010
@@ -138,11 +138,11 @@
public String toString() {
return getName() + getMetaData() + getValue();
}
-
+
/**
* Is this parameter skippable, i.e. empty/blank string
* or it looks like an unrecognised variable.
- *
+ *
* @param parameterName - parameter name
* @return true if parameter should be skipped
*/
@@ -150,7 +150,7 @@
if (parameterName.trim().length()==0){
return true; // Skip parameters with a blank name (allows use of optional variables in parameter lists)
}
- // TODO: improve this test
+ // TODO: improve this test
if (parameterName.trim().startsWith("${") && parameterName.endsWith("}")){// $NON-NLS-1$ $NON-NLS-2$
return true; // Missing variable name
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java Tue Feb 23 16:09:09 2010
@@ -51,7 +51,7 @@
// TODO: This class looks a lot like ArgumentsPanel. What exactly is the
// difference? Could they be combined?
// Note: it seems that this class is not actually used ...
-
+
/** The table of configuration parameters. */
private JTable table;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java Tue Feb 23 16:09:09 2010
@@ -60,12 +60,12 @@
* Cumulated pause time to excluse timer and post/pre processor times
*/
private transient long pauseTime;
-
+
/**
* Previous end time
*/
private transient long prevEndTime;
-
+
private static final String PARENT = "TransactionController.parent";// $NON-NLS-1$
private final static String INCLUDE_TIMERS = "TransactionController.includeTimers";// $NON-NLS-1$
@@ -231,7 +231,7 @@
public void sampleStopped(SampleEvent e) {
}
-
+
/**
* Whether to include timers and pre/post processor time in overall sample.
* @param includeTimers
@@ -242,7 +242,7 @@
/**
* Whether to include timer and pre/post processor time in overall sample.
- *
+ *
* @return boolean (defaults to true for backwards compatibility)
*/
public boolean isIncludeTimers() {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java Tue Feb 23 16:09:09 2010
@@ -51,7 +51,7 @@
private JTextField theCondition;
private JCheckBox useExpression;
-
+
private JCheckBox evaluateAll;
/**
@@ -194,11 +194,11 @@
+ theCondition.getPreferredSize().width), BorderLayout.NORTH);
JPanel optionPanel = new JPanel();
-
+
// Use expression instead of Javascript
useExpression = new JCheckBox(JMeterUtils.getResString("if_controller_expression")); // $NON-NLS-1$
optionPanel.add(useExpression);
-
+
// Evaluate All checkbox
evaluateAll = new JCheckBox(JMeterUtils.getResString("if_controller_evaluate_all")); // $NON-NLS-1$
optionPanel.add(evaluateAll);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java Tue Feb 23 16:09:09 2010
@@ -55,7 +55,7 @@
RemoteObject robj = (RemoteObject) remobj;
System.out.println("Using remote object: "+robj.getRef().remoteToString());
}
- return rje;
+ return rje;
}
throw new RemoteException("Could not find "+name);
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Tue Feb 23 16:09:09 2010
@@ -250,7 +250,7 @@
socket.close();
}
}
-
+
}
private void removeThreadGroups(List<?> elements) {
@@ -328,7 +328,7 @@
public void run() {
log.info("Stopping test");
notifyTestListenersOfEnd(testListenersSave);
- }
+ }
}.start();
}
}
@@ -362,7 +362,7 @@
exit();
} else {
JMeterUtils.reportErrorToUser(
- JMeterUtils.getResString("stopping_test_failed"),
+ JMeterUtils.getResString("stopping_test_failed"),
JMeterUtils.getResString("stopping_test_title"));
// TODO - perhaps allow option to stop them?
}
@@ -613,7 +613,7 @@
try {
Thread.sleep(ms);
} catch (InterruptedException e) {
- }
+ }
}
public void setProperties(Properties p) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.functions;
@@ -34,7 +34,7 @@
/**
* <p><b>
- * N.B. setParameters() and execute() are called from different threads,
+ * N.B. setParameters() and execute() are called from different threads,
* so both must be synchronized unless there are no parameters to save
* </b></p>
* @see Function#execute(SampleResult, Sampler)
@@ -49,15 +49,15 @@
}
/**
- *
+ *
* <p><b>
- * N.B. setParameters() and execute() are called from different threads,
+ * N.B. setParameters() and execute() are called from different threads,
* so both must be synchronized unless there are no parameters to save
* </b></p>
- *
+ *
* @see Function#setParameters(Collection)
* <br/>
- * Note: This is always called even if no parameters are provided
+ * Note: This is always called even if no parameters are provided
* (versions of JMeter after 2.3.1)
*/
abstract public void setParameters(Collection<CompoundVariable> parameters) throws InvalidVariableException;
@@ -70,17 +70,17 @@
protected JMeterVariables getVariables() {
return JMeterContextService.getContext().getVariables();
}
-
+
/**
* Utility method to check parameter counts.
- *
+ *
* @param parameters collection of parameters
* @param min minimum number of parameters allowed
* @param max maximum number of parameters allowed
- *
+ *
* @throws InvalidVariableException if the number of parameters is incorrect
*/
- protected void checkParameterCount(Collection<CompoundVariable> parameters, int min, int max)
+ protected void checkParameterCount(Collection<CompoundVariable> parameters, int min, int max)
throws InvalidVariableException
{
int num = parameters.size();
@@ -89,8 +89,8 @@
getReferenceKey() +
" called with wrong number of parameters. Actual: "+num+
(
- min==max ?
- ". Expected: "+min+"."
+ min==max ?
+ ". Expected: "+min+"."
: ". Expected: >= "+min+" and <= "+max
)
);
@@ -99,40 +99,40 @@
/**
* Utility method to check parameter counts.
- *
+ *
* @param parameters collection of parameters
* @param count number of parameters expected
- *
+ *
* @throws InvalidVariableException if the number of parameters is incorrect
*/
- protected void checkParameterCount(Collection<CompoundVariable> parameters, int count)
+ protected void checkParameterCount(Collection<CompoundVariable> parameters, int count)
throws InvalidVariableException
{
int num = parameters.size();
if (num != count) {
throw new InvalidVariableException(
getReferenceKey() +
- " called with wrong number of parameters. Actual: "+num+". Expected: "+count+"."
+ " called with wrong number of parameters. Actual: "+num+". Expected: "+count+"."
);
}
}
/**
* Utility method to check parameter counts.
- *
+ *
* @param parameters collection of parameters
* @param minimum number of parameters expected
- *
+ *
* @throws InvalidVariableException if the number of parameters is incorrect
*/
- protected void checkMinParameterCount(Collection<CompoundVariable> parameters, int minimum)
+ protected void checkMinParameterCount(Collection<CompoundVariable> parameters, int minimum)
throws InvalidVariableException
{
int num = parameters.size();
if (num < minimum) {
throw new InvalidVariableException(
getReferenceKey() +
- " called with wrong number of parameters. Actual: "+num+". Expected at least: "+minimum+"."
+ " called with wrong number of parameters. Actual: "+num+". Expected at least: "+minimum+"."
);
}
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.gui;
@@ -37,7 +37,7 @@
super.clearGui();
if (scopePanel != null) {
scopePanel.clearGui();
- }
+ }
}
/**
* When a user right-clicks on the component in the test tree, or selects
@@ -56,7 +56,7 @@
/**
* Create the scope settings panel.
- *
+ *
* @return the scope settings panel
*/
protected JPanel createScopePanel() {
@@ -75,7 +75,7 @@
/**
* Save the scope settings in the test element.
- *
+ *
* @param testElement
*/
protected void saveScopeSettings(AbstractScopedTestElement testElement) {
@@ -94,13 +94,13 @@
/**
* Show the scope settings from the test element.
- *
+ *
* @param testElement
*/
protected void showScopeSettings(AbstractScopedTestElement testElement) {
String scope = testElement.fetchScope();
if (testElement.isScopeParent(scope)) {
- scopePanel.setScopeParent();
+ scopePanel.setScopeParent();
} else if (testElement.isScopeChildren(scope)){
scopePanel.setScopeChildren();
} else if (testElement.isScopeAll(scope)){
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.gui.action;
@@ -21,7 +21,7 @@
/*
* Collect all the action names together in one place.
* This helps to ensure that there are no duplicates
- *
+ *
*
*/
public class ActionNames {
@@ -82,6 +82,6 @@
// Prevent instantiation
private ActionNames(){
-
+
}
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java Tue Feb 23 16:09:09 2010
@@ -75,7 +75,7 @@
guiComp = guiPackage.getGui(node.getTestElement());
if (guiComp instanceof Clearable){
Clearable item = (Clearable) guiComp;
- item.clearData();
+ item.clearData();
}
} catch (Exception ex) {
log.error("Can't clear: "+node+" "+guiComp, ex);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java Tue Feb 23 16:09:09 2010
@@ -74,7 +74,7 @@
for (int i = 0; i < draggedNodes.length; i++) {
int index = parentNode.getIndex(currentNode) + 1;
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i], parentNode, index);
- }
+ }
}
}
GuiPackage.getInstance().getMainFrame().repaint();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java Tue Feb 23 16:09:09 2010
@@ -31,10 +31,10 @@
// Prevent instantiation
private KeyStrokes(){
}
-
+
// Bug 47064 - fixes for Mac LAF
private static final int CONTROL_MASK =Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
-
+
public static final KeyStroke CUT = KeyStroke.getKeyStroke(KeyEvent.VK_X, CONTROL_MASK);
public static final KeyStroke COPY = KeyStroke.getKeyStroke(KeyEvent.VK_C, CONTROL_MASK);
public static final KeyStroke PASTE = KeyStroke.getKeyStroke(KeyEvent.VK_V, CONTROL_MASK);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Tue Feb 23 16:09:09 2010
@@ -36,7 +36,7 @@
public class LookAndFeelCommand implements Command {
private static final String JMETER_LAF = "jmeter.laf"; // $NON-NLS-1$
-
+
private static final Set<String> commands = new HashSet<String>();
static {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java?rev=915405&r1=915404&r2=915405&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java Tue Feb 23 16:09:09 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
package org.apache.jmeter.gui.action;
@@ -30,10 +30,10 @@
import org.apache.jorphan.logging.LoggingManager;
/**
- *
+ *
* Debug class to show details of the currently selected object
* Currently shows TestElement and GUI class names
- *
+ *
* Also enables/disables debug for the test element.
*
*/
@@ -59,7 +59,7 @@
System.out.println(guiClassName);
} else if (ActionNames.DEBUG_ON.equals(e.getActionCommand())){
LoggingManager.setPriorityFullName("DEBUG",te.getClass().getName());//$NON-NLS-1$
- } else if (ActionNames.DEBUG_OFF.equals(e.getActionCommand())){
+ } else if (ActionNames.DEBUG_OFF.equals(e.getActionCommand())){
LoggingManager.setPriorityFullName("INFO",te.getClass().getName());//$NON-NLS-1$
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org