Changeset 15152 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.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/DownloadTaskList.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -126 +127 @@
      */
     protected Set<OsmPrimitive> getCompletePrimitives(DataSet ds) {
-        Set<OsmPrimitive> ret = new HashSet<>();
-        for (OsmPrimitive primitive : ds.allPrimitives()) {
-            if (!primitive.isIncomplete() && !primitive.isNew()) {
-                ret.add(primitive);
-            }
-        }
-        return ret;
+        return ds.allPrimitives().stream().filter(p -> !p.isIncomplete() && !p.isNew()).collect(Collectors.toSet());
     }
 
@@ -210 +205 @@
      */
     public Set<OsmPrimitive> getDownloadedPrimitives() {
-        Set<OsmPrimitive> ret = new HashSet<>();
-        for (DownloadTask task : tasks) {
-            if (task instanceof DownloadOsmTask) {
-                DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
-                if (ds != null) {
-                    ret.addAll(ds.allPrimitives());
-                }
-            }
-        }
-        return ret;
+        return tasks.stream()
+                .filter(t -> t instanceof DownloadOsmTask)
+                .map(t -> ((DownloadOsmTask) t).getDownloadedData())
+                .filter(Objects::nonNull)
+                .flatMap(ds -> ds.allPrimitives().stream())
+                .collect(Collectors.toSet());
     }