Changeset 5292 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2012-06-21T01:54:08+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7385 - Relation History not shown correctly when comparing changesets

File:

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

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

@@ -59 +59 @@
         return memberId <= 0;
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (int) (memberId ^ (memberId >>> 32));
+        result = prime * result
+                + ((memberType == null) ? 0 : memberType.hashCode());
+        result = prime * result + ((role == null) ? 0 : role.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;
+        RelationMemberData other = (RelationMemberData) obj;
+        if (memberId != other.memberId)
+            return false;
+        if (memberType != other.memberType)
+            return false;
+        if (role == null) {
+            if (other.role != null)
+                return false;
+        } else if (!role.equals(other.role))
+            return false;
+        return true;
+    }
 }