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

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint.mapcss;
-
-import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.awt.Color;
@@ -594 +592 @@
      */
     public static Expression createFunctionExpression(String name, List<Expression> args) {
-        if (equal(name, "cond") && args.size() == 3)
+        if ("cond".equals(name) && args.size() == 3)
             return new CondOperator(args.get(0), args.get(1), args.get(2));
-        else if (equal(name, "and"))
+        else if ("and".equals(name))
             return new AndOperator(args);
-        else if (equal(name, "or"))
+        else if ("or".equals(name))
             return new OrOperator(args);
-        else if (equal(name, "length") && args.size() == 1)
+        else if ("length".equals(name) && args.size() == 1)
             return new LengthFunction(args.get(0));