Changeset 8456 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

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/command/conflict/ConflictAddCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

@@ -86 +86 @@
         return ImageProvider.get(conflict.getMy().getDisplayType());
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((conflict == null) ? 0 : conflict.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ConflictAddCommand other = (ConflictAddCommand) obj;
+        if (conflict == null) {
+            if (other.conflict != null)
+                return false;
+        } else if (!conflict.equals(other.conflict))
+            return false;
+        return true;
+    }
 }