Changeset 7083 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io.imagery;
-
-import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.io.IOException;
@@ -9 +7 @@
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Stack;
 
@@ -176 +175 @@
             }
             states.push(newState);
-            if (newState == State.UNKNOWN && equal(atts.getValue("mandatory"), "true")) {
+            if (newState == State.UNKNOWN && "true".equals(atts.getValue("mandatory"))) {
                 skipEntry = true;
             }
@@ -208 +207 @@
                     boolean found = false;
                     for (ImageryType type : ImageryType.values()) {
-                        if (equal(accumulator.toString(), type.getTypeString())) {
+                        if (Objects.equals(accumulator.toString(), type.getTypeString())) {
                             entry.setImageryType(type);
                             found = true;