Author: sebb
Date: Fri Dec 10 14:04:53 2010
New Revision: 1044360
URL: http://svn.apache.org/viewvc?rev=1044360&view=rev
Log:
Findbugs inefficient code
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerBeanInfo.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorInteger.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorLong.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
Fri Dec 10 14:04:53 2010
@@ -37,7 +37,7 @@ public class CompareAssertionBeanInfo ex
p.setValue(NOT_EXPRESSION, Boolean.TRUE);
p = property("compareTime"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, new Long(-1));
+ p.setValue(DEFAULT, Long.valueOf(-1));
p.setValue(NOT_EXPRESSION, Boolean.FALSE);
p = property("stringsToSkip"); //$NON-NLS-1$
p.setPropertyEditorClass(TableEditor.class);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
Fri Dec 10 14:04:53 2010
@@ -51,7 +51,7 @@ public class DurationAssertion extends A
// has the Sample lasted too long?
if ( responseTime > duration) {
result.setFailure(true);
- Object[] arguments = { new Long(responseTime), new
Long(duration) };
+ Object[] arguments = { Long.valueOf(responseTime),
Long.valueOf(duration) };
String message = MessageFormat.format(
JMeterUtils.getResString("duration_assertion_failure")
// $NON-NLS-1$
, arguments);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
Fri Dec 10 14:04:53 2010
@@ -80,7 +80,7 @@ public class SizeAssertion extends Abstr
final String msg = compareSize(resultSize);
if (msg.length() > 0) {
result.setFailure(true);
- Object[] arguments = { new Long(resultSize), msg, new
Long(getAllowedSize()) };
+ Object[] arguments = { Long.valueOf(resultSize), msg,
Long.valueOf(getAllowedSize()) };
String message =
MessageFormat.format(JMeterUtils.getResString("size_assertion_failure"),
arguments); //$NON-NLS-1$
result.setFailureMessage(message);
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Fri Dec 10 14:04:53 2010
@@ -321,7 +321,7 @@ public class RegexExtractor extends Abst
if (beginMatch > beginOffset) { // string is not empty
combined.add(rawTemplate.substring(beginOffset, beginMatch));
}
- combined.add(new Integer(currentResult.group(1)));// add match as
Integer
+ combined.add(Integer.valueOf(currentResult.group(1)));// add match
as Integer
beginOffset = currentResult.endOffset(0);
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
Fri Dec 10 14:04:53 2010
@@ -60,7 +60,7 @@ public class CounterConfig extends Abstr
perTheadNumber = new ThreadLocal<Long>() {
@Override
protected Long initialValue() {
- return new Long(getStart());
+ return Long.valueOf(getStart());
}
};
}
@@ -95,7 +95,7 @@ public class CounterConfig extends Abstr
if (current > end) {
current = start;
}
- perTheadNumber.set(new Long(current));
+ perTheadNumber.set(Long.valueOf(current));
}
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerBeanInfo.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerBeanInfo.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerBeanInfo.java
Fri Dec 10 14:04:53 2010
@@ -31,7 +31,7 @@ public class SyncTimerBeanInfo extends B
PropertyDescriptor p = property("groupSize");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, new Integer(0));
+ p.setValue(DEFAULT, Integer.valueOf(0));
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
Fri Dec 10 14:04:53 2010
@@ -148,7 +148,7 @@ public class PowerTableModel extends Def
}
try {
Constructor<?> constr = colClass.getConstructor(new Class[] {
Integer.TYPE });
- return constr.newInstance(new Object[] { new Integer(0) });
+ return constr.newInstance(new Object[] { Integer.valueOf(0) });
} catch (NoSuchMethodException err) {
} catch (InstantiationException err) {
} catch (IllegalAccessException err) {
@@ -156,7 +156,7 @@ public class PowerTableModel extends Def
}
try {
Constructor<?> constr = colClass.getConstructor(new Class[] {
Long.TYPE });
- return constr.newInstance(new Object[] { new Long(0L) });
+ return constr.newInstance(new Object[] { Long.valueOf(0L) });
} catch (NoSuchMethodException err) {
} catch (InstantiationException err) {
} catch (IllegalAccessException err) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
Fri Dec 10 14:04:53 2010
@@ -81,9 +81,9 @@ public class FileReporter extends JPanel
Integer value = null;
if (line.charAt(len) == ',') {
- value = new Integer(line.substring(splitter + 1, len));
+ value = Integer.valueOf(line.substring(splitter + 1,
len));
} else {
- value = new Integer(line.substring(splitter + 1));
+ value = Integer.valueOf(line.substring(splitter + 1));
}
Vector<Integer> v = getData(key);
@@ -333,12 +333,12 @@ private static class GraphPanel extends
*/
// draw axis
for (int t = 1; t < dataWidth; t += (dataWidth / 25 + 1)) {
- g.drawString((new Integer(t)).toString(), t * increment + 2,
height - 2);
+ g.drawString((Integer.valueOf(t)).toString(), t * increment + 2,
height - 2);
}
float incrementValue = (maxValue - minValue) / (10 - 1);
for (int t = 0; t < 10; t++) {
- g.drawString(new Integer(Math.round(minValue + (t *
incrementValue))).toString(), 2, height - t
+ g.drawString(Integer.valueOf(Math.round(minValue + (t *
incrementValue))).toString(), 2, height - t
* yIncrement - 2 - base);
}
// draw data lines
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
Fri Dec 10 14:04:53 2010
@@ -193,10 +193,10 @@ public abstract class BeanInfoSupport ex
log.debug("Getting property for: " + names[i]);
PropertyDescriptor p = property(names[i]);
p.setValue(GenericTestBeanCustomizer.GROUP, group);
- p.setValue(GenericTestBeanCustomizer.ORDER, new Integer(i));
+ p.setValue(GenericTestBeanCustomizer.ORDER, Integer.valueOf(i));
}
numCreatedGroups++;
- getBeanDescriptor().setValue(GenericTestBeanCustomizer.ORDER(group),
new Integer(numCreatedGroups));
+ getBeanDescriptor().setValue(GenericTestBeanCustomizer.ORDER(group),
Integer.valueOf(numCreatedGroups));
}
/** {...@inheritdoc} */
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Fri Dec 10 14:04:53 2010
@@ -557,7 +557,7 @@ public class GenericTestBeanCustomizer e
private Integer groupOrder(String group) {
Integer order = (Integer)
beanInfo.getBeanDescriptor().getValue(ORDER(group));
if (order == null) {
- order = new Integer(0);
+ order = Integer.valueOf(0);
}
return order;
}
@@ -571,7 +571,7 @@ public class GenericTestBeanCustomizer e
private Integer propertyOrder(PropertyDescriptor d) {
Integer order = (Integer) d.getValue(ORDER);
if (order == null) {
- order = new Integer(0);
+ order = Integer.valueOf(0);
}
return order;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
Fri Dec 10 14:04:53 2010
@@ -90,7 +90,7 @@ public class IntegerProperty extends Num
* @see JMeterProperty#getObjectValue()
*/
public Object getObjectValue() {
- return new Integer(value);
+ return Integer.valueOf(value);
}
/**
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
Fri Dec 10 14:04:53 2010
@@ -86,7 +86,7 @@ public class LongProperty extends Number
* @see JMeterProperty#getObjectValue()
*/
public Object getObjectValue() {
- return new Long(value);
+ return Long.valueOf(value);
}
/**
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
Fri Dec 10 14:04:53 2010
@@ -75,7 +75,7 @@ public class BeanShellServer implements
Method source = Interpreter.getMethod("source", new Class[] {
string });//$NON-NLS-1$
setObj.invoke(instance, new Object[] { "t", this });//$NON-NLS-1$
- setInt.invoke(instance, new Object[] { "portnum", new
Integer(serverport) });//$NON-NLS-1$
+ setInt.invoke(instance, new Object[] { "portnum",
Integer.valueOf(serverport) });//$NON-NLS-1$
if (serverfile.length() > 0) {
try {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java Fri
Dec 10 14:04:53 2010
@@ -121,7 +121,7 @@ public class Calculator {
}
public Number getMeanAsNumber() {
- return new Long((long) mean);
+ return Long.valueOf((long) mean);
}
public double getStandardDeviation() {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Fri Dec 10 14:04:53 2010
@@ -265,7 +265,7 @@ public class SamplingStatCalculator {
}
public Number getMeanAsNumber() {
- return new Long((long) calculator.getMean());
+ return Long.valueOf((long) calculator.getMean());
}
public Number getMedian() {
@@ -274,7 +274,7 @@ public class SamplingStatCalculator {
public Number getMin() {
if (calculator.getMin().longValue() < 0) {
- return new Long(0);
+ return Long.valueOf(0);
}
return calculator.getMin();
}
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
Fri Dec 10 14:04:53 2010
@@ -47,7 +47,7 @@ public class IterationCounter extends Ab
perThreadInt = new ThreadLocal<Integer>(){
@Override
protected Integer initialValue() {
- return new Integer(0);
+ return Integer.valueOf(0);
}
};
}
@@ -66,7 +66,7 @@ public class IterationCounter extends Ab
public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
throws InvalidVariableException {
- new Integer(1);
+ Integer.valueOf(1);
globalCounter++;
JMeterVariables vars = getVariables();
@@ -83,7 +83,7 @@ public class IterationCounter extends Ab
if (perThread) {
int threadCounter;
threadCounter = perThreadInt.get().intValue() + 1;
- perThreadInt.set(new Integer(threadCounter));
+ perThreadInt.set(Integer.valueOf(threadCounter));
counterString = String.valueOf(threadCounter);
} else {
counterString = String.valueOf(globalCounter);
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
Fri Dec 10 14:04:53 2010
@@ -261,18 +261,18 @@ public class RegexFunction extends Abstr
boolean matchExists = matcher.contains(input, templatePattern);
if (startsWith) {
if (matchExists) {
- combined.add(new Integer(matcher.getMatch().group(1)));
+ combined.add(Integer.valueOf(matcher.getMatch().group(1)));
}
combined.add(iter.next());
} else {
combined.add(iter.next());
if (matchExists) {
- combined.add(new Integer(matcher.getMatch().group(1)));
+ combined.add(Integer.valueOf(matcher.getMatch().group(1)));
}
}
}
if (matcher.contains(input, templatePattern)) {
- combined.add(new Integer(matcher.getMatch().group(1)));
+ combined.add(Integer.valueOf(matcher.getMatch().group(1)));
}
return combined.toArray();
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
Fri Dec 10 14:04:53 2010
@@ -128,7 +128,7 @@ public final class CLArgsParser {
* @see CLOption
*/
public final CLOption getArgumentById(final int id) {
- return m_optionIndex.get(new Integer(id));
+ return m_optionIndex.get(Integer.valueOf(id));
}
/**
@@ -672,7 +672,7 @@ public final class CLArgsParser {
final CLOption option = m_options.get(i);
final CLOptionDescriptor optionDescriptor =
getDescriptorFor(option.getDescriptor().getId());
- m_optionIndex.put(new Integer(option.getDescriptor().getId()),
option);
+ m_optionIndex.put(Integer.valueOf(option.getDescriptor().getId()),
option);
if (null != optionDescriptor && null !=
optionDescriptor.getName()) {
m_optionIndex.put(optionDescriptor.getName(), option);
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorInteger.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorInteger.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorInteger.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorInteger.java
Fri Dec 10 14:04:53 2010
@@ -24,19 +24,19 @@ package org.apache.jorphan.math;
public class StatCalculatorInteger extends StatCalculator<Integer> {
public StatCalculatorInteger() {
- super(new Integer(0), new Integer(Integer.MIN_VALUE), new
Integer(Integer.MAX_VALUE));
+ super(Integer.valueOf(0), Integer.valueOf(Integer.MIN_VALUE),
Integer.valueOf(Integer.MAX_VALUE));
}
public void addValue(int val){
- super.addValue(new Integer(val));
+ super.addValue(Integer.valueOf(val));
}
public void addValue(int val, int sampleCount){
- super.addValue(new Integer(val), sampleCount);
+ super.addValue(Integer.valueOf(val), sampleCount);
}
@Override
protected Integer divide(Integer val, int n) {
- return new Integer(val.intValue() / n);
+ return Integer.valueOf(val.intValue() / n);
}
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorLong.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorLong.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorLong.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculatorLong.java
Fri Dec 10 14:04:53 2010
@@ -24,19 +24,19 @@ package org.apache.jorphan.math;
public class StatCalculatorLong extends StatCalculator<Long> {
public StatCalculatorLong() {
- super(new Long(0L), new Long(Long.MIN_VALUE), new
Long(Long.MAX_VALUE));
+ super(Long.valueOf(0L), Long.valueOf(Long.MIN_VALUE),
Long.valueOf(Long.MAX_VALUE));
}
public void addValue(long val){
- super.addValue(new Long(val));
+ super.addValue(Long.valueOf(val));
}
public void addValue(long val, int sampleCount){
- super.addValue(new Long(val), sampleCount);
+ super.addValue(Long.valueOf(val), sampleCount);
}
@Override
protected Long divide(Long val, int n) {
- return new Long(val.longValue() / n);
+ return Long.valueOf(val.longValue() / n);
}
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
(original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java Fri
Dec 10 14:04:53 2010
@@ -49,11 +49,11 @@ public class Converter {
} else if (toType.equals(String.class)) {
return getString(value);
} else if (toType.equals(int.class) || toType.equals(Integer.class)) {
- return new Integer(getInt(value));
+ return Integer.valueOf(getInt(value));
} else if (toType.equals(char.class) ||
toType.equals(Character.class)) {
return new Character(getChar(value));
} else if (toType.equals(long.class) || toType.equals(Long.class)) {
- return new Long(getLong(value));
+ return Long.valueOf(getLong(value));
} else if (toType.equals(boolean.class) ||
toType.equals(Boolean.class)) {
return Boolean.valueOf(getBoolean(value));
} else if (toType.equals(java.util.Date.class)) {
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Fri Dec 10 14:04:53 2010
@@ -198,7 +198,7 @@ public class CookieManager extends Confi
st[_path] = "/"; //$NON-NLS-1$
}
boolean secure =
Boolean.valueOf(st[_secure]).booleanValue();
- long expires = new Long(st[_expires]).longValue();
+ long expires = Long.valueOf(st[_expires]).longValue();
if (expires==Long.MAX_VALUE) {
expires=0;
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Fri Dec 10 14:04:53 2010
@@ -223,7 +223,7 @@ public class HeaderManager extends Confi
* Vector removeIndices = new Vector(); for (int i = headers.size() - 1; i
>=
* 0; i--) { Header header = (Header) headers.get(i); if (header == null) {
* continue; } if (header.getName().equals(newHeader.getName())) {
- * removeIndices.addElement(new Integer(i)); } }
+ * removeIndices.addElement(Integer.valueOf(i)); } }
*
* for (Enumeration e = removeIndices.elements(); e.hasMoreElements(); ) {
* index = ((Integer) e.nextElement()).intValue(); headers.remove(index); }
@@ -237,7 +237,7 @@ public class HeaderManager extends Confi
continue;
}
if (header.getName().equalsIgnoreCase(name)) {
- removeIndices.addElement(new Integer(i));
+ removeIndices.addElement(Integer.valueOf(i));
}
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
Fri Dec 10 14:04:53 2010
@@ -92,7 +92,7 @@ public class HttpMirrorThread extends Th
final String headerString = headers.toString();
String contentLengthHeaderValue =
getRequestHeaderValue(headerString, "Content-Length"); //$NON-NLS-1$
if(contentLengthHeaderValue != null) {
- contentLength = new
Integer(contentLengthHeaderValue).intValue();
+ contentLength =
Integer.valueOf(contentLengthHeaderValue).intValue();
}
String sleepHeaderValue = getRequestHeaderValue(headerString,
"X-Sleep"); //$NON-NLS-1$
if(sleepHeaderValue != null) {
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java?rev=1044360&r1=1044359&r2=1044360&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java
Fri Dec 10 14:04:53 2010
@@ -165,7 +165,7 @@ public class PackageTest extends TestCas
SearchByClass<Integer> searcher = new
SearchByClass<Integer>(Integer.class);
String one = "one";
String two = "two";
- Integer o = new Integer(1);
+ Integer o = Integer.valueOf(1);
tree.add(one, o);
tree.getTree(one).add(o, two);
tree.traverse(searcher);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
