Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

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

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• MultiMap.java (modified) (2 diffs)
• Pair.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/MultiMap.java

@@ -9 +9 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 
@@ -214 +215 @@
     @Override
     public int hashCode() {
-        return map.hashCode();
+        return Objects.hash(map);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (!(obj instanceof MultiMap))
-            return false;
-        return map.equals(((MultiMap<?, ?>) obj).map);
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        MultiMap<?, ?> multiMap = (MultiMap<?, ?>) obj;
+        return Objects.equals(map, multiMap.map);
     }
 
     @Override
+
     public String toString() {
         List<String> entries = new ArrayList<>(map.size());

trunk/src/org/openstreetmap/josm/tools/Pair.java

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
@@ -34 +35 @@
     @Override
     public int hashCode() {
-        return a.hashCode() + b.hashCode();
+        return Objects.hash(a, b);
     }
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof Pair<?, ?>) {
-            Pair<?, ?> o = (Pair<?, ?>) other;
-            return a.equals(o.a) && b.equals(o.b);
-        } else
-            return false;
+        if (this == other) return true;
+        if (other == null || getClass() != other.getClass()) return false;
+        Pair<?, ?> pair = (Pair<?, ?>) other;
+        return Objects.equals(a, pair.a) &&
+                Objects.equals(b, pair.b);
     }