Changeset 9375 in josm for trunk/src/org

Timestamp:

2016-01-10T00:40:31+01:00 (9 years ago)

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash (fixup r9371)

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 @@
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(x, y);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        Coordinate that = (Coordinate) obj;
+        return Double.compare(that.x, x) == 0 &&
+                Double.compare(that.y, y) == 0;
+    }
 }

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

@@ -429 +429 @@
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode());
+        return Objects.hash(x, y);
     }
 
@@ -436 +436 @@
         if (this == obj) return true;
         if (obj == null || getClass() != obj.getClass()) return false;
-        return super.equals(obj);
+        LatLon that = (LatLon) obj;
+        return Double.compare(that.x, x) == 0 &&
+                Double.compare(that.y, y) == 0;
     }