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

trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
+
+import java.util.Objects;
 
 /**
@@ -91 +93 @@
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-
         Range range = (Range) o;
-
-        if (Double.compare(range.lower, lower) != 0) return false;
-        if (Double.compare(range.upper, upper) != 0) return false;
-
-        return true;
+        return Double.compare(range.lower, lower) == 0 &&
+                Double.compare(range.upper, upper) == 0;
     }
 
     @Override
     public int hashCode() {
-        int result;
-        long temp;
-        temp = Double.doubleToLongBits(lower);
-        result = (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(upper);
-        result = 31 * result + (int) (temp ^ (temp >>> 32));
-        return result;
+        return Objects.hash(lower, upper);
     }
 }