Changeset 15152 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

Timestamp:

2019-06-02T15:25:38+02:00 (5 years ago)

Author:

Don-vip

Message:

more uses of Java 8 stream API

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -148 +148 @@
         Collection<Way> ways = ds.getWays();
 
-        DataSetMerger merger;
         if (!ways.isEmpty()) {
-            Set<Node> nodes = new HashSet<>();
-            for (Way w: ways) {
-                // Ensure each node is only listed once
-                nodes.addAll(w.getNodes());
-            }
+            // Ensure each node is only listed once
+            Set<Node> nodes = ways.stream().flatMap(w -> w.getNodes().stream()).collect(Collectors.toSet());
             // Don't retrieve any nodes we've already grabbed
             nodes.removeAll(targetLayer.data.getNodes());
@@ -164 +160 @@
                     reader = null;
                 }
-                merger = new DataSetMerger(ds, wayNodes);
-                merger.merge();
+                new DataSetMerger(ds, wayNodes).merge();
             }
         }
-        merger = new DataSetMerger(parents, ds);
-        merger.merge();
+        new DataSetMerger(parents, ds).merge();
     }