[josm-dev] Tiny patch for Java warning

[Karl Newman]

Here's a quick patch to fix a raw type warning, and also to simplify and
improve the compareTo operation of WayPoint:

Index: src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- src/org/openstreetmap/josm/data/gpx/WayPoint.java    (revision 740)
+++ src/org/openstreetmap/josm/data/gpx/WayPoint.java    (working copy)
@@ -12,7 +12,7 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;

-public class WayPoint extends WithAttributes implements Comparable{
+public class WayPoint extends WithAttributes implements
Comparable<WayPoint> {

     public final LatLon latlon;
     public final EastNorth eastNorth;
@@ -48,11 +48,7 @@
         }
     }

-    public int compareTo(Object other){
-        if(other instanceof WayPoint){
-            WayPoint w = (WayPoint)other;
-            return (int)time - (int)w.time;
-        }
-        return 0;
+    public int compareTo(WayPoint w){
+        return Double.compare(time, w.time);
     }
 }


Karl
_______________________________________________
josm-dev mailing list
josm-dev@openstreetmap.org
http://lists.openstreetmap.org/listinfo/josm-dev