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

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

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

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

@@ -14 +14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -227 +228 @@
                 }
             }
-            for (int i = lowestIndex; i < wNodes.size()-1; i++) {
-                wNodesToUse.add(wNodes.get(i));
-            }
+            IntStream.range(lowestIndex, wNodes.size() - 1)
+                    .mapToObj(wNodes::get)
+                    .forEach(wNodesToUse::add);
             for (int i = 0; i < lowestIndex; i++) {
                 wNodesToUse.add(wNodes.get(i));
@@ -238 +239 @@
         }
         // Build the list of lat/lon
-        List<LatLon> wLat = new ArrayList<>(wNodesToUse.size());
-        for (Node node : wNodesToUse) {
-            wLat.add(node.getCoor());
-        }
-        return wLat;
+
+        return wNodesToUse.stream()
+                .map(Node::getCoor)
+                .collect(Collectors.toList());
     }
 
@@ -250 +250 @@
     @Override
     public Command fixError(TestError testError) {
-        Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
-        Set<Way> wayz = new HashSet<>();
-
-        for (OsmPrimitive osm : sel) {
-            if (osm instanceof Way && !osm.isDeleted()) {
-                wayz.add((Way) osm);
-            }
-        }
+        Set<Way> wayz = testError.primitives(Way.class)
+                .filter(w -> !w.isDeleted())
+                .collect(Collectors.toSet());
 
         if (wayz.size() < 2)
@@ -315 +310 @@
 
         // We fix it only if there is no more than one way that is relation member.
-        Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
-        Set<Way> wayz = new HashSet<>();
-
-        for (OsmPrimitive osm : sel) {
-            if (osm instanceof Way) {
-                wayz.add((Way) osm);
-            }
-        }
-
+        Set<Way> wayz = testError.primitives(Way.class).collect(Collectors.toSet());
         if (wayz.size() < 2)
             return false;
 
-        int waysWithRelations = 0;
-        for (Way w : wayz) {
-            List<Relation> rel = w.referrers(Relation.class).collect(Collectors.toList());
-            if (!rel.isEmpty()) {
-                ++waysWithRelations;
-            }
-        }
+        long waysWithRelations = wayz.stream()
+                .filter(w -> w.referrers(Relation.class).anyMatch(x -> true))
+                .count();
         return waysWithRelations <= 1;
     }