Changeset 7083 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

Timestamp:

2014-05-09T06:03:50+02:00 (10 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/validation/tests/CrossingWays.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -11 +11 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
@@ -25 +26 @@
 import org.openstreetmap.josm.data.validation.util.ValUtil;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -71 +71 @@
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            if (!Utils.equal(getLayer(w1), getLayer(w2))) {
-                return true;
-            }
-            if (w1.hasKey(HIGHWAY) && w2.hasKey(HIGHWAY) && !Utils.equal(w1.get("level"), w2.get("level"))) {
+            if (!Objects.equals(getLayer(w1), getLayer(w2))) {
+                return true;
+            }
+            if (w1.hasKey(HIGHWAY) && w2.hasKey(HIGHWAY) && !Objects.equals(w1.get("level"), w2.get("level"))) {
                 return true;
             }
@@ -129 +129 @@
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            return !Utils.equal(w1.get("boundary"), w2.get("boundary"));
+            return !Objects.equals(w1.get("boundary"), w2.get("boundary"));
         }