Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/data/coor

Timestamp:

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

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash

Location:

trunk/src/org/openstreetmap/josm/data/coor

Files:

• Coordinate.java (modified) (2 diffs)
• LatLon.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java

@@ -3 +3 @@
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.osm.BBox;
@@ -113 +114 @@
     }
 
-    protected final int computeHashCode(int init) {
-        final int prime = 31;
-        int result = init;
-        long temp;
-        temp = java.lang.Double.doubleToLongBits(x);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = java.lang.Double.doubleToLongBits(y);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        return result;
-    }
-
-    @Override
-    public int hashCode() {
-        return computeHashCode(1);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        Coordinate other = (Coordinate) obj;
-        if (java.lang.Double.doubleToLongBits(x) != java.lang.Double.doubleToLongBits(other.x))
-            return false;
-        if (java.lang.Double.doubleToLongBits(y) != java.lang.Double.doubleToLongBits(other.y))
-            return false;
-        return true;
-    }
 }

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -16 +16 @@
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
@@ -428 +429 @@
     @Override
     public int hashCode() {
-        return computeHashCode(super.hashCode());
+        return Objects.hash(super.hashCode());
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        Coordinate other = (Coordinate) obj;
-        if (java.lang.Double.doubleToLongBits(x) != java.lang.Double.doubleToLongBits(other.x))
-            return false;
-        if (java.lang.Double.doubleToLongBits(y) != java.lang.Double.doubleToLongBits(other.y))
-            return false;
-        return true;
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        return super.equals(obj);
     }