Changeset 8456 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2015-06-03T04:36:57+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11508 - override hashCode() and equals() in other commands as well

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -382 +382 @@
         return Utils.filter(conflicts, RELATION_FILTER_PREDICATE);
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((conflicts == null) ? 0 : conflicts.hashCode());
+        result = prime * result + ((listeners == null) ? 0 : listeners.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;
+        ConflictCollection other = (ConflictCollection) obj;
+        if (conflicts == null) {
+            if (other.conflicts != null)
+                return false;
+        } else if (!conflicts.equals(other.conflicts))
+            return false;
+        if (listeners == null) {
+            if (other.listeners != null)
+                return false;
+        } else if (!listeners.equals(other.listeners))
+            return false;
+        return true;
+    }
 }