Permalink
Browse files

Tab police - also remove trailing spaces in same files

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1457573 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 055b902 commit 127d093a6c4829c9e176857bad5db1d0bc8f4cbf @sebbASF sebbASF committed Mar 17, 2013
Showing with 759 additions and 759 deletions.
  1. +1 −1 build.xml
  2. +17 −17 extras/schematic.xml
  3. +3 −3 src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
  4. +1 −1 src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
  5. +12 −12 src/components/org/apache/jmeter/config/KeystoreConfig.java
  6. +2 −2 src/components/org/apache/jmeter/config/RandomVariableConfig.java
  7. +4 −4 src/components/org/apache/jmeter/control/ThroughputController.java
  8. +1 −1 src/components/org/apache/jmeter/extractor/XPathExtractor.java
  9. +23 −23 src/components/org/apache/jmeter/modifiers/CounterConfig.java
  10. +11 −11 src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
  11. +16 −16 src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
  12. +23 −23 src/components/org/apache/jmeter/reporters/MailerModel.java
  13. +2 −2 src/components/org/apache/jmeter/sampler/TestAction.java
  14. +4 −4 src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
  15. +1 −1 src/components/org/apache/jmeter/timers/ConstantTimer.java
  16. +67 −67 src/components/org/apache/jmeter/timers/PoissonRandomTimer.java
  17. +102 −102 src/components/org/apache/jmeter/timers/SyncTimer.java
  18. +8 −8 src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java
  19. +24 −24 src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
  20. +22 −22 src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java
  21. +26 −26 src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
  22. +3 −3 src/components/org/apache/jmeter/visualizers/BSFListener.java
  23. +3 −3 src/components/org/apache/jmeter/visualizers/BeanShellListener.java
  24. +3 −3 src/components/org/apache/jmeter/visualizers/JSR223Listener.java
  25. +4 −4 src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
  26. +38 −38 src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
  27. +24 −24 src/core/org/apache/jmeter/gui/MainFrame.java
  28. +2 −2 src/core/org/apache/jmeter/gui/Searchable.java
  29. +10 −10 src/core/org/apache/jmeter/gui/action/ActionRouter.java
  30. +9 −9 src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java
  31. +37 −37 src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
  32. +37 −37 src/core/org/apache/jmeter/gui/action/RegexpSearcher.java
  33. +1 −1 src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
  34. +55 −55 src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
  35. +6 −6 src/core/org/apache/jmeter/gui/action/Searcher.java
  36. +1 −1 src/core/org/apache/jmeter/gui/util/FileDialoger.java
  37. +1 −1 test/src/org/apache/jmeter/config/TestCVSDataSet.java
  38. +2 −2 test/src/org/apache/jmeter/junit/JMeterTest.java
  39. +8 −8 test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
  40. +3 −3 test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
  41. +8 −8 test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
  42. +1 −1 test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
  43. +131 −131 test/src/org/apache/jmeter/resources/PackageTest.java
  44. +2 −2 test/src/org/apache/jorphan/test/AllTests.java
