You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2009/09/01 16:25:11 UTC
svn commit: r810069 - in
/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property:
AbstractProperty.java JMeterProperty.java NumberProperty.java
Author: sebb
Date: Tue Sep 1 14:25:10 2009
New Revision: 810069
URL: http://svn.apache.org/viewvc?rev=810069&view=rev
Log:
Generics fixes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=810069&r1=810068&r2=810069&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java Tue Sep 1 14:25:10 2009
@@ -218,28 +218,24 @@
* @return 0 if equal values or both values null; -1 otherwise
* @see Comparable#compareTo(Object)
*/
- public int compareTo(Object arg0) {
- if (arg0 instanceof JMeterProperty) {
- // We don't expect the string values to ever be null. But (as in
- // bug 19499) sometimes they are. So have null compare less than
- // any other value. Log a warning so we can try to find the root
- // cause of the null value.
- String val = getStringValue();
- String val2 = ((JMeterProperty) arg0).getStringValue();
- if (val == null) {
- log.warn("Warning: Unexpected null value for property: " + name);
-
- if (val2 == null) {
- // Two null values -- return equal
- return 0;
- } else {
- return -1;
- }
+ public int compareTo(JMeterProperty arg0) {
+ // We don't expect the string values to ever be null. But (as in
+ // bug 19499) sometimes they are. So have null compare less than
+ // any other value. Log a warning so we can try to find the root
+ // cause of the null value.
+ String val = getStringValue();
+ String val2 = arg0.getStringValue();
+ if (val == null) {
+ log.warn("Warning: Unexpected null value for property: " + name);
+
+ if (val2 == null) {
+ // Two null values -- return equal
+ return 0;
+ } else {
+ return -1;
}
- return val.compareTo(val2);
- } else {
- return -1;
}
+ return val.compareTo(val2);
}
/**
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java?rev=810069&r1=810068&r2=810069&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java Tue Sep 1 14:25:10 2009
@@ -22,7 +22,7 @@
import org.apache.jmeter.testelement.TestElement;
-public interface JMeterProperty extends Serializable, Cloneable, Comparable {
+public interface JMeterProperty extends Serializable, Cloneable, Comparable<JMeterProperty> {
/**
* Returns whether the property is a running version.
*
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java?rev=810069&r1=810068&r2=810069&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java Tue Sep 1 14:25:10 2009
@@ -55,19 +55,15 @@
* @see Comparable#compareTo(Object)
*/
@Override
- public int compareTo(Object arg0) {
- if (arg0 instanceof JMeterProperty) {
- double compareValue = getDoubleValue() - ((JMeterProperty) arg0).getDoubleValue();
+ public int compareTo(JMeterProperty arg0) {
+ double compareValue = getDoubleValue() - arg0.getDoubleValue();
- if (compareValue < 0) {
- return -1;
- } else if (compareValue == 0) {
- return 0;
- } else {
- return 1;
- }
- } else {
+ if (compareValue < 0) {
return -1;
+ } else if (compareValue == 0) {
+ return 0;
+ } else {
+ return 1;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org