Changeset 16445 in josm for trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.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/osm/RelationToChildReference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java

@@ -3 +3 @@
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
@@ -21 +21 @@
     public static Set<RelationToChildReference> getRelationToChildReferences(OsmPrimitive child) {
         Set<Relation> parents = child.referrers(Relation.class).collect(Collectors.toSet());
-        Set<RelationToChildReference> references = new HashSet<>();
-        for (Relation parent: parents) {
-            for (int i = 0; i < parent.getMembersCount(); i++) {
-                if (parent.getMember(i).refersTo(child)) {
-                    references.add(new RelationToChildReference(parent, i, parent.getMember(i)));
-                }
-            }
-        }
-        return references;
+        return parents.stream().flatMap(parent1 -> IntStream.range(0, parent1.getMembersCount())
+                .filter(i -> parent1.getMember(i).refersTo(child))
+                .mapToObj(i -> new RelationToChildReference(parent1, i, parent1.getMember(i))))
+                .collect(Collectors.toSet());
     }
 
@@ -40 +35 @@
      */
     public static Set<RelationToChildReference> getRelationToChildReferences(Collection<? extends OsmPrimitive> children) {
-        Set<RelationToChildReference> references = new HashSet<>();
-        for (OsmPrimitive child: children) {
-            references.addAll(getRelationToChildReferences(child));
-        }
-        return references;
+        return children.stream()
+                .flatMap(child -> getRelationToChildReferences(child).stream())
+                .collect(Collectors.toSet());
     }