xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2245 make DataTimeCompatible Java 6 compatible.

Browse source 
Former-commit-id: e32655d3daef131c451d972c7b2747b01e49d840
This commit is contained in:
Ben Steffensmeier 2013-08-12 13:43:13 -05:00
parent 1386598257
commit 67c84f2fb8
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTimeComparator.java
View file

@ -104,12 +104,12 @@ public class DataTimeComparator implements Comparator<DataTime> {
private int compareNoMatch(SortKey sortKey, DataTime time1, DataTime time2) {
switch (sortKey) {
case INITIAL_TIME:
return Long.compare(time1.getRefTime().getTime(), time2
return longCompare(time1.getRefTime().getTime(), time2
.getRefTime().getTime());
case FORECAST_TIME:
return Integer.compare(time1.getFcstTime(), time2.getFcstTime());
return integerCompare(time1.getFcstTime(), time2.getFcstTime());
case VALID_TIME:
return Long.compare(time1.getValidTime().getTimeInMillis(), time2
return longCompare(time1.getValidTime().getTimeInMillis(), time2
.getValidTime().getTimeInMillis());
default:
throw new IllegalArgumentException(String.valueOf(sortKey)
@ -120,11 +120,11 @@ public class DataTimeComparator implements Comparator<DataTime> {
private int compareMatch(SortKey sortKey, DataTime time1, DataTime time2) {
switch (sortKey) {
case INITIAL_TIME:
return Long.compare(time1.getMatchRef(), time2.getMatchRef());
return longCompare(time1.getMatchRef(), time2.getMatchRef());
case FORECAST_TIME:
return Long.compare(time1.getMatchFcst(), time2.getMatchFcst());
return longCompare(time1.getMatchFcst(), time2.getMatchFcst());
case VALID_TIME:
return Long.compare(time1.getMatchValid(), time2.getMatchValid());
return longCompare(time1.getMatchValid(), time2.getMatchValid());
default:
throw new IllegalArgumentException(String.valueOf(sortKey)
+ " is not a recognized SortKey.");
@ -155,11 +155,26 @@ public class DataTimeComparator implements Comparator<DataTime> {
return 1;
}
int result = Long.compare(p1.getDuration(), p2.getDuration());
int result = longCompare(p1.getDuration(), p2.getDuration());
if (result != 0) {
return result;
}
return Long.compare(p1.getStart().getTime(), p2.getStart().getTime());
return longCompare(p1.getStart().getTime(), p2.getStart().getTime());
}
/**
* For compatibility with Java 6 use this instead of Integer.compare.
*/
private int integerCompare(int x, int y) {
return (x < y) ? -1 : ((x == y) ? 0 : 1);
}
/**
* For compatibility with Java 6 use this instead of Long.compare.
*/
private int longCompare(long x, long y) {
return (x < y) ? -1 : ((x == y) ? 0 : 1);
}
}