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

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
+
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
-import org.openstreetmap.josm.tools.Utils;
 
 public class LineTextElemStyle extends ElemStyle {
@@ -21 +22 @@
 
         Keyword textPos = c.get(TEXT_POSITION, null, Keyword.class);
-        if (textPos != null && !Utils.equal(textPos.val, "line"))
+        if (textPos != null && !"line".equals(textPos.val))
             return null;
 
@@ -43 +44 @@
             return false;
         final LineTextElemStyle other = (LineTextElemStyle) obj;
-        return Utils.equal(text, other.text);
+        return Objects.equals(text, other.text);
     }
 
@@ -55 +56 @@
         return "LineTextElemStyle{" + super.toString() + "text=" + text + "}";
     }
-
 }