Changeset 629 in josm for trunk/src

Timestamp:

2008-05-11T01:00:31+02:00 (16 years ago)

Author:

framm

Message:

• clean up OsmPrimitive.equals / patch originally by DH but used version from Petr Nejedly

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -161 +161 @@
 
         /**
-         * Equal, if the id (and class) is equal. If both ids are 0, use the super classes
-         * equal instead.
+         * Equal, if the id (and class) is equal. 
          * 
          * An primitive is equal to its incomplete counter part.
          */
-        @Override public final boolean equals(Object obj) {
-                if (obj == null || getClass() != obj.getClass() || id == 0 || ((OsmPrimitive)obj).id == 0)
-                        return super.equals(obj);
-                return id == ((OsmPrimitive)obj).id;
-        }
+    @Override public boolean equals(Object obj) {
+        if (id == 0) return obj == this;
+        if (obj instanceof OsmPrimitive) { // not null too
+            return ((OsmPrimitive)obj).id == id && obj.getClass() == getClass();
+        }
+        return false;
+    }
 
         /**