Ticket #4055: OsmPrimitive.compareTo.patch

src/org/openstreetmap/josm/data/osm/Node.java

@@ -160 +160 @@
     }
 
     public int compareTo(OsmPrimitive o) {
-        return o instanceof Node ? Long.valueOf(getId()).compareTo(o.getId()) : 1;
+        return o instanceof Node ? Long.valueOf(getUniqueId()).compareTo(o.getUniqueId()) : 1;
     }
 
     @Override

src/org/openstreetmap/josm/data/osm/Relation.java

@@ -230 +230 @@
     }
 
     public int compareTo(OsmPrimitive o) {
-        return o instanceof Relation ? Long.valueOf(getId()).compareTo(o.getId()) : -1;
+        return o instanceof Relation ? Long.valueOf(getUniqueId()).compareTo(o.getUniqueId()) : -1;
     }
 
     // seems to be different from member "incomplete" - FIXME

src/org/openstreetmap/josm/data/osm/Way.java

@@ -240 +240 @@
     public int compareTo(OsmPrimitive o) {
         if (o instanceof Relation)
             return 1;
-        return o instanceof Way ? Long.valueOf(getId()).compareTo(o.getId()) : -1;
+        return o instanceof Way ? Long.valueOf(getUniqueId()).compareTo(o.getUniqueId()) : -1;
     }
 
     public void removeNode(Node n) {