Changeset 14436 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

Timestamp:

2018-11-20T02:07:07+01:00 (5 years ago)

Author:

Don-vip

Message:

fix SonarQube issues

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (5 diffs)

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

@@ -9 +9 @@
 import java.util.Objects;
 import java.util.Set;
-import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.IntFunction;
 import java.util.function.Predicate;
@@ -181 +181 @@
         static final Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
 
-        private final BiFunction<String, String, Boolean> function;
+        private final BiPredicate<String, String> function;
 
         private final boolean negated;
@@ -189 +189 @@
          * @param func The function to apply during {@link #eval(String, String)}.
          */
-        Op(BiFunction<String, String, Boolean> func) {
+        Op(BiPredicate<String, String> func) {
             this.function = func;
             negated = false;
@@ -219 +219 @@
          */
         Op(Op negate) {
-            this.function = (a, b) -> !negate.function.apply(a, b);
+            this.function = (a, b) -> !negate.function.test(a, b);
             negated = true;
         }
@@ -233 +233 @@
                 return negated;
             else
-                return function.apply(testString, prototypeString);
+                return function.test(testString, prototypeString);
         }
     }