Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• ConditionFactory.java (modified) (2 diffs)
• ExpressionFactory.java (modified) (2 diffs)
• Functions.java (modified) (4 diffs)
• Selector.java (modified) (1 diff)

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

@@ -6 +6 @@
 import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -408 +407 @@
         @Override
         protected boolean matches(Environment env) {
-            for (Map.Entry<String, String> kv: env.osm.getKeys().entrySet()) {
-                if (keyPattern.matcher(kv.getKey()).find() && pattern.matcher(kv.getValue()).find()) {
-                    return true;
-                }
-            }
-            return false;
+            return env.osm.getKeys().entrySet().stream()
+                    .anyMatch(kv -> keyPattern.matcher(kv.getKey()).find() && pattern.matcher(kv.getValue()).find());
         }
     }

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

@@ -15 +15 @@
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.gui.mappaint.Cascade;
@@ -444 +445 @@
         @Override
         public String toString() {
-            StringBuilder b = new StringBuilder("ArrayFunction~");
-            b.append(m.getName()).append('(');
-            for (int i = 0; i < args.size(); ++i) {
-                if (i > 0) b.append(',');
-                b.append(arrayComponentType).append(' ').append(args.get(i));
-            }
-            b.append(')');
-            return b.toString();
+            return args.stream()
+                    .map(arg -> arrayComponentType + " " + arg)
+                    .collect(Collectors.joining(",", "ArrayFunction~" + m.getName() + '(', ")"));
         }
     }

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
@@ -455 +454 @@
             if (env.osm != null) {
                 // we don't have a matched parent, so just search all referrers
-                for (IPrimitive parent : env.osm.getReferrers()) {
-                    String value = parent.get(key);
-                    if (value != null) {
-                        return value;
-                    }
-                }
+                return env.osm.getReferrers().stream()
+                        .map(parent -> parent.get(key))
+                        .filter(Objects::nonNull)
+                        .findFirst().orElse(null);
             }
             return null;
@@ -617 +614 @@
             List<String> roleList = Arrays.asList(roles);
             Relation rel = (Relation) env.osm;
-            for (RelationMember member : rel.getMembers()) {
-                if (roleList.contains(member.getRole())) rValue++;
-            }
+            rValue = (int) rel.getMembers().stream()
+                    .filter(member -> roleList.contains(member.getRole()))
+                    .count();
         }
         return rValue;
@@ -1162 +1159 @@
      */
     public static boolean inside(Environment env, String codes) { // NO_UCD (unused code)
-        for (String code : codes.toUpperCase(Locale.ENGLISH).split(",")) {
-            if (Territories.isIso3166Code(code.trim(), center(env))) {
-                return true;
-            }
-        }
-        return false;
+        return Arrays.stream(codes.toUpperCase(Locale.ENGLISH).split(","))
+                .anyMatch(code -> Territories.isIso3166Code(code.trim(), center(env)));
     }
 

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

@@ -235 +235 @@
 
             private boolean firstAndLastOnly() {
-                for (Condition c : link.conds) {
-                    if (!(c instanceof IndexCondition) || !((IndexCondition) c).isFirstOrLast) {
-                        return false;
-                    }
-                }
-                return true;
+                return link.conds.stream().allMatch(c -> c instanceof IndexCondition && ((IndexCondition) c).isFirstOrLast);
             }