Changeset 2481 in josm for trunk/src

Timestamp:

2009-11-19T15:18:10+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3967: Relation editor generates conflicts

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (4 diffs)

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

@@ -41 +41 @@
     }
 
-    private static class KeysEntry implements Entry<String, String> {
+    private static class KeysEntry implements Entry<String, String>{
 
         private final String key;
@@ -63 +63 @@
         }
 
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((key == null) ? 0 : key.hashCode());
+            result = prime * result + ((value == null) ? 0 : value.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            KeysEntry other = (KeysEntry) obj;
+            if (key == null) {
+                if (other.key != null)
+                    return false;
+            } else if (!key.equals(other.key))
+                return false;
+            if (value == null) {
+                if (other.value != null)
+                    return false;
+            } else if (!value.equals(other.value))
+                return false;
+            return true;
+        }
     }
 
@@ -142 +172 @@
     private long id = 0;
 
+    /** the parent dataset */
     private DataSet dataSet;
 
@@ -908 +939 @@
         if (incomplete && ! other.incomplete || !incomplete  && other.incomplete)
             return false;
-        return (keys == null ? other.keys==null : keys.equals(other.keys));
+        return keySet().equals(other.keySet());
     }