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

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
@@ -176 +177 @@
     @Override
     public boolean equals(Object obj) {
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final DividedScale other = (DividedScale) obj;
-        return bd.equals(other.bd) && data.equals(other.data);
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        DividedScale<?> that = (DividedScale<?>) obj;
+        return Objects.equals(bd, that.bd) &&
+                Objects.equals(data, that.data);
     }
 
     @Override
     public int hashCode() {
-        int hash = 7;
-        hash = 23 * hash + bd.hashCode();
-        hash = 23 * hash + data.hashCode();
-        return hash;
+        return Objects.hash(bd, data);
     }