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

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

@@ -5 +5 @@
 
 import java.util.Collection;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -93 +94 @@
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ((pivot == null) ? 0 : pivot.hashCode());
-        long temp;
-        temp = Double.doubleToLongBits(rotationAngle);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(startAngle);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        return result;
+        return Objects.hash(super.hashCode(), pivot, startAngle, rotationAngle);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        RotateCommand other = (RotateCommand) obj;
-        if (pivot == null) {
-            if (other.pivot != null)
-                return false;
-        } else if (!pivot.equals(other.pivot))
-            return false;
-        if (Double.doubleToLongBits(rotationAngle) != Double.doubleToLongBits(other.rotationAngle))
-            return false;
-        if (Double.doubleToLongBits(startAngle) != Double.doubleToLongBits(other.startAngle))
-            return false;
-        return true;
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        if (!super.equals(obj)) return false;
+        RotateCommand that = (RotateCommand) obj;
+        return Double.compare(that.startAngle, startAngle) == 0 &&
+                Double.compare(that.rotationAngle, rotationAngle) == 0 &&
+                Objects.equals(pivot, that.pivot);
     }
 }