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

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Predicates.java (modified) (2 diffs)
• Utils.java (modified) (1 diff)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.tools;
 
+import java.util.Collection;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-
-import java.util.Collection;
-import java.util.regex.Pattern;
 
 /**
@@ -33 +34 @@
             @Override
             public boolean evaluate(T obj) {
-                return Utils.equal(obj, ref);
+                return Objects.equals(obj, ref);
             }
         };

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

@@ -174 +174 @@
     }
 
-    /**
-     * for convenience: test whether 2 objects are either both null or a.equals(b)
-     */
-    public static <T> boolean equal(T a, T b) {
-        if (a == b)
-            return true;
-        return (a != null && a.equals(b));
-    }
-
     public static void ensure(boolean condition, String message, Object...data) {
         if (!condition)