Author: pmouawad
Date: Thu Feb 18 13:21:44 2016
New Revision: 1731069
URL: http://svn.apache.org/viewvc?rev=1731069&view=rev
Log:
Removing unnecessary modifiers
Contributed by Graham Russel Part 2
https://github.com/apache/jmeter/pull/122
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/TimeHelper.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleSource.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java Thu Feb
18 13:21:44 2016
@@ -193,7 +193,8 @@ public class IfController extends Generi
* @return boolean
* @throws Exception
*/
- private static final boolean computeResultFromString(String condition,
String resultStr) throws Exception {
+ private static boolean computeResultFromString(
+ String condition, String resultStr) throws Exception {
boolean result;
switch(resultStr) {
case "false":
@@ -205,7 +206,7 @@ public class IfController extends Generi
default:
throw new Exception(" BAD CONDITION :: " + condition + " ::
expected true or false");
}
- if(logger.isDebugEnabled()) {
+ if (logger.isDebugEnabled()) {
logger.debug(" >> evaluate Condition - [ " + condition + "]
results is [" + result + "]");
}
return result;
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
Thu Feb 18 13:21:44 2016
@@ -255,9 +255,10 @@ public class TransactionController exten
* @param res {@link SampleResult}
* @return true if res is the ParentSampler transactions
*/
- public static final boolean isFromTransactionController(SampleResult res) {
+ public static boolean isFromTransactionController(SampleResult res) {
return res.getResponseMessage() != null &&
-
res.getResponseMessage().startsWith(TransactionController.NUMBER_OF_SAMPLES_IN_TRANSACTION_PREFIX);
+ res.getResponseMessage().startsWith(
+
TransactionController.NUMBER_OF_SAMPLES_IN_TRANSACTION_PREFIX);
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java Thu Feb 18
13:21:44 2016
@@ -85,7 +85,7 @@ public class TreeCloner implements HashT
* add node to objects LinkedList
* @param node Object
*/
- private final void addLast(Object node) {
+ private void addLast(Object node) {
objects.addLast(node);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Thu Feb 18
13:21:44 2016
@@ -407,7 +407,7 @@ public class Save implements Command {
* Check nodes does not contain a node of type TestPlan or ThreadGroup
* @param nodes
*/
- private static final boolean
checkAcceptableForTestFragment(JMeterTreeNode[] nodes) {
+ private static boolean checkAcceptableForTestFragment(JMeterTreeNode[]
nodes) {
for (JMeterTreeNode node : nodes) {
Object userObject = node.getUserObject();
if (userObject instanceof ThreadGroup ||
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
Thu Feb 18 13:21:44 2016
@@ -54,7 +54,7 @@ public class TemplateManager {
private final XStream xstream = initXStream();
- public static final TemplateManager getInstance() {
+ public static TemplateManager getInstance() {
return SINGLETON;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java Thu Feb
18 13:21:44 2016
@@ -26,7 +26,7 @@ import javax.swing.MenuElement;
* @since 2.10
*/
public interface MenuCreator {
- public enum MENU_LOCATION {
+ enum MENU_LOCATION {
FILE,
EDIT,
RUN,
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/TimeHelper.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/TimeHelper.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/TimeHelper.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/TimeHelper.java Thu Feb
18 13:21:44 2016
@@ -29,9 +29,10 @@ import org.apache.jmeter.util.JMeterUtil
*/
public class TimeHelper {
- private static final String TIMESTAMP_FORMAT_PROPERTY =
"jmeter.save.saveservice.timestamp_format";
+ private static final String TIMESTAMP_FORMAT_PROPERTY =
+ "jmeter.save.saveservice.timestamp_format";
- public static final String time(long t) {
+ public static String time(long t) {
long h = t / 3600000;
t %= 3600000;
long m = t / 60000;
@@ -61,7 +62,7 @@ public class TimeHelper {
* the time stamp
* @return the string
*/
- public static final String formatTimeStamp(long timeStamp) {
+ public static String formatTimeStamp(long timeStamp) {
return formatTimeStamp(timeStamp,
JMeterUtils.getProperty(TIMESTAMP_FORMAT_PROPERTY));
}
@@ -75,7 +76,7 @@ public class TimeHelper {
* the format
* @return the string
*/
- public static final String formatTimeStamp(long timeStamp, String format) {
+ public static String formatTimeStamp(long timeStamp, String format) {
SimpleDateFormat dateFormat = format != null ? new SimpleDateFormat(
format) : new SimpleDateFormat();
return dateFormat.format(new Date(timeStamp));
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
Thu Feb 18 13:21:44 2016
@@ -150,7 +150,7 @@ public class CsvFileSampleSource extends
/**
* Get the current time in milliseconds
*/
- private final long now() {
+ private long now() {
return System.currentTimeMillis();
}
@@ -161,7 +161,7 @@ public class CsvFileSampleSource extends
* @return A readable string that displays the time provided as
* milliseconds
*/
- private final String time(long t) {
+ private String time(long t) {
return TimeHelper.time(t);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
Thu Feb 18 13:21:44 2016
@@ -64,13 +64,13 @@ public interface SampleConsumer extends
* @param channel
* The channel whose sample metadata are beeing defined
*/
- public void setConsumedMetadata(SampleMetadata sampleMetadata, int
channel);
+ void setConsumedMetadata(SampleMetadata sampleMetadata, int channel);
/**
* Start the sample consuming. This step is used be consumer to intialize
* their process.
*/
- public void startConsuming();
+ void startConsuming();
/**
* Consumes the specified sample ton the specified channel.
@@ -80,12 +80,12 @@ public interface SampleConsumer extends
* @param channel
* The channel on which the sample is consumed
*/
- public void consume(Sample s, int channel);
+ void consume(Sample s, int channel);
/**
* Stops the consuming process. No sample will be processed after this
* service has been called.
*/
- public void stopConsuming();
+ void stopConsuming();
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
Thu Feb 18 13:21:44 2016
@@ -35,7 +35,7 @@ public interface SampleProcessor {
*
* @return the sample context
*/
- public SampleContext getSampleContext();
+ SampleContext getSampleContext();
/**
* Set sample context that this consumer should rely on.
@@ -43,7 +43,7 @@ public interface SampleProcessor {
* @param ctx
* the new sample context
*/
- public void setSampleContext(SampleContext ctx);
+ void setSampleContext(SampleContext ctx);
/**
* Associate an attribute to the specified channel for this sample
processor<br>
@@ -56,7 +56,7 @@ public interface SampleProcessor {
* @param value
* The attribute value to be set
*/
- public void setChannelAttribute(int channel, String key, Object value);
+ void setChannelAttribute(int channel, String key, Object value);
/**
* Return an attribute value associated on a channel on this sample
@@ -69,6 +69,6 @@ public interface SampleProcessor {
* @return The attribute value or null if none is found for the specified
* key
*/
- public Object getChannelAttribute(int channel, String key);
+ Object getChannelAttribute(int channel, String key);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
Thu Feb 18 13:21:44 2016
@@ -58,13 +58,13 @@ public interface SampleProducer extends
* @param channel
* The channel whoses metadata are beeing associated wih
*/
- public void setProducedMetadata(SampleMetadata metadata, int channel);
+ void setProducedMetadata(SampleMetadata metadata, int channel);
/**
* Start producing samples, must be invoked before any call to
* <code>produce()</code>
*/
- public void startProducing();
+ void startProducing();
/**
* Produce a single sample on the specified channel
@@ -74,12 +74,12 @@ public interface SampleProducer extends
* @param channel
* The channel on which is produced the sample
*/
- public void produce(Sample s, int channel);
+ void produce(Sample s, int channel);
/**
* Stop producing samples, no <code>produce()</code> call should occur
after
* this service has been called.
*/
- public void stopProducing();
+ void stopProducing();
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleSource.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleSource.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleSource.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleSource.java
Thu Feb 18 13:21:44 2016
@@ -31,7 +31,7 @@ public interface SampleSource extends Ru
*
* @return the sampleContext
*/
- public SampleContext getSampleContext();
+ SampleContext getSampleContext();
/**
* Sets the sample context.
@@ -39,21 +39,21 @@ public interface SampleSource extends Ru
* @param sampleContext
* the sampleContext to set
*/
- public void setSampleContext(SampleContext sampleContext);
+ void setSampleContext(SampleContext sampleContext);
/**
* Sets the specified sample consumers that will consume samples produced
by
* this sample source.
*/
- public void setSampleConsumers(List<SampleConsumer> consumers);
+ void setSampleConsumers(List<SampleConsumer> consumers);
/**
* Add a sample consumer to this sample source.
*/
- public void addSampleConsumer(SampleConsumer consumer);
+ void addSampleConsumer(SampleConsumer consumer);
/**
* Remove a sample consumer from this sample source.
*/
- public void removeSampleConsumer(SampleConsumer consumer);
+ void removeSampleConsumer(SampleConsumer consumer);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
Thu Feb 18 13:21:44 2016
@@ -102,7 +102,7 @@ public class DataStrippingSampleSender e
* Strip response but fill in bytes field.
* @param result {@link SampleResult}
*/
- private final void stripResponse(SampleResult result) {
+ private void stripResponse(SampleResult result) {
result.setBytes(result.getBytes());
result.setResponseData(SampleResult.EMPTY_BA);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Thu Feb 18
13:21:44 2016
@@ -549,7 +549,8 @@ public class SaveService {
* @return the loaded tree
* @throws IOException if there is a problem reading the file or
processing it
*/
- private static final HashTree readTree(InputStream reader, File file)
throws IOException {
+ private static HashTree readTree(InputStream reader, File file)
+ throws IOException {
if (!reader.markSupported()) {
reader = new BufferedInputStream(reader);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Thu Feb 18 13:21:44 2016
@@ -150,7 +150,7 @@ public class GenericTestBeanCustomizer e
/** TextEditor property */
public static final String TEXT_LANGUAGE = "textLanguage"; //$NON-NLS-1$
- public static final String ORDER(String group) {
+ public static String ORDER(String group) {
return "group." + group + ".order";
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
Thu Feb 18 13:21:44 2016
@@ -33,7 +33,7 @@ import org.apache.log.Logger;
/**
* This is an implementation of a full-fledged property editor, providing both
* object-text transformation and an editor GUI (a custom editor component),
- * from two simpler property editors providing only one of these
functionalities
+ * from two simpler property editors providing only one of these functions
* each, namely:
* <dl>
* <dt>typeEditor
@@ -44,11 +44,11 @@ import org.apache.log.Logger;
* <dt>guiEditor</dt>
* <dd>Provides a suitable GUI for the property, but works on [possibly null]
* String values. That is: it supportsCustomEditor, but get/setAsText and
- * get/setValue are indentical.</dd>
+ * get/setValue are identical.</dd>
* </dl>
* <p>
* The resulting editor provides optional support for null values (you can
- * choose whether <b>null</b> is to be a valid property value). It also
+ * choose whether <strong>null</strong> is to be a valid property value). It
also
* provides optional support for JMeter 'expressions' (you can choose whether
* they make valid property values).
*
@@ -56,32 +56,22 @@ import org.apache.log.Logger;
class WrapperEditor extends PropertyEditorSupport implements
PropertyChangeListener {
private static final Logger log = LoggingManager.getLoggerForClass();
- /**
- * The type's property editor.
- */
+ /** The type's property editor. */
private final PropertyEditor typeEditor;
- /**
- * The gui property editor
- */
+ /** The gui property editor */
private final PropertyEditor guiEditor;
- /**
- * Whether to allow <b>null</b> as a property value.
- */
+ /** Whether to allow <b>null</b> as a property value. */
private final boolean acceptsNull;
- /**
- * Whether to allow JMeter 'expressions' as property values.
- */
+ /** Whether to allow JMeter 'expressions' as property values. */
private final boolean acceptsExpressions;
- /**
- * Whether to allow any constant values different from the provided tags.
- */
+ /** Whether to allow any constant values different from the provided tags.
*/
private final boolean acceptsOther;
- /** Default value to be used to (re-)initialiase the field */
+ /** Default value to be used to (re-)initialise the field */
private final Object defaultValue;
/**
@@ -93,8 +83,10 @@ class WrapperEditor extends PropertyEdit
/**
* Constructor for use when a PropertyEditor is delegating to us.
*/
- WrapperEditor(Object source, PropertyEditor typeEditor, PropertyEditor
guiEditor, boolean acceptsNull,
- boolean acceptsExpressions, boolean acceptsOther, Object
defaultValue) {
+ WrapperEditor(
+ Object source, PropertyEditor typeEditor, PropertyEditor guiEditor,
+ boolean acceptsNull, boolean acceptsExpressions,
+ boolean acceptsOther, Object defaultValue) {
super();
if (source != null) {
super.setSource(source);
@@ -111,12 +103,14 @@ class WrapperEditor extends PropertyEdit
/**
* Constructor for use for regular instantiation and by subclasses.
*/
- WrapperEditor(PropertyEditor typeEditor, PropertyEditor guiEditor, boolean
acceptsNull, boolean acceptsExpressions,
+ WrapperEditor(
+ PropertyEditor typeEditor, PropertyEditor guiEditor,
+ boolean acceptsNull, boolean acceptsExpressions,
boolean acceptsOther, Object defaultValue) {
this(null, typeEditor, guiEditor, acceptsNull, acceptsExpressions,
acceptsOther, defaultValue);
}
- final void resetValue(){
+ final void resetValue() {
setValue(defaultValue);
lastValidValue = getAsText();
}
@@ -126,11 +120,10 @@ class WrapperEditor extends PropertyEdit
resetValue();
if (guiEditor instanceof ComboStringEditor) {
- String[] tags = ((ComboStringEditor) guiEditor).getTags();
+ String[] tags = guiEditor.getTags();
- // Provide an initial edit value if necessary -- this is an
- // heuristic that tries to provide the most convenient
- // initial edit value:
+ // Provide an initial edit value if necessary -- this is a
heuristic
+ // that tries to provide the most convenient initial edit value:
String v;
if (!acceptsOther) {
@@ -167,10 +160,10 @@ class WrapperEditor extends PropertyEdit
}
/**
- * Determine wheter a string is one of the known tags.
+ * Determine whether a string is one of the known tags.
*
- * @param text
- * @return true iif text equals one of the getTags()
+ * @param text the value to be checked
+ * @return true if text equals one of the getTags()
*/
private boolean isATag(String text) {
String[] tags = getTags();
@@ -207,6 +200,7 @@ class WrapperEditor extends PropertyEdit
if (isATag(text)) {
return true;
}
+
// Was not a tag, so if we can't accept other values...
if (!acceptsOther) {
return false;
@@ -216,8 +210,7 @@ class WrapperEditor extends PropertyEdit
try {
typeEditor.setAsText(text);
} catch (IllegalArgumentException e1) {
- // setAsText failed: not valid
- return false;
+ return false; // setAsText failed: not valid
}
// setAsText succeeded: valid
return true;
@@ -232,7 +225,7 @@ class WrapperEditor extends PropertyEdit
* @throws Error
* always throws an error.
*/
- private final void shouldNeverHappen(String msg) throws Error {
+ private void shouldNeverHappen(String msg) throws Error {
throw new Error(msg); // Programming error: bail out.
}
@@ -244,7 +237,7 @@ class WrapperEditor extends PropertyEdit
* @throws Error
* always throws one.
*/
- private final void shouldNeverHappen(Exception e) throws Error {
+ private void shouldNeverHappen(Exception e) throws Error {
throw new Error(e.toString()); // Programming error: bail out.
}
@@ -252,10 +245,10 @@ class WrapperEditor extends PropertyEdit
* Check if a string is a valid JMeter 'expression'.
* <p>
* The current implementation is very basic: it just accepts any string
- * containing "${" as a valid expression. TODO: improve, but keep returning
- * true for "${}".
+ * containing "${" as a valid expression.
+ * TODO: improve, but keep returning true for "${}".
*/
- private final boolean isExpression(String text) {
+ private boolean isExpression(String text) {
return text.contains("${");//$NON-NLS-1$
}
@@ -263,9 +256,9 @@ class WrapperEditor extends PropertyEdit
* Same as isExpression(String).
*
* @param text
- * @return true iif text is a String and isExpression(text).
+ * @return true if text is a String and isExpression(text).
*/
- private final boolean isExpression(Object text) {
+ private boolean isExpression(Object text) {
return text instanceof String && isExpression((String) text);
}
@@ -300,8 +293,8 @@ class WrapperEditor extends PropertyEdit
try {
typeEditor.setAsText(text);
} catch (NumberFormatException e) {
- if (text.length()==0){
- text="0";//$NON-NLS-1$
+ if (text.length() == 0){
+ text = "0";//$NON-NLS-1$
typeEditor.setAsText(text);
} else {
shouldNeverHappen(e);
@@ -354,7 +347,7 @@ class WrapperEditor extends PropertyEdit
*/
private String fixGetAsTextBug(String asText) {
if (asText == null){
- return asText;
+ return null;
}
if (asText.equals("true")){
log.debug("true=>True");// so we can detect it
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Thu Feb 18
13:21:44 2016
@@ -1305,7 +1305,7 @@ public class JMeterUtils implements Unit
* otherwise runs call {@link SwingUtilities#invokeAndWait(Runnable)}
* @param runnable {@link Runnable}
*/
- public static final void runSafe(Runnable runnable) {
+ public static void runSafe(Runnable runnable) {
runSafe(true, runnable);
}
@@ -1315,7 +1315,7 @@ public class JMeterUtils implements Unit
* @param synchronous flag, whether we will wait for the AWT Thread to
finish its job.
* @param runnable {@link Runnable}
*/
- public static final void runSafe(boolean synchronous, Runnable runnable) {
+ public static void runSafe(boolean synchronous, Runnable runnable) {
if(SwingUtilities.isEventDispatchThread()) {
runnable.run();
} else {
@@ -1337,7 +1337,7 @@ public class JMeterUtils implements Unit
/**
* Help GC by triggering GC and finalization
*/
- public static final void helpGC() {
+ public static void helpGC() {
System.gc();
System.runFinalization();
}
@@ -1348,9 +1348,9 @@ public class JMeterUtils implements Unit
* @param matcher {@link Perl5Matcher}
* @param pattern Pattern
*/
- public static final void clearMatcherMemory(Perl5Matcher matcher, Pattern
pattern) {
+ public static void clearMatcherMemory(Perl5Matcher matcher, Pattern
pattern) {
try {
- if(pattern != null) {
+ if (pattern != null) {
matcher.matches("", pattern); // $NON-NLS-1$
}
} catch (Exception e) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java Thu Feb 18
13:21:44 2016
@@ -250,7 +250,7 @@ public abstract class SSLManager {
*
* @return the singleton {@link SSLManager}
*/
- public static final synchronized SSLManager getInstance() {
+ public static synchronized SSLManager getInstance() {
if (null == SSLManager.manager) {
SSLManager.manager = new JsseSSLManager(null);
}
@@ -263,7 +263,7 @@ public abstract class SSLManager {
*
* @return flag whether SSL is supported
*/
- public static final boolean isSSLSupported() {
+ public static boolean isSSLSupported() {
return SSLManager.isSSLSupported;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java?rev=1731069&r1=1731068&r2=1731069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java Thu Feb 18
13:21:44 2016
@@ -433,14 +433,14 @@ public class XPathUtil {
* @param xml string to format
* @return String formatted XML
*/
- public static final String formatXml(String xml){
+ public static String formatXml(String xml){
try {
Transformer serializer=
TransformerFactory.newInstance().newTransformer();
serializer.setOutputProperty(OutputKeys.INDENT, "yes");
serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount";, "2");
- Source xmlSource=new SAXSource(new InputSource(new
StringReader(xml)));
+ Source xmlSource = new SAXSource(new InputSource(new
StringReader(xml)));
StringWriter stringWriter = new StringWriter();
- StreamResult res = new StreamResult(stringWriter);
+ StreamResult res = new StreamResult(stringWriter);
serializer.transform(xmlSource, res);
return stringWriter.toString();
} catch (Exception e) {
