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

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
-
-import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.awt.BasicStroke;
@@ -9 +7 @@
 import java.awt.Rectangle;
 import java.awt.Stroke;
+import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
@@ -28 +27 @@
     public final MapImage mapImage;
     public final Symbol symbol;
-    
+
     private Image enabledNodeIcon;
     private Image disabledNodeIcon;
@@ -63 +62 @@
             return  symbol == other.symbol &&
                     size == other.size &&
-                    equal(stroke, other.stroke) &&
-                    equal(strokeColor, other.strokeColor) &&
-                    equal(fillColor, other.fillColor);
+                    Objects.equals(stroke, other.stroke) &&
+                    Objects.equals(strokeColor, other.strokeColor) &&
+                    Objects.equals(fillColor, other.fillColor);
         }
 
@@ -170 +169 @@
         if (shapeKW == null)
             return null;
-        if (equal(shapeKW.val, "square")) {
+        if ("square".equals(shapeKW.val)) {
             shape = SymbolShape.SQUARE;
-        } else if (equal(shapeKW.val, "circle")) {
+        } else if ("circle".equals(shapeKW.val)) {
             shape = SymbolShape.CIRCLE;
-        } else if (equal(shapeKW.val, "triangle")) {
+        } else if ("triangle".equals(shapeKW.val)) {
             shape = SymbolShape.TRIANGLE;
-        } else if (equal(shapeKW.val, "pentagon")) {
+        } else if ("pentagon".equals(shapeKW.val)) {
             shape = SymbolShape.PENTAGON;
-        } else if (equal(shapeKW.val, "hexagon")) {
+        } else if ("hexagon".equals(shapeKW.val)) {
             shape = SymbolShape.HEXAGON;
-        } else if (equal(shapeKW.val, "heptagon")) {
+        } else if ("heptagon".equals(shapeKW.val)) {
             shape = SymbolShape.HEPTAGON;
-        } else if (equal(shapeKW.val, "octagon")) {
+        } else if ("octagon".equals(shapeKW.val)) {
             shape = SymbolShape.OCTAGON;
-        } else if (equal(shapeKW.val, "nonagon")) {
+        } else if ("nonagon".equals(shapeKW.val)) {
             shape = SymbolShape.NONAGON;
-        } else if (equal(shapeKW.val, "decagon")) {
+        } else if ("decagon".equals(shapeKW.val)) {
             shape = SymbolShape.DECAGON;
         } else
@@ -356 +355 @@
         final NodeElemStyle other = (NodeElemStyle) obj;
         // we should get the same image object due to caching
-        if (!equal(mapImage, other.mapImage))
+        if (!Objects.equals(mapImage, other.mapImage))
             return false;
-        if (!equal(symbol, other.symbol))
+        if (!Objects.equals(symbol, other.symbol))
             return false;
         return true;