Revision 44006 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/ComparatorUtils.java
ComparatorUtils.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import java.util.Comparator; |
4 | 4 |
import java.util.Objects; |
5 |
import org.apache.commons.lang3.math.NumberUtils; |
|
5 | 6 |
|
6 | 7 |
/* |
7 | 8 |
* To change this license header, choose License Headers in Project Properties. |
... | ... | |
23 | 24 |
} else if (o1 instanceof Float) { |
24 | 25 |
return Double.compare((Float) o1, (Float) o2); |
25 | 26 |
} else if (o1 instanceof Number) { |
26 |
return Double.compare(((Number) o1).longValue(), ((Number) o2).longValue());
|
|
27 |
return Double.compare( getLong((Number) o1), getLong((Number) o2));
|
|
27 | 28 |
} else { |
28 | 29 |
return Objects.toString(o1, "").compareTo(Objects.toString(o2, "")); |
29 | 30 |
} |
30 | 31 |
} |
31 | 32 |
}; |
32 | 33 |
} |
34 |
|
|
35 |
private static long getLong(Number n) { |
|
36 |
if( n==null ) { |
|
37 |
return 0; |
|
38 |
} |
|
39 |
return n.longValue(); |
|
40 |
} |
|
33 | 41 |
} |
Also available in: Unified diff