Changeset 10336 in josm for trunk

Timestamp:

2016-06-07T23:56:02+02:00 (8 years ago)

Author:

Don-vip

Message:

fix equals method for BBox class

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/BBox.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java (added)

trunk/src/org/openstreetmap/josm/data/osm/BBox.java

@@ -4 +4 @@
 import java.awt.geom.Rectangle2D;
 import java.util.Arrays;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -266 +267 @@
     @Override
     public int hashCode() {
-        return (int) (ymin * xmin);
+        return Objects.hash(xmin, xmax, ymin, ymax);
     }
 
     @Override
     public boolean equals(Object o) {
-        if (o instanceof BBox) {
-            BBox b = (BBox) o;
-            return b.xmax == xmax && b.ymax == ymax
-                    && b.xmin == xmin && b.ymin == ymin;
-        } else
-            return false;
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        BBox b = (BBox) o;
+        return Double.compare(b.xmax, xmax) == 0 && Double.compare(b.ymax, ymax) == 0
+            && Double.compare(b.xmin, xmin) == 0 && Double.compare(b.ymin, ymin) == 0;
     }