Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java (modified) (2 diffs)

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

@@ -151 +151 @@
      */
     protected void updatePotentiallyDeletedPrimitives(Set<OsmPrimitive> potentiallyDeleted) {
-        final List<OsmPrimitive> toSelect = new ArrayList<>();
-        for (OsmPrimitive primitive : potentiallyDeleted) {
-            if (primitive != null) {
-                toSelect.add(primitive);
-            }
-        }
+        final List<OsmPrimitive> toSelect = potentiallyDeleted.stream().filter(Objects::nonNull).collect(Collectors.toList());
         EventQueue.invokeLater(() -> UpdateSelectionAction.updatePrimitives(toSelect));
     }
@@ -279 +274 @@
             // FIXME: this is a hack. We assume that the user canceled the whole download if at
             // least one task was canceled or if it failed
-            //
-            for (DownloadTask task : tasks) {
-                if (task instanceof AbstractDownloadTask) {
-                    AbstractDownloadTask<?> absTask = (AbstractDownloadTask<?>) task;
-                    if (absTask.isCanceled() || absTask.isFailed())
-                        return;
-                }
+            if (Utils.filteredCollection(tasks, AbstractDownloadTask.class).stream()
+                    .anyMatch(absTask -> absTask.isCanceled() || absTask.isFailed())) {
+                return;
             }
             final DataSet editDataSet = MainApplication.getLayerManager().getEditDataSet();