You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/03/17 23:17:45 UTC
svn commit: r1457573 [1/2] - in /jmeter/trunk: ./ extras/
src/components/org/apache/jmeter/assertions/gui/
src/components/org/apache/jmeter/config/
src/components/org/apache/jmeter/control/
src/components/org/apache/jmeter/extractor/ src/components/org...
Author: sebb
Date: Sun Mar 17 22:17:44 2013
New Revision: 1457573
URL: http://svn.apache.org/r1457573
Log:
Tab police - also remove trailing spaces in same files
Modified:
jmeter/trunk/build.xml
jmeter/trunk/extras/schematic.xml
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java
jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/PoissonRandomTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java
jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java
jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Searcher.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Mar 17 22:17:44 2013
@@ -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}"/>
Modified: jmeter/trunk/extras/schematic.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/schematic.xml?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/extras/schematic.xml (original)
+++ jmeter/trunk/extras/schematic.xml Sun Mar 17 22:17:44 2013
@@ -6,9 +6,9 @@
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.
@@ -16,24 +16,24 @@
limitations under the License.
-->
<project name="schematic" default="all">
- <description>
- To create the schematic report:
- ant -Dtest=script
-
- </description>
-
- <property name="testpath" value="${user.dir}"/>
-
- <!-- 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>
+ <description>
+ To create the schematic report:
+ ant -Dtest=script
+
+ </description>
+
+ <property name="testpath" value="${user.dir}"/>
+
+ <!-- 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>
</project>
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java Sun Mar 17 22:17:44 2013
@@ -311,7 +311,7 @@ public class HTMLAssertionGui extends Ab
* @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
*/
public void focusGained(FocusEvent e) {
- // NOOP
+ // NOOP
}
/**
@@ -332,7 +332,7 @@ public class HTMLAssertionGui extends Ab
@Override
public void keyPressed(KeyEvent e) {
- // NOOP
+ // NOOP
}
@Override
@@ -364,7 +364,7 @@ public class HTMLAssertionGui extends Ab
}
@Override
public void keyTyped(KeyEvent e) {
- // NOOP
+ // NOOP
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java Sun Mar 17 22:17:44 2013
@@ -187,7 +187,7 @@ public class XPathPanel extends JPanel {
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) {
Modified: jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java Sun Mar 17 22:17:44 2013
@@ -72,28 +72,28 @@ public class KeystoreConfig extends Conf
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);
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java Sun Mar 17 22:17:44 2013
@@ -134,9 +134,9 @@ public class RandomVariableConfig extend
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);
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java Sun Mar 17 22:17:44 2013
@@ -140,7 +140,7 @@ public class ThroughputController extend
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 @@ public class ThroughputController extend
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 class ThroughputController extend
@Override
public void testEnded() {
- // NOOP
+ // NOOP
}
@Override
public void testEnded(String host) {
- // NOOP
+ // NOOP
}
@Override
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java Sun Mar 17 22:17:44 2013
@@ -307,7 +307,7 @@ public class XPathExtractor extends Abst
*/
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) {
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java Sun Mar 17 22:17:44 2013
@@ -35,7 +35,7 @@ import org.apache.log.Logger;
/**
* 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 @@ public class CounterConfig extends Abstr
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 @@ public class CounterConfig extends Abstr
// 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 class CounterConfig extends Abstr
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 @@ public class CounterConfig extends Abstr
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 class CounterConfig extends Abstr
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);
}
/**
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java Sun Mar 17 22:17:44 2013
@@ -80,8 +80,8 @@ public class CounterConfigGui extends Ab
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 class CounterConfigGui extends Ab
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 @@ public class CounterConfigGui extends Ab
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());
+ }
+ }
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java Sun Mar 17 22:17:44 2013
@@ -74,7 +74,7 @@ public class UserParametersGui extends A
private JButton addParameterButton, addUserButton, deleteRowButton, deleteColumnButton;
private JCheckBox perIterationCheck;
-
+
private JPanel paramPanel;
public UserParametersGui() {
@@ -243,20 +243,20 @@ public class UserParametersGui extends A
* Set Column size
*/
private void setColumnWidths() {
- int margin = 10;
- int minwidth = 150;
-
- JTableHeader tableHeader = paramTable.getTableHeader();
- FontMetrics headerFontMetrics = tableHeader.getFontMetrics(tableHeader.getFont());
-
- for (int i = 0; i < tableModel.getColumnCount(); i++) {
- int headerWidth = headerFontMetrics.stringWidth(paramTable.getColumnName(i));
- int maxWidth = getMaximalRequiredColumnWidth(i, headerWidth);
-
- paramTable.getColumnModel().getColumn(i).setPreferredWidth(Math.max(maxWidth + margin, minwidth));
+ int margin = 10;
+ int minwidth = 150;
+
+ JTableHeader tableHeader = paramTable.getTableHeader();
+ FontMetrics headerFontMetrics = tableHeader.getFontMetrics(tableHeader.getFont());
+
+ for (int i = 0; i < tableModel.getColumnCount(); i++) {
+ int headerWidth = headerFontMetrics.stringWidth(paramTable.getColumnName(i));
+ int maxWidth = getMaximalRequiredColumnWidth(i, headerWidth);
+
+ paramTable.getColumnModel().getColumn(i).setPreferredWidth(Math.max(maxWidth + margin, minwidth));
}
}
-
+
/**
* Compute max width between width of the largest column at columnIndex and headerWidth
* @param columnIndex Column index
@@ -288,12 +288,12 @@ public class UserParametersGui extends A
return maxWidth;
}
-
+
private class AddParamAction implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
GuiUtils.stopTableEditing(paramTable);
-
+
tableModel.addNewRow();
tableModel.fireTableDataChanged();
@@ -309,7 +309,7 @@ public class UserParametersGui extends A
private class AddUserAction implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
-
+
GuiUtils.stopTableEditing(paramTable);
tableModel.addNewColumn(getUserColName(tableModel.getColumnCount()), String.class);
Modified: jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java Sun Mar 17 22:17:44 2013
@@ -50,10 +50,10 @@ import org.apache.log.Logger;
public class MailerModel extends AbstractTestElement implements Serializable {
public static enum MailAuthType {
SSL,
- TLS,
+ TLS,
NONE;
}
-
+
private static final long serialVersionUID = 270L;
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -65,9 +65,9 @@ public class MailerModel extends Abstrac
private static final String MAIL_SMTP_AUTH = "mail.smtp.auth"; //$NON-NLS-1$
private static final String MAIL_SMTP_SOCKETFACTORY_CLASS = "mail.smtp.socketFactory.class"; //$NON-NLS-1$
-
+
private static final String MAIL_SMTP_STARTTLS = "mail.smtp.starttls.enable"; //$NON-NLS-1$
-
+
private long failureCount = 0;
private long successCount = 0;
@@ -162,7 +162,7 @@ public class MailerModel extends Abstrac
String theToken = next.nextToken().trim();
if (theToken.indexOf('@') > 0) { //$NON-NLS-1$
- addressList.add(theToken);
+ addressList.add(theToken);
} else {
log.warn("Ignored unexpected e-mail address: "+theToken);
}
@@ -251,7 +251,7 @@ public class MailerModel extends Abstrac
notifyChangeListeners();
}
-
+
/**
* Resets the state of this object to its default. But: This method does not
@@ -295,14 +295,14 @@ public class MailerModel extends Abstrac
* the message-body.
* @param smtpHost
* the smtp-server used to send the mail.
- * @throws MessagingException
- * @throws AddressException
+ * @throws MessagingException
+ * @throws AddressException
*/
- public void sendMail(String from, List<String> vEmails, String subject, String attText, String smtpHost)
+ public void sendMail(String from, List<String> vEmails, String subject, String attText, String smtpHost)
throws AddressException, MessagingException {
- sendMail(from, vEmails, subject, attText, smtpHost, DEFAULT_SMTP_PORT, null, null, null, false);
+ sendMail(from, vEmails, subject, attText, smtpHost, DEFAULT_SMTP_PORT, null, null, null, false);
}
-
+
/**
* Sends a mail with the given parameters using SMTP.
*
@@ -325,7 +325,7 @@ public class MailerModel extends Abstrac
* @throws MessagingException If building MimeMessage fails
*/
public void sendMail(String from, List<String> vEmails, String subject,
- String attText, String smtpHost,
+ String attText, String smtpHost,
String smtpPort,
final String user,
final String password,
@@ -349,21 +349,21 @@ public class MailerModel extends Abstrac
props.put(MAIL_SMTP_AUTH, "true");
switch (mailAuthType) {
case SSL:
- props.put(MAIL_SMTP_SOCKETFACTORY_CLASS,
+ props.put(MAIL_SMTP_SOCKETFACTORY_CLASS,
"javax.net.ssl.SSLSocketFactory");
break;
case TLS:
- props.put(MAIL_SMTP_STARTTLS,
+ props.put(MAIL_SMTP_STARTTLS,
"true");
break;
-
+
default:
break;
}
}
-
+
if(!StringUtils.isEmpty(user)) {
- authenticator =
+ authenticator =
new javax.mail.Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
@@ -400,8 +400,8 @@ public class MailerModel extends Abstrac
log.info(attText);
sendMail(from, getAddressList(), subject, attText, smtpHost,
- getSmtpPort(),
- getLogin(),
+ getSmtpPort(),
+ getLogin(),
getPassword(),
getMailAuthType(),
true);
@@ -432,19 +432,19 @@ public class MailerModel extends Abstrac
}
setProperty(PORT_KEY, value, DEFAULT_SMTP_PORT);
}
-
+
public void setLogin(String login) {
setProperty(LOGIN, login, DEFAULT_LOGIN_VALUE);
}
-
+
public void setPassword(String password) {
setProperty(PASSWORD, password, DEFAULT_PASSWORD_VALUE);
}
-
+
public void setMailAuthType(String value) {
setProperty(MAIL_AUTH_TYPE, value, DEFAULT_MAIL_AUTH_TYPE_VALUE);
}
-
+
public void setFailureSubject(String str) {
setProperty(FAILURE_SUBJECT, str);
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Sun Mar 17 22:17:44 2013
@@ -86,7 +86,7 @@ public class TestAction extends Abstract
if (target == THREAD) {
if(action == STOP || action == STOP_NOW) {
log.info("Stopping current thread");
- context.getThread().stop();
+ context.getThread().stop();
} else {
log.info("Restarting next loop");
context.setRestartNextLoop(true);
@@ -119,7 +119,7 @@ public class TestAction extends Abstract
pauseThread = Thread.currentThread();
Thread.sleep(milis);
} catch (InterruptedException e) {
- // NOOP
+ // NOOP
} finally {
pauseThread = null;
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Sun Mar 17 22:17:44 2013
@@ -133,7 +133,7 @@ public class ConstantThroughputTimer ext
previousTime = currentTime;
return 0;
}
- previousTime = currentTarget;
+ previousTime = currentTarget;
return currentTarget - currentTime;
}
@@ -202,7 +202,7 @@ public class ConstantThroughputTimer ext
private void reset() {
synchronized (allThreadsInfo.MUTEX) {
- allThreadsInfo.lastScheduledTime = 0;
+ allThreadsInfo.lastScheduledTime = 0;
}
threadGroupsInfoMap.clear();
// no need to sync as one per instance
@@ -239,7 +239,7 @@ public class ConstantThroughputTimer ext
*/
@Override
public void testEnded() {
- //NOOP
+ //NOOP
}
/**
@@ -255,7 +255,7 @@ public class ConstantThroughputTimer ext
*/
@Override
public void testEnded(String host) {
- //NOOP
+ //NOOP
}
}
\ No newline at end of file
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java Sun Mar 17 22:17:44 2013
@@ -57,7 +57,7 @@ public class ConstantTimer extends Abstr
*
*/
public void setRange(double range) {
- // NOOP
+ // NOOP
}
/**
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/PoissonRandomTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/PoissonRandomTimer.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/PoissonRandomTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/PoissonRandomTimer.java Sun Mar 17 22:17:44 2013
@@ -29,14 +29,14 @@ import org.apache.jmeter.util.JMeterUtil
*
*/
public class PoissonRandomTimer extends RandomTimer implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 3514708226113231004L;
- /**
- *
- */
- private static final double[] LOG_FACTORIAL =
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3514708226113231004L;
+ /**
+ *
+ */
+ private static final double[] LOG_FACTORIAL =
{
0.000000000000000,
0.000000000000000,
@@ -294,11 +294,11 @@ public class PoissonRandomTimer extends
1150.633503306223700,
1156.170837573242400,
};
-
- /**
- * {@inheritDoc}
- */
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public long delay() {
return Math.abs(randomPoisson((int)Math.round(getRange())) + super.delay());
@@ -311,70 +311,70 @@ public class PoissonRandomTimer extends
public String toString() {
return JMeterUtils.getResString("poisson_timer_memo"); //$NON-NLS-1$
}
-
+
/**
- * Generate Poisson random based using
+ * Generate Poisson random based using
* @param lambda Lambda in Poisson
* @return random
*/
private static int randomPoisson(int lambda) {
- if(lambda <= 30) {
- return poissonRandomNumberLowEq30(lambda);
- } else {
- return poissonRandomNumberSup30(lambda);
- }
+ if(lambda <= 30) {
+ return poissonRandomNumberLowEq30(lambda);
+ } else {
+ return poissonRandomNumberSup30(lambda);
+ }
}
- /**
- * see http://en.wikipedia.org/wiki/Poisson_distribution
+ /**
+ * see http://en.wikipedia.org/wiki/Poisson_distribution
* @param lambda Lambda in Poisson
* @return random
- */
- private static final int poissonRandomNumberLowEq30(int lambda) {
- double L = Math.exp(-lambda);
- int k = 0;
- double p = 1;
- do {
- k = k + 1;
- double u = Math.random();
- p = p * u;
- } while (p > L);
- return k - 1;
- }
-
- /**
- * http://www.johndcook.com/blog/2010/06/14/generating-poisson-random-values/
+ */
+ private static final int poissonRandomNumberLowEq30(int lambda) {
+ double L = Math.exp(-lambda);
+ int k = 0;
+ double p = 1;
+ do {
+ k = k + 1;
+ double u = Math.random();
+ p = p * u;
+ } while (p > L);
+ return k - 1;
+ }
+
+ /**
+ * http://www.johndcook.com/blog/2010/06/14/generating-poisson-random-values/
* @param lambda Lambda in Poisson
* @return random
- */
- private static final int poissonRandomNumberSup30(int lambda) {
- double c = 0.767 - 3.36/lambda;
- double beta = Math.PI/Math.sqrt(3.0*lambda);
- double alpha = beta*lambda;
- double k = Math.log(c) - lambda - Math.log(beta);
- while(true) {
- double u = Math.random();
- double x = (alpha - Math.log((1.0 - u)/u))/beta;
- int n = (int)Math.floor(x + 0.5);
- if (n < 0){
- continue;
- }
- double v = Math.random();
- double y = alpha - beta*x;
- double lhs = y + Math.log(v/Math.pow((1.0 + Math.exp(y)),2));
- double rhs = k + n*Math.log(lambda) -logFactorial(n);
- if (lhs <= rhs) {
- return n;
- }
- }
- }
-
- /**
- * Compute log factorial
- * http://www.johndcook.com/blog/2010/08/16/how-to-compute-log-factorial/
- * @param n Number for which we want log(n!)
- * @return Log factorial
- */
- private static final double logFactorial(int n)
+ */
+ private static final int poissonRandomNumberSup30(int lambda) {
+ double c = 0.767 - 3.36/lambda;
+ double beta = Math.PI/Math.sqrt(3.0*lambda);
+ double alpha = beta*lambda;
+ double k = Math.log(c) - lambda - Math.log(beta);
+ while(true) {
+ double u = Math.random();
+ double x = (alpha - Math.log((1.0 - u)/u))/beta;
+ int n = (int)Math.floor(x + 0.5);
+ if (n < 0){
+ continue;
+ }
+ double v = Math.random();
+ double y = alpha - beta*x;
+ double lhs = y + Math.log(v/Math.pow((1.0 + Math.exp(y)),2));
+ double rhs = k + n*Math.log(lambda) -logFactorial(n);
+ if (lhs <= rhs) {
+ return n;
+ }
+ }
+ }
+
+ /**
+ * Compute log factorial
+ * http://www.johndcook.com/blog/2010/08/16/how-to-compute-log-factorial/
+ * @param n Number for which we want log(n!)
+ * @return Log factorial
+ */
+ private static final double logFactorial(int n)
{
if (n < 0) {
throw new IllegalArgumentException();
@@ -383,7 +383,7 @@ public class PoissonRandomTimer extends
double x = n + 1;
return (x - 0.5)*Math.log(x) - x + 0.5*Math.log(2*Math.PI) + 1.0/(12.0*x);
}
- else {
+ else {
return LOG_FACTORIAL[n];
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java Sun Mar 17 22:17:44 2013
@@ -35,81 +35,81 @@ import org.apache.jmeter.threads.JMeterC
*
*/
public class SyncTimer extends AbstractTestElement implements Timer, Serializable, TestBean, TestStateListener, ThreadListener {
-
- /**
- * Wrapper to {@link CyclicBarrier} to allow lazy init of CyclicBarrier when SyncTimer is configured with 0
- */
- private static final class BarrierWrapper implements Cloneable {
-
- private CyclicBarrier barrier;
-
- /**
- *
- */
- public BarrierWrapper() {
- this.barrier = null;
- }
-
- /**
- * @param parties Number of parties
- */
- public BarrierWrapper(int parties) {
- this.barrier = new CyclicBarrier(parties);
- }
-
- /**
- * Synchronized is required to ensure CyclicBarrier is initialized only once per Thread Group
- * @param parties Number of parties
- */
- public synchronized void setup(int parties) {
- if(this.barrier== null) {
- this.barrier = new CyclicBarrier(parties);
- }
- }
-
- /**
- * @see CyclicBarrier#await()
- * @return int
- * @throws InterruptedException
- * @throws BrokenBarrierException
- * @see java.util.concurrent.CyclicBarrier#await()
- */
- public int await() throws InterruptedException, BrokenBarrierException {
- return barrier.await();
- }
-
- /**
- * @see java.util.concurrent.CyclicBarrier#reset()
- */
- public void reset() {
- barrier.reset();
- }
-
- /**
- * @see java.lang.Object#clone()
- */
- @Override
- protected Object clone() {
- BarrierWrapper barrierWrapper= null;
- try {
- barrierWrapper = (BarrierWrapper) super.clone();
- barrierWrapper.barrier = this.barrier;
- } catch (CloneNotSupportedException e) {
- //Cannot happen
- }
- return barrierWrapper;
- }
- }
-
+
+ /**
+ * Wrapper to {@link CyclicBarrier} to allow lazy init of CyclicBarrier when SyncTimer is configured with 0
+ */
+ private static final class BarrierWrapper implements Cloneable {
+
+ private CyclicBarrier barrier;
+
+ /**
+ *
+ */
+ public BarrierWrapper() {
+ this.barrier = null;
+ }
+
+ /**
+ * @param parties Number of parties
+ */
+ public BarrierWrapper(int parties) {
+ this.barrier = new CyclicBarrier(parties);
+ }
+
+ /**
+ * Synchronized is required to ensure CyclicBarrier is initialized only once per Thread Group
+ * @param parties Number of parties
+ */
+ public synchronized void setup(int parties) {
+ if(this.barrier== null) {
+ this.barrier = new CyclicBarrier(parties);
+ }
+ }
+
+ /**
+ * @see CyclicBarrier#await()
+ * @return int
+ * @throws InterruptedException
+ * @throws BrokenBarrierException
+ * @see java.util.concurrent.CyclicBarrier#await()
+ */
+ public int await() throws InterruptedException, BrokenBarrierException {
+ return barrier.await();
+ }
+
+ /**
+ * @see java.util.concurrent.CyclicBarrier#reset()
+ */
+ public void reset() {
+ barrier.reset();
+ }
+
+ /**
+ * @see java.lang.Object#clone()
+ */
+ @Override
+ protected Object clone() {
+ BarrierWrapper barrierWrapper= null;
+ try {
+ barrierWrapper = (BarrierWrapper) super.clone();
+ barrierWrapper.barrier = this.barrier;
+ } catch (CloneNotSupportedException e) {
+ //Cannot happen
+ }
+ return barrierWrapper;
+ }
+ }
+
private static final long serialVersionUID = 2;
-
+
private transient BarrierWrapper barrier;
private int groupSize;
// Ensure transient object is created by the server
private Object readResolve(){
- createBarrier();
+ createBarrier();
return this;
}
@@ -133,20 +133,20 @@ public class SyncTimer extends AbstractT
*/
@Override
public long delay() {
- if(getGroupSize()>=0) {
- int arrival = 0;
- try {
- arrival = this.barrier.await();
- } catch (InterruptedException e) {
- return 0;
- } catch (BrokenBarrierException e) {
- return 0;
- } finally {
- if(arrival == 0) {
- barrier.reset();
- }
- }
- }
+ if(getGroupSize()>=0) {
+ int arrival = 0;
+ try {
+ arrival = this.barrier.await();
+ } catch (InterruptedException e) {
+ return 0;
+ } catch (BrokenBarrierException e) {
+ return 0;
+ } finally {
+ if(arrival == 0) {
+ barrier.reset();
+ }
+ }
+ }
return 0;
}
@@ -167,7 +167,7 @@ public class SyncTimer extends AbstractT
*/
@Override
public void testEnded() {
- this.testEnded(null);
+ this.testEnded(null);
}
/**
@@ -175,7 +175,7 @@ public class SyncTimer extends AbstractT
*/
@Override
public void testEnded(String host) {
- createBarrier();
+ createBarrier();
}
/**
@@ -194,29 +194,29 @@ public class SyncTimer extends AbstractT
createBarrier();
}
- /**
- *
- */
- private void createBarrier() {
- if(getGroupSize() == 0) {
- // Lazy init
- this.barrier = new BarrierWrapper();
+ /**
+ *
+ */
+ private void createBarrier() {
+ if(getGroupSize() == 0) {
+ // Lazy init
+ this.barrier = new BarrierWrapper();
} else {
- this.barrier = new BarrierWrapper(getGroupSize());
+ this.barrier = new BarrierWrapper(getGroupSize());
}
- }
+ }
- @Override
+ @Override
public void threadStarted() {
- if(getGroupSize() == 0) {
- int numThreadsInGroup = JMeterContextService.getContext().getThreadGroup().getNumThreads();
- // Unique Barrier creation ensured by synchronized setup
- this.barrier.setup(numThreadsInGroup);
+ if(getGroupSize() == 0) {
+ int numThreadsInGroup = JMeterContextService.getContext().getThreadGroup().getNumThreads();
+ // Unique Barrier creation ensured by synchronized setup
+ this.barrier.setup(numThreadsInGroup);
}
- }
+ }
- @Override
+ @Override
public void threadFinished() {
- // NOOP
- }
+ // NOOP
+ }
}
\ No newline at end of file
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java Sun Mar 17 22:17:44 2013
@@ -41,11 +41,11 @@ import org.apache.jorphan.gui.layout.Ver
public abstract class AbstractRandomTimerGui extends AbstractTimerGui {
/**
- *
- */
- private static final long serialVersionUID = -322164502276145504L;
+ *
+ */
+ private static final long serialVersionUID = -322164502276145504L;
- private static final String DELAY_FIELD = "Delay Field";
+ private static final String DELAY_FIELD = "Delay Field";
private static final String RANGE_FIELD = "Range Field";
@@ -84,7 +84,7 @@ public abstract class AbstractRandomTime
return timer;
}
- /**
+ /**
* Modifies a given TestElement to mirror the data in the gui components.
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
@@ -108,7 +108,7 @@ public abstract class AbstractRandomTime
rangeField.setText(el.getPropertyAsString(RandomTimer.RANGE));
}
-
+
/**
* Initialize this component.
*/
@@ -150,7 +150,7 @@ public abstract class AbstractRandomTime
threadDelayPropsPanel.getPreferredSize().height));
add(threadDelayPropsPanel);
}
-
+
/**
* {@inheritDoc}
*/
@@ -169,7 +169,7 @@ public abstract class AbstractRandomTime
/**
* Create implementation of RandomTimer
- * @return {@link RandomTimer}
+ * @return {@link RandomTimer}
*/
protected abstract RandomTimer createRandomTimer();
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java Sun Mar 17 22:17:44 2013
@@ -52,40 +52,40 @@ public class GaussianRandomTimerGui exte
/**
* {@inheritDoc}
*/
- @Override
- protected RandomTimer createRandomTimer() {
- return new GaussianRandomTimer();
- }
+ @Override
+ protected RandomTimer createRandomTimer() {
+ return new GaussianRandomTimer();
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getTimerDelayLabelKey() {
- return JMeterUtils.getResString("gaussian_timer_delay"); //$NON-NLS-1$
- }
+ @Override
+ protected String getTimerDelayLabelKey() {
+ return JMeterUtils.getResString("gaussian_timer_delay"); //$NON-NLS-1$
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getTimerRangeLabelKey() {
- return JMeterUtils.getResString("gaussian_timer_range"); //$NON-NLS-1$
- }
+ @Override
+ protected String getTimerRangeLabelKey() {
+ return JMeterUtils.getResString("gaussian_timer_range"); //$NON-NLS-1$
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getDefaultDelay() {
- return DEFAULT_DELAY;
- }
+ @Override
+ protected String getDefaultDelay() {
+ return DEFAULT_DELAY;
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getDefaultRange() {
- return DEFAULT_RANGE;
- }
+ @Override
+ protected String getDefaultRange() {
+ return DEFAULT_RANGE;
+ }
}
\ No newline at end of file
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java Sun Mar 17 22:17:44 2013
@@ -27,9 +27,9 @@ import org.apache.jmeter.util.JMeterUtil
*/
public class PoissonRandomTimerGui extends AbstractRandomTimerGui {
- private static final long serialVersionUID = -3218002787832805275L;
+ private static final long serialVersionUID = -3218002787832805275L;
- private static final String DEFAULT_DELAY = "300"; // $NON-NLS-1$
+ private static final String DEFAULT_DELAY = "300"; // $NON-NLS-1$
private static final String DEFAULT_RANGE = "100"; // $NON-NLS-1$
@@ -42,28 +42,28 @@ public class PoissonRandomTimerGui exten
return "poisson_timer_title";//$NON-NLS-1$
}
- @Override
- protected RandomTimer createRandomTimer() {
- return new PoissonRandomTimer();
- }
-
- @Override
- protected String getTimerDelayLabelKey() {
- return JMeterUtils.getResString("poisson_timer_delay"); //$NON-NLS-1$
- }
-
- @Override
- protected String getTimerRangeLabelKey() {
- return JMeterUtils.getResString("poisson_timer_range"); //$NON-NLS-1$
- }
-
- @Override
- protected String getDefaultDelay() {
- return DEFAULT_DELAY;
- }
-
- @Override
- protected String getDefaultRange() {
- return DEFAULT_RANGE;
- }
+ @Override
+ protected RandomTimer createRandomTimer() {
+ return new PoissonRandomTimer();
+ }
+
+ @Override
+ protected String getTimerDelayLabelKey() {
+ return JMeterUtils.getResString("poisson_timer_delay"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected String getTimerRangeLabelKey() {
+ return JMeterUtils.getResString("poisson_timer_range"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected String getDefaultDelay() {
+ return DEFAULT_DELAY;
+ }
+
+ @Override
+ protected String getDefaultRange() {
+ return DEFAULT_RANGE;
+ }
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java Sun Mar 17 22:17:44 2013
@@ -41,52 +41,52 @@ public class UniformRandomTimerGui exten
super();
}
-
+
/**
* {@inheritDoc}
*/
@Override
public String getLabelResource() {
- return "uniform_timer_title";//$NON-NLS-1$
+ return "uniform_timer_title";//$NON-NLS-1$
}
/**
* {@inheritDoc}
*/
- @Override
- protected RandomTimer createRandomTimer() {
- return new UniformRandomTimer();
- }
+ @Override
+ protected RandomTimer createRandomTimer() {
+ return new UniformRandomTimer();
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getTimerDelayLabelKey() {
- return JMeterUtils.getResString("uniform_timer_delay"); //$NON-NLS-1$
- }
+ @Override
+ protected String getTimerDelayLabelKey() {
+ return JMeterUtils.getResString("uniform_timer_delay"); //$NON-NLS-1$
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getTimerRangeLabelKey() {
- return JMeterUtils.getResString("uniform_timer_range"); //$NON-NLS-1$
- }
+ @Override
+ protected String getTimerRangeLabelKey() {
+ return JMeterUtils.getResString("uniform_timer_range"); //$NON-NLS-1$
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getDefaultDelay() {
- return DEFAULT_DELAY;
- }
+ @Override
+ protected String getDefaultDelay() {
+ return DEFAULT_DELAY;
+ }
- /**
+ /**
* {@inheritDoc}
*/
- @Override
- protected String getDefaultRange() {
- return DEFAULT_RANGE;
- }
+ @Override
+ protected String getDefaultRange() {
+ return DEFAULT_RANGE;
+ }
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListener.java Sun Mar 17 22:17:44 2013
@@ -60,17 +60,17 @@ public class BSFListener extends BSFTest
@Override
public void sampleStarted(SampleEvent e) {
- // NOOP
+ // NOOP
}
@Override
public void sampleStopped(SampleEvent e) {
- // NOOP
+ // NOOP
}
@Override
public void add(SampleResult sample) {
- // NOOP
+ // NOOP
}
@Override
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java Sun Mar 17 22:17:44 2013
@@ -66,17 +66,17 @@ public class BeanShellListener extends B
@Override
public void sampleStarted(SampleEvent e) {
- // NOOP
+ // NOOP
}
@Override
public void sampleStopped(SampleEvent e) {
- // NOOP
+ // NOOP
}
@Override
public void add(SampleResult sample) {
- // NOOP
+ // NOOP
}
@Override
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java Sun Mar 17 22:17:44 2013
@@ -57,17 +57,17 @@ public class JSR223Listener extends JSR2
@Override
public void sampleStarted(SampleEvent e) {
- // NOOP
+ // NOOP
}
@Override
public void sampleStopped(SampleEvent e) {
- // NOOP
+ // NOOP
}
@Override
public void add(SampleResult sample) {
- // NOOP
+ // NOOP
}
@Override
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Sun Mar 17 22:17:44 2013
@@ -324,10 +324,10 @@ public class StatGraphVisualizer extends
@Override
public void clearData() {
synchronized (lock) {
- model.clearData();
- tableRows.clear();
- tableRows.put(TOTAL_ROW_LABEL, new SamplingStatCalculator(TOTAL_ROW_LABEL));
- model.addRow(tableRows.get(TOTAL_ROW_LABEL));
+ model.clearData();
+ tableRows.clear();
+ tableRows.put(TOTAL_ROW_LABEL, new SamplingStatCalculator(TOTAL_ROW_LABEL));
+ model.addRow(tableRows.get(TOTAL_ROW_LABEL));
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java Sun Mar 17 22:17:44 2013
@@ -45,12 +45,12 @@ import org.apache.jorphan.gui.JLabeledTe
import org.apache.jorphan.gui.ObjectTableModel;
/**
- * Show detail of a Row
+ * Show detail of a Row
*/
public class RowDetailDialog extends JDialog implements ActionListener {
- /**
- *
+ /**
+ *
*/
private static final long serialVersionUID = 6578889215615435475L;
@@ -64,8 +64,8 @@ public class RowDetailDialog extends JDi
private static final String CLOSE = "close"; // $NON-NLS-1$
private static final String UPDATE = "update"; // $NON-NLS-1$
-
- private JLabeledTextField nameTF;
+
+ private JLabeledTextField nameTF;
private JLabeledTextArea valueTA;
@@ -77,37 +77,37 @@ public class RowDetailDialog extends JDi
private int selectedRow;
-
+
public RowDetailDialog() {
super();
}
-
- public RowDetailDialog(ObjectTableModel tableModel, int selectedRow) {
+
+ public RowDetailDialog(ObjectTableModel tableModel, int selectedRow) {
super((JFrame) null, JMeterUtils.getResString("detail"), true); //$NON-NLS-1$
this.tableModel = tableModel;
this.selectedRow = selectedRow;
init();
}
- @Override
+ @Override
protected JRootPane createRootPane() {
JRootPane rootPane = new JRootPane();
// Hide Window on ESC
- Action escapeAction = new AbstractAction("ESCAPE") {
+ Action escapeAction = new AbstractAction("ESCAPE") {
/**
- *
+ *
*/
private static final long serialVersionUID = -8699034338969407625L;
@Override
- public void actionPerformed(ActionEvent actionEvent) {
+ public void actionPerformed(ActionEvent actionEvent) {
setVisible(false);
- }
+ }
};
// Do update on Enter
- Action enterAction = new AbstractAction("ENTER") {
+ Action enterAction = new AbstractAction("ENTER") {
/**
- *
+ *
*/
private static final long serialVersionUID = -1529005452976176873L;
@@ -120,12 +120,12 @@ public class RowDetailDialog extends JDi
ActionMap actionMap = rootPane.getActionMap();
actionMap.put(escapeAction.getValue(Action.NAME), escapeAction);
actionMap.put(enterAction.getValue(Action.NAME), enterAction);
- InputMap inputMap = rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+ InputMap inputMap = rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
inputMap.put(KeyStrokes.ESC, escapeAction.getValue(Action.NAME));
inputMap.put(KeyStrokes.ENTER, enterAction.getValue(Action.NAME));
return rootPane;
}
-
+
private void init() {
this.getContentPane().setLayout(new BorderLayout(10,10));
@@ -138,14 +138,14 @@ public class RowDetailDialog extends JDi
//detailPanel.setBorder(BorderFactory.createEmptyBorder(7, 3, 3, 3));
detailPanel.add(nameTF, BorderLayout.NORTH);
detailPanel.add(valueTA, BorderLayout.CENTER);
-
+
JPanel mainPanel = new JPanel();
mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
mainPanel.setBorder(BorderFactory.createEmptyBorder(7, 3, 3, 3));
mainPanel.add(detailPanel, BorderLayout.CENTER);
JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
-
+
JButton updateButton = new JButton(JMeterUtils.getResString("update")); //$NON-NLS-1$
updateButton.setActionCommand(UPDATE);
updateButton.addActionListener(this);
@@ -167,7 +167,7 @@ public class RowDetailDialog extends JDi
buttonsPanel.add(closeButton);
mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
this.getContentPane().add(mainPanel);
- nameTF.requestFocusInWindow();
+ nameTF.requestFocusInWindow();
this.pack();
ComponentUtil.centerComponentInWindow(this);
@@ -180,39 +180,39 @@ public class RowDetailDialog extends JDi
@Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
- if(action.equals(CLOSE)) {
- this.setVisible(false);
- }
- else if(action.equals(NEXT)) {
- selectedRow++;
+ if(action.equals(CLOSE)) {
+ this.setVisible(false);
+ }
+ else if(action.equals(NEXT)) {
+ selectedRow++;
previousButton.setEnabled(true);
- nextButton.setEnabled(selectedRow < tableModel.getRowCount()-1);
- setValues(selectedRow);
- }
- else if(action.equals(PREVIOUS)) {
+ nextButton.setEnabled(selectedRow < tableModel.getRowCount()-1);
+ setValues(selectedRow);
+ }
+ else if(action.equals(PREVIOUS)) {
selectedRow--;
nextButton.setEnabled(true);
previousButton.setEnabled(selectedRow > 0);
setValues(selectedRow);
- }
- else if(action.equals(UPDATE)) {
+ }
+ else if(action.equals(UPDATE)) {
doUpdate(e);
- }
+ }
}
/**
* Set TextField and TA values from model
* @param selectedRow Selected row
*/
- private void setValues(int selectedRow) {
+ private void setValues(int selectedRow) {
nameTF.setText((String)tableModel.getValueAt(selectedRow, 0));
valueTA.setText((String)tableModel.getValueAt(selectedRow, 1));
}
-
- /**
- * Update model values
- * @param actionEvent
- */
+
+ /**
+ * Update model values
+ * @param actionEvent
+ */
protected void doUpdate(ActionEvent actionEvent) {
tableModel.setValueAt(nameTF.getText(), selectedRow, 0);
tableModel.setValueAt(valueTA.getText(), selectedRow, 1);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Sun Mar 17 22:17:44 2013
@@ -105,11 +105,11 @@ public class MainFrame extends JFrame im
// The application name
private static final String DEFAULT_APP_NAME = "Apache JMeter"; // $NON-NLS-1$
-
+
// The default title for the Menu bar
private static final String DEFAULT_TITLE = DEFAULT_APP_NAME +
" (" + JMeterUtils.getJMeterVersion() + ")"; // $NON-NLS-1$ $NON-NLS-2$
-
+
// Allow display/hide toolbar
private static final boolean DISPLAY_TOOLBAR =
JMeterUtils.getPropDefault("jmeter.toolbar.display", true); // $NON-NLS-1$
@@ -200,14 +200,14 @@ public class MainFrame extends JFrame im
totalThreads.setToolTipText(JMeterUtils.getResString("total_threads_tooltip")); // $NON-NLS-1$
activeThreads = new JLabel("0"); // $NON-NLS-1$
activeThreads.setToolTipText(JMeterUtils.getResString("active_threads_tooltip")); // $NON-NLS-1$
-
+
warnIndicator = new JButton(warningIcon);
warnIndicator.setMargin(new Insets(0, 0, 0, 0));
// Transparent JButton with no border
warnIndicator.setOpaque(false);
warnIndicator.setContentAreaFilled(false);
warnIndicator.setBorderPainted(false);
-
+
warnIndicator.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip")); // $NON-NLS-1$
warnIndicator.addActionListener(this);
errorsOrFatalsLabel = new JLabel("0"); // $NON-NLS-1$
@@ -369,7 +369,7 @@ public class MainFrame extends JFrame im
}
});
}
-
+
public void setMainPanel(JComponent comp) {
mainPanel.setViewportView(comp);
}
@@ -477,12 +477,12 @@ public class MainFrame extends JFrame im
} else {
LoggingManager.addLogTargetToRootLogger(new LogTarget[]{
logPanel
- });
+ });
}
-
+
topAndDown.setTopComponent(mainPanel);
topAndDown.setBottomComponent(logPanel);
-
+
treeAndMain.setRightComponent(topAndDown);
treeAndMain.setResizeWeight(.2);
@@ -496,7 +496,7 @@ public class MainFrame extends JFrame im
setTitle(DEFAULT_TITLE);
setIconImage(JMeterUtils.getImage("jmeter.jpg").getImage());// $NON-NLS-1$
- setWindowTitle(); // define AWT WM_CLASS string
+ setWindowTitle(); // define AWT WM_CLASS string
}
@@ -504,10 +504,10 @@ public class MainFrame extends JFrame im
* Support for Test Plan Dnd
* see BUG 52281 (when JDK6 will be minimum JDK target)
*/
- public void initTopLevelDndHandler() {
- new DropTarget(this, this);
+ public void initTopLevelDndHandler() {
+ new DropTarget(this, this);
}
-
+
public void setExtendedFrameTitle(String fname) {
// file New operation may set to null, so just return app name
if (fname == null) {
@@ -537,7 +537,7 @@ public class MainFrame extends JFrame im
toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
toolPanel.add(Box.createGlue());
-
+
if (DISPLAY_ERROR_FATAL_COUNTER) {
toolPanel.add(errorsOrFatalsLabel);
toolPanel.add(warnIndicator);
@@ -571,7 +571,7 @@ public class MainFrame extends JFrame im
private JScrollPane createMainPanel() {
return new JScrollPane();
}
-
+
/**
* Create at the down of the left a Console for Log events
* @return {@link LoggerPanel}
@@ -684,12 +684,12 @@ public class MainFrame extends JFrame im
@Override
public void dragEnter(DropTargetDragEvent dtde) {
- // NOOP
+ // NOOP
}
@Override
public void dragExit(DropTargetEvent dte) {
- // NOOP
+ // NOOP
}
@Override
@@ -711,7 +711,7 @@ public class MainFrame extends JFrame im
dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
try {
@SuppressWarnings("unchecked")
- List<File> files = (List<File>)
+ List<File> files = (List<File>)
tr.getTransferData(DataFlavor.javaFileListFlavor);
if(files.isEmpty()) {
return;
@@ -721,7 +721,7 @@ public class MainFrame extends JFrame im
log.warn("Importing file:" + file.getName()+ "from DnD failed because file extension does not end with .jmx");
return;
}
-
+
ActionEvent fakeEvent = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, ActionNames.OPEN);
LoadDraggedFile.loadProject(fakeEvent, file);
} finally {
@@ -735,16 +735,16 @@ public class MainFrame extends JFrame im
} catch (IOException e) {
log.warn("Dnd failed" , e);
}
-
+
}
@Override
public void dropActionChanged(DropTargetDragEvent dtde) {
// NOOP
}
-
+
/**
- *
+ *
*/
public final class ErrorsAndFatalsCounterLogTarget implements LogTarget, Clearable {
public AtomicInteger errorOrFatal = new AtomicInteger(0);
@@ -761,8 +761,8 @@ public class MainFrame extends JFrame im
}
});
}
- }
-
+ }
+
@Override
public void clearData() {
errorOrFatal.set(0);
@@ -775,7 +775,7 @@ public class MainFrame extends JFrame im
}
}
-
+
@Override
public void clearData() {
logPanel.clear();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java Sun Mar 17 22:17:44 2013
@@ -28,6 +28,6 @@ public interface Searchable {
* @return List<String> of searchable tokens
* @throws Exception
*/
- List<String> getSearchableTokens()
- throws Exception;
+ List<String> getSearchableTokens()
+ throws Exception;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Sun Mar 17 22:17:44 2013
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
public final class ActionRouter implements ActionListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final Object LOCK = new Object();
+ private static final Object LOCK = new Object();
private static volatile ActionRouter router;
@@ -93,7 +93,7 @@ public final class ActionRouter implemen
}
msg = msg + "\n" + cause;
}
- JMeterUtils.reportErrorToUser(msg);
+ JMeterUtils.reportErrorToUser(msg);
} catch (Exception err) {
log.error("Error processing "+c.toString(), err);
}
@@ -257,11 +257,11 @@ public final class ActionRouter implemen
List<String> listClasses = ClassFinder.findClassesThatExtend(
JMeterUtils.getSearchPaths(), // strPathsOrJars - pathnames or jarfiles to search for classes
// classNames - required parent class(es) or annotations
- new Class[] {Class.forName("org.apache.jmeter.gui.action.Command") }, // $NON-NLS-1$
+ new Class[] {Class.forName("org.apache.jmeter.gui.action.Command") }, // $NON-NLS-1$
false, // innerClasses - should we include inner classes?
// contains - classname should contain this string
// This was added in r325814 as part of changes for the reporting tool
- "org.apache.jmeter.gui", // $NON-NLS-1$
+ "org.apache.jmeter.gui", // $NON-NLS-1$
null, // notContains - classname should not contain this string
false); // annotations - true if classnames are annotations
commands = new HashMap<String, Set<Command>>(listClasses.size());
@@ -295,12 +295,12 @@ public final class ActionRouter implemen
*/
public static ActionRouter getInstance() {
if (router == null) {
- synchronized (LOCK) {
- if(router == null) {
- router = new ActionRouter();
- router.populateCommandMap();
- }
- }
+ synchronized (LOCK) {
+ if(router == null) {
+ router = new ActionRouter();
+ router.populateCommandMap();
+ }
+ }
}
return router;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java Sun Mar 17 22:17:44 2013
@@ -26,15 +26,15 @@ import java.io.File;
*/
public class LoadDraggedFile {
- /**
- * Loads dragged file asking before for save if current open file is dirty.
- * @param e {@link ActionEvent}
- * @param file File to Load
- */
+ /**
+ * Loads dragged file asking before for save if current open file is dirty.
+ * @param e {@link ActionEvent}
+ * @param file File to Load
+ */
public static void loadProject(ActionEvent e, File file) {
- if(!Close.performAction(e)) {
- return;
- }
- Load.loadProjectFile(e, file, false);
+ if(!Close.performAction(e)) {
+ return;
+ }
+ Load.loadProjectFile(e, file, false);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java Sun Mar 17 22:17:44 2013
@@ -26,47 +26,47 @@ import org.apache.commons.lang3.StringUt
* Searcher implementation that searches text as is
*/
public class RawTextSearcher implements Searcher {
- private boolean caseSensitive;
- private String textToSearch;
-
+ private boolean caseSensitive;
+ private String textToSearch;
- /**
- * Constructor
- * @param caseSensitive is search case sensitive
- * @param textToSearch Text to search
- */
- public RawTextSearcher(boolean caseSensitive, String textToSearch) {
- super();
- this.caseSensitive = caseSensitive;
- if(caseSensitive) {
- this.textToSearch = textToSearch;
- } else {
- this.textToSearch = textToSearch.toLowerCase();
- }
- }
- /**
- * {@inheritDoc}
- */
- @Override
+ /**
+ * Constructor
+ * @param caseSensitive is search case sensitive
+ * @param textToSearch Text to search
+ */
+ public RawTextSearcher(boolean caseSensitive, String textToSearch) {
+ super();
+ this.caseSensitive = caseSensitive;
+ if(caseSensitive) {
+ this.textToSearch = textToSearch;
+ } else {
+ this.textToSearch = textToSearch.toLowerCase();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public boolean search(List<String> textTokens) {
- boolean result = false;
- for (String searchableToken : textTokens) {
- if(!StringUtils.isEmpty(searchableToken)) {
- if(caseSensitive) {
- result = searchableToken.indexOf(textToSearch)>=0;
- } else {
- result = searchableToken.toLowerCase().indexOf(textToSearch)>=0;
- }
- if (result) {
- return result;
- }
- }
- }
- return false;
- }
+ boolean result = false;
+ for (String searchableToken : textTokens) {
+ if(!StringUtils.isEmpty(searchableToken)) {
+ if(caseSensitive) {
+ result = searchableToken.indexOf(textToSearch)>=0;
+ } else {
+ result = searchableToken.toLowerCase().indexOf(textToSearch)>=0;
+ }
+ if (result) {
+ return result;
+ }
+ }
+ }
+ return false;
+ }
- /**
+ /**
* Returns true if searchedTextLowerCase is in value
* @param value
* @param searchedTextLowerCase
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java Sun Mar 17 22:17:44 2013
@@ -28,45 +28,45 @@ import org.apache.commons.lang3.StringUt
* Regexp search implementation
*/
public class RegexpSearcher implements Searcher {
- private boolean caseSensitive;
- private Pattern pattern;
-
+ private boolean caseSensitive;
+ private Pattern pattern;
- /**
- * Constructor
- * @param caseSensitive is search case sensitive
- * @param regexp Regexp to search
- */
- public RegexpSearcher(boolean caseSensitive, String regexp) {
- super();
- this.caseSensitive = caseSensitive;
- String newRegexp = ".*"+regexp+".*";
- if(caseSensitive) {
- pattern = Pattern.compile(newRegexp);
- } else {
- pattern = Pattern.compile(newRegexp.toLowerCase());
- }
- }
+ /**
+ * Constructor
+ * @param caseSensitive is search case sensitive
+ * @param regexp Regexp to search
+ */
+ public RegexpSearcher(boolean caseSensitive, String regexp) {
+ super();
+ this.caseSensitive = caseSensitive;
+ String newRegexp = ".*"+regexp+".*";
+ if(caseSensitive) {
+ pattern = Pattern.compile(newRegexp);
+ } else {
+ pattern = Pattern.compile(newRegexp.toLowerCase());
+ }
+ }
- /**
- * {@inheritDoc}
- */
- @Override
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public boolean search(List<String> textTokens) {
- for (String searchableToken : textTokens) {
- if(!StringUtils.isEmpty(searchableToken)) {
- Matcher matcher = null;
- if(caseSensitive) {
- matcher = pattern.matcher(searchableToken);
- } else {
- matcher = pattern.matcher(searchableToken.toLowerCase());
- }
- if(matcher.find()) {
- return true;
- }
- }
- }
- return false;
- }
+ for (String searchableToken : textTokens) {
+ if(!StringUtils.isEmpty(searchableToken)) {
+ Matcher matcher = null;
+ if(caseSensitive) {
+ matcher = pattern.matcher(searchableToken);
+ } else {
+ matcher = pattern.matcher(searchableToken.toLowerCase());
+ }
+ if(matcher.find()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java?rev=1457573&r1=1457572&r2=1457573&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java Sun Mar 17 22:17:44 2013
@@ -40,7 +40,7 @@ public class SearchTreeCommand extends A
*/
@Override
public void doAction(ActionEvent e) {
- dialog.setVisible(true);
+ dialog.setVisible(true);
}