Changeset 16445 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

Timestamp:

2020-05-17T17:02:28+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -13 +13 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -240 +241 @@
             Set<String> s1 = getBoundaryTags(w1);
             Set<String> s2 = getBoundaryTags(w2);
-            for (String type : s1) {
-                if (s2.contains(type))
-                    return false;
-            }
-            return true;
+            return s1.stream().noneMatch(s2::contains);
         }
 
@@ -421 +418 @@
      */
     public static List<List<WaySegment>> getSegments(Map<Point2D, List<WaySegment>> cellSegments, EastNorth n1, EastNorth n2) {
-        List<List<WaySegment>> cells = new ArrayList<>();
-        for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.getGridDetail())) {
-            cells.add(cellSegments.computeIfAbsent(cell, k -> new ArrayList<>()));
-        }
-        return cells;
+        return ValUtil.getSegmentCells(n1, n2, OsmValidator.getGridDetail()).stream()
+                .map(cell -> cellSegments.computeIfAbsent(cell, k -> new ArrayList<>()))
+                .collect(Collectors.toList());
     }