Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.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/AddPrimitivesCommand.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 
 import javax.swing.Icon;
@@ -176 +177 @@
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ((createdPrimitives == null) ? 0 : createdPrimitives.hashCode());
-        result = prime * result + ((createdPrimitivesToSelect == null) ? 0 : createdPrimitivesToSelect.hashCode());
-        result = prime * result + ((data == null) ? 0 : data.hashCode());
-        result = prime * result + ((toSelect == null) ? 0 : toSelect.hashCode());
-        return result;
+        return Objects.hash(super.hashCode(), data, toSelect, createdPrimitives, createdPrimitivesToSelect);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        AddPrimitivesCommand other = (AddPrimitivesCommand) obj;
-        if (createdPrimitives == null) {
-            if (other.createdPrimitives != null)
-                return false;
-        } else if (!createdPrimitives.equals(other.createdPrimitives))
-            return false;
-        if (createdPrimitivesToSelect == null) {
-            if (other.createdPrimitivesToSelect != null)
-                return false;
-        } else if (!createdPrimitivesToSelect.equals(other.createdPrimitivesToSelect))
-            return false;
-        if (data == null) {
-            if (other.data != null)
-                return false;
-        } else if (!data.equals(other.data))
-            return false;
-        if (toSelect == null) {
-            if (other.toSelect != null)
-                return false;
-        } else if (!toSelect.equals(other.toSelect))
-            return false;
-        return true;
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        if (!super.equals(obj)) return false;
+        AddPrimitivesCommand that = (AddPrimitivesCommand) obj;
+        return Objects.equals(data, that.data) &&
+                Objects.equals(toSelect, that.toSelect) &&
+                Objects.equals(createdPrimitives, that.createdPrimitives) &&
+                Objects.equals(createdPrimitivesToSelect, that.createdPrimitivesToSelect);
     }
 }