View
@@ -385,7 +385,7 @@
<include name="${lib.dir}/${jsoup.jar}"/>
<include name="${lib.dir}/${junit.jar}"/>
<include name="${lib.dir}/${logkit.jar}"/>
- <include name="${lib.dir}/${mongo-java-driver.jar}"/>
+ <include name="${lib.dir}/${mongo-java-driver.jar}"/>
<include name="${lib.dir}/${serializer.jar}"/>
<include name="${lib.dir}/${slf4j-api.jar}"/>
<include name="${lib.dir}/${soap.jar}"/>
View
@@ -6,34 +6,34 @@
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.
-->
<project name="schematic" default="all">
- <description>
- To create the schematic report:
- ant -Dtest=script
+ <description>
+ To create the schematic report:
+ ant -Dtest=script
- </description>
+ </description>
- <property name="testpath" value="${user.dir}"/>
+ <property name="testpath" value="${user.dir}"/>
- <!-- Name of test (without .jmx) -->
- <property name="test" value="Test"/>
+ <!-- Name of test (without .jmx) -->
+ <property name="test" value="Test"/>
- <target name="all">
- <xslt
- force="true"
- in="${testpath}/${test}.jmx"
- out="${testpath}/${test}.html"
- style="${basedir}/schematic.xsl">
- </xslt>
- </target>
+ <target name="all">
+ <xslt
+ force="true"
+ in="${testpath}/${test}.jmx"
+ out="${testpath}/${test}.html"
+ style="${basedir}/schematic.xsl">
+ </xslt>
+ </target>
</project>
@@ -311,7 +311,7 @@ public void focusLost(FocusEvent inEvent) {
* @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
*/
public void focusGained(FocusEvent e) {
- // NOOP
+ // NOOP
}
/**
@@ -332,7 +332,7 @@ public void actionPerformed(ActionEvent e) {
@Override
public void keyPressed(KeyEvent e) {
- // NOOP
+ // NOOP
}
@Override
@@ -364,7 +364,7 @@ private void validateInteger(JTextField field){
}
@Override
public void keyTyped(KeyEvent e) {
- // NOOP
+ // NOOP
}
}
@@ -187,7 +187,7 @@ public static boolean validXPath(String xpathString, boolean showDialog) {
testDoc.appendChild(el);
XPathUtil.validateXPath(testDoc, xpathString);
} catch (IllegalArgumentException e) {
- log.warn(e.getLocalizedMessage());
+ log.warn(e.getLocalizedMessage());
success = false;
ret = e.getLocalizedMessage();
} catch (ParserConfigurationException e) {
@@ -72,28 +72,28 @@ public void testStarted(String host) {
int endIndexAsInt = JMeterUtils.getPropDefault(KEY_STORE_END_INDEX, 0);
if(!StringUtils.isEmpty(this.startIndex)) {
- try {
- startIndexAsInt = Integer.parseInt(this.startIndex);
- } catch(NumberFormatException e) {
- log.warn("Failed parsing startIndex :'"+this.startIndex+"', will default to:'"+startIndexAsInt+"', error message:"+ e.getMessage(), e);
- }
+ try {
+ startIndexAsInt = Integer.parseInt(this.startIndex);
+ } catch(NumberFormatException e) {
+ log.warn("Failed parsing startIndex :'"+this.startIndex+"', will default to:'"+startIndexAsInt+"', error message:"+ e.getMessage(), e);
+ }
}
if(!StringUtils.isEmpty(this.endIndex)) {
- try {
- endIndexAsInt = Integer.parseInt(this.endIndex);
- } catch(NumberFormatException e) {
- log.warn("Failed parsing endIndex :'"+this.endIndex+"', will default to:'"+endIndexAsInt+"', error message:"+ e.getMessage(), e);
- }
+ try {
+ endIndexAsInt = Integer.parseInt(this.endIndex);
+ } catch(NumberFormatException e) {
+ log.warn("Failed parsing endIndex :'"+this.endIndex+"', will default to:'"+endIndexAsInt+"', error message:"+ e.getMessage(), e);
+ }
}
if(startIndexAsInt>endIndexAsInt) {
- throw new JMeterStopTestException("Keystore Config error : Alias start index must be lower than Alias end index");
+ throw new JMeterStopTestException("Keystore Config error : Alias start index must be lower than Alias end index");
}
log.info("Configuring Keystore with (preload:"+preload+", startIndex:"+
startIndexAsInt+", endIndex:"+endIndexAsInt+")");
SSLManager.getInstance().configureKeystore(Boolean.parseBoolean(preload),
- startIndexAsInt,
+ startIndexAsInt,
endIndexAsInt);
}
@@ -134,9 +134,9 @@ private String formatNumber(long value){
DecimalFormat myFormatter = new DecimalFormat(format);
return myFormatter.format(value);
} catch (NumberFormatException ignored) {
- log.warn("Exception formatting value:"+value + " at format:"+format+", using default");
+ log.warn("Exception formatting value:"+value + " at format:"+format+", using default");
} catch (IllegalArgumentException ignored) {
- log.warn("Exception formatting value:"+value + " at format:"+format+", using default");
+ log.warn("Exception formatting value:"+value + " at format:"+format+", using default");
}
}
return Long.toString(value);
@@ -140,7 +140,7 @@ protected int getMaxThroughputAsInt() {
try {
retVal = Integer.parseInt(prop.getStringValue());
} catch (NumberFormatException e) {
- log.warn("Error parsing "+prop.getStringValue(),e);
+ log.warn("Error parsing "+prop.getStringValue(),e);
}
}
return retVal;
@@ -167,7 +167,7 @@ protected float getPercentThroughputAsFloat() {
try {
retVal = Float.parseFloat(prop.getStringValue());
} catch (NumberFormatException e) {
- log.warn("Error parsing "+prop.getStringValue(),e);
+ log.warn("Error parsing "+prop.getStringValue(),e);
}
}
return retVal;
@@ -265,12 +265,12 @@ public void testStarted(String host) {
@Override
public void testEnded() {
- // NOOP
+ // NOOP
}
@Override
public void testEnded(String host) {
- // NOOP
+ // NOOP
}
@Override
@@ -307,7 +307,7 @@ private Document parseResponse(String unicodeData)
*/
private void getValuesForXPath(Document d,String query, List<String> matchStrings)
throws TransformerException {
- XPathUtil.putValuesForXPathInList(d, query, matchStrings, getFragment());
+ XPathUtil.putValuesForXPathInList(d, query, matchStrings, getFragment());
}
public void setWhitespace(boolean selected) {
@@ -35,7 +35,7 @@
/**
* Provides a counter per-thread(user) or per-thread group.
*/
-public class CounterConfig extends AbstractTestElement
+public class CounterConfig extends AbstractTestElement
implements Serializable, LoopIterationListener, NoThreadClone {
private static final long serialVersionUID = 233L;
@@ -54,10 +54,10 @@
private static final String RESET_ON_THREAD_GROUP_ITERATION = "CounterConfig.reset_on_tg_iteration"; // $NON-NLS-1$
- private static final boolean RESET_ON_THREAD_GROUP_ITERATION_DEFAULT = false;
+ private static final boolean RESET_ON_THREAD_GROUP_ITERATION_DEFAULT = false;
// This class is not cloned per thread, so this is shared
- //@GuardedBy("this")
+ //@GuardedBy("this")
private long globalCounter = Long.MIN_VALUE;
// Used for per-thread/user numbers
@@ -66,7 +66,7 @@
// Used for per-thread/user storage of increment in Thread Group Main loop
private transient ThreadLocal<Long> perTheadLastIterationNumber;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private void init() {
perTheadNumber = new ThreadLocal<Long>() {
@@ -104,24 +104,24 @@ public void iterationStart(LoopIterationEvent event) {
long end = getEnd();
long increment = getIncrement();
if (!isPerUser()) {
- synchronized (this) {
+ synchronized (this) {
if (globalCounter == Long.MIN_VALUE || globalCounter > end) {
globalCounter = start;
}
variables.put(getVarName(), formatNumber(globalCounter));
- globalCounter += increment;
- }
+ globalCounter += increment;
+ }
} else {
- long current = perTheadNumber.get().longValue();
- if(isResetOnThreadGroupIteration()) {
- int iteration = variables.getIteration();
- Long lastIterationNumber = perTheadLastIterationNumber.get();
- if(iteration != lastIterationNumber.longValue()) {
- // reset
- current = getStart();
- }
- perTheadLastIterationNumber.set(Long.valueOf(iteration));
- }
+ long current = perTheadNumber.get().longValue();
+ if(isResetOnThreadGroupIteration()) {
+ int iteration = variables.getIteration();
+ Long lastIterationNumber = perTheadLastIterationNumber.get();
+ if(iteration != lastIterationNumber.longValue()) {
+ // reset
+ current = getStart();
+ }
+ perTheadLastIterationNumber.set(Long.valueOf(iteration));
+ }
variables.put(getVarName(), formatNumber(current));
current += increment;
if (current > end) {
@@ -139,9 +139,9 @@ private String formatNumber(long value){
DecimalFormat myFormatter = new DecimalFormat(format);
return myFormatter.format(value);
} catch (NumberFormatException ignored) {
- log.warn("Error formating "+value + " at format:"+format+", using default");
+ log.warn("Error formating "+value + " at format:"+format+", using default");
} catch (IllegalArgumentException ignored) {
- log.warn("Error formating "+value + " at format:"+format+", using default");
+ log.warn("Error formating "+value + " at format:"+format+", using default");
}
}
return Long.toString(value);
@@ -170,19 +170,19 @@ public void setEnd(long end) {
public void setEnd(String end) {
setProperty(END, end);
}
-
+
/**
* @param value boolean indicating if counter must be reset on Thread Group Iteration
*/
public void setResetOnThreadGroupIteration(boolean value) {
- setProperty(RESET_ON_THREAD_GROUP_ITERATION, value, RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
+ setProperty(RESET_ON_THREAD_GROUP_ITERATION, value, RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
}
-
+
/**
* @return true if counter must be reset on Thread Group Iteration
*/
public boolean isResetOnThreadGroupIteration() {
- return getPropertyAsBoolean(RESET_ON_THREAD_GROUP_ITERATION, RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
+ return getPropertyAsBoolean(RESET_ON_THREAD_GROUP_ITERATION, RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
}
/**
@@ -80,8 +80,8 @@ public void modifyTestElement(TestElement c) {
config.setVarName(varNameField.getText());
config.setFormat(formatField.getText());
config.setIsPerUser(perUserField.isSelected());
- config.setResetOnThreadGroupIteration(resetCounterOnEachThreadGroupIteration.isEnabled()
- && resetCounterOnEachThreadGroupIteration.isSelected());
+ config.setResetOnThreadGroupIteration(resetCounterOnEachThreadGroupIteration.isEnabled()
+ && resetCounterOnEachThreadGroupIteration.isSelected());
}
super.configureTestElement(c);
}
@@ -113,10 +113,10 @@ public void configure(TestElement element) {
varNameField.setText(config.getVarName());
perUserField.setSelected(config.isPerUser());
if(config.isPerUser()) {
- resetCounterOnEachThreadGroupIteration.setEnabled(true);
- resetCounterOnEachThreadGroupIteration.setSelected(config.isResetOnThreadGroupIteration());
+ resetCounterOnEachThreadGroupIteration.setEnabled(true);
+ resetCounterOnEachThreadGroupIteration.setSelected(config.isResetOnThreadGroupIteration());
} else {
- resetCounterOnEachThreadGroupIteration.setEnabled(false);
+ resetCounterOnEachThreadGroupIteration.setEnabled(false);
}
}
@@ -139,17 +139,17 @@ private void init() {
add(varNameField);
add(perUserField);
add(resetCounterOnEachThreadGroupIteration);
-
+
perUserField.addActionListener(this);
}
/**
* Disable/Enable resetCounterOnEachThreadGroupIteration when perUserField is disabled / enabled
*/
- @Override
+ @Override
public void actionPerformed(ActionEvent e) {
- if(e.getSource() == perUserField) {
- resetCounterOnEachThreadGroupIteration.setEnabled(perUserField.isSelected());
- }
- }
+ if(e.getSource() == perUserField) {
+ resetCounterOnEachThreadGroupIteration.setEnabled(perUserField.isSelected());
+ }
+ }
}
Oops, something went wrong.

0 comments on commit 127d093

Please sign in to comment.