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

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

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

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)));
     }