Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

Timestamp:

2016-01-09T23:20:37+01:00 (8 years ago)

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash

File:

• trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -11 +11 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
@@ -279 +280 @@
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ((ds == null) ? 0 : ds.hashCode());
-        result = prime * result + ((makeIncompleteData == null) ? 0 : makeIncompleteData.hashCode());
-        result = prime * result + ((makeIncompleteDataByPrimId == null) ? 0 : makeIncompleteDataByPrimId.hashCode());
-        result = prime * result + ((purgedConflicts == null) ? 0 : purgedConflicts.hashCode());
-        result = prime * result + ((toPurge == null) ? 0 : toPurge.hashCode());
-        return result;
+        return Objects.hash(super.hashCode(), toPurge, makeIncompleteData, makeIncompleteDataByPrimId, purgedConflicts, ds);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        PurgeCommand other = (PurgeCommand) obj;
-        if (ds == null) {
-            if (other.ds != null)
-                return false;
-        } else if (!ds.equals(other.ds))
-            return false;
-        if (makeIncompleteData == null) {
-            if (other.makeIncompleteData != null)
-                return false;
-        } else if (!makeIncompleteData.equals(other.makeIncompleteData))
-            return false;
-        if (makeIncompleteDataByPrimId == null) {
-            if (other.makeIncompleteDataByPrimId != null)
-                return false;
-        } else if (!makeIncompleteDataByPrimId.equals(other.makeIncompleteDataByPrimId))
-            return false;
-        if (purgedConflicts == null) {
-            if (other.purgedConflicts != null)
-                return false;
-        } else if (!purgedConflicts.equals(other.purgedConflicts))
-            return false;
-        if (toPurge == null) {
-            if (other.toPurge != null)
-                return false;
-        } else if (!toPurge.equals(other.toPurge))
-            return false;
-        return true;
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        if (!super.equals(obj)) return false;
+        PurgeCommand that = (PurgeCommand) obj;
+        return Objects.equals(toPurge, that.toPurge) &&
+                Objects.equals(makeIncompleteData, that.makeIncompleteData) &&
+                Objects.equals(makeIncompleteDataByPrimId, that.makeIncompleteDataByPrimId) &&
+                Objects.equals(purgedConflicts, that.purgedConflicts) &&
+                Objects.equals(ds, that.ds);
     }
 }