Changeset 7083 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2014-05-09T06:03:50+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - replace Utils.equal by Objects.equals, new in Java 7

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -29 +29 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.SortedMap;
@@ -239 +240 @@
                 String aStr = itA.next();
                 String bStr = itB.next();
-                if (!Utils.equal(aStr,bStr)) return false;
+                if (!Objects.equals(aStr,bStr)) return false;
             }
             return true;
@@ -375 +376 @@
             if (a.size() != b.size()) return false;
             for (Entry<String, String> e : a.entrySet()) {
-                if (!Utils.equal(e.getValue(), b.get(e.getKey()))) return false;
+                if (!Objects.equals(e.getValue(), b.get(e.getKey()))) return false;
             }
             return true;
@@ -1210 +1211 @@
                 Object defaultFieldValue = f.get(structPrototype);
                 if (fieldValue != null) {
-                    if (f.getAnnotation(writeExplicitly.class) != null || !Utils.equal(fieldValue, defaultFieldValue)) {
+                    if (f.getAnnotation(writeExplicitly.class) != null || !Objects.equals(fieldValue, defaultFieldValue)) {
                         hash.put(f.getName().replace("_", "-"), fieldValue.toString());
                     }