Changeset 7083 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.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/gui/mappaint/TextElement.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import static org.openstreetmap.josm.tools.Utils.equal;
-
 import java.awt.Color;
 import java.awt.Font;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -90 +89 @@
 
         /*
-         * Check whether the label composition strategy is given by
-         * a keyword
+         * Check whether the label composition strategy is given by a keyword
          */
         Keyword keyword = c.get(TEXT, null, Keyword.class, true);
-        if (equal(keyword, Keyword.AUTO))
+        if (Keyword.AUTO.equals(keyword))
             return AUTO_LABEL_COMPOSITION_STRATEGY;
 
@@ -212 +210 @@
             return false;
         final TextElement other = (TextElement) obj;
-        return  equal(labelCompositionStrategy, other.labelCompositionStrategy) &&
-        equal(font, other.font) &&
+        return Objects.equals(labelCompositionStrategy, other.labelCompositionStrategy) &&
+        Objects.equals(font, other.font) &&
         xOffset == other.xOffset &&
         yOffset == other.yOffset &&
-        equal(color, other.color) &&
-        equal(haloRadius, other.haloRadius) &&
-        equal(haloColor, other.haloColor);
+        Objects.equals(color, other.color) &&
+        Objects.equals(haloRadius, other.haloRadius) &&
+        Objects.equals(haloColor, other.haloColor);
     }
 }