Changeset 15936 in josm

Timestamp:

2020-02-26T01:52:21+01:00 (4 years ago)

Author:

simon04

Message:

PseudoClassCondition: use Stream API

File:

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

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

@@ -4 +4 @@
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Map;
@@ -828 +829 @@
 
         protected static Method getMethod(String id) {
-            String cleanId = id.replaceAll("-|_", "");
-            for (Method method : PseudoClasses.class.getDeclaredMethods()) {
-                // for backwards compatibility, consider :sameTags == :same-tags == :same_tags (#11150)
-                final String methodName = method.getName().replaceAll("-|_", "");
-                if (methodName.equalsIgnoreCase(cleanId)) {
-                    return method;
-                }
-            }
-            return null;
+            String cleanId = clean(id);
+            return Arrays.stream(PseudoClasses.class.getDeclaredMethods())
+                    .filter(method -> clean(method.getName()).equalsIgnoreCase(cleanId))
+                    .findFirst().orElse(null);
+        }
+
+        private static String clean(String id) {
+            // for backwards compatibility, consider :sameTags == :same-tags == :same_tags (#11150)
+            return id.replaceAll("[-_]", "");
         }