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

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

@@ -9 +9 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -16 +18 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.xml.sax.SAXException;
 
@@ -134 +135 @@
      * @param changesets the collection of changesets. Assumes an empty collection if null.
      * @return the download task
-     * @throws IllegalArgumentException if parent is null
+     * @throws NullPointerException if parent is null
      */
     public static ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection<Changeset> changesets) {
-        CheckParameterUtil.ensureParameterNotNull(parent, "parent");
-
-        Set<Integer> ids = new HashSet<>();
-        for (Changeset cs: changesets != null ? changesets : Collections.<Changeset>emptyList()) {
-            if (cs == null || cs.isNew()) {
-                continue;
-            }
-            ids.add(cs.getId());
-        }
-        return new ChangesetHeaderDownloadTask(parent, ids);
+        return new ChangesetHeaderDownloadTask(Objects.requireNonNull(parent, "parent"),
+                changesets == null ? Collections.<Integer>emptySet() :
+                    changesets.stream().filter(cs -> cs != null && !cs.isNew()).map(Changeset::getId).collect(Collectors.toSet()));
     }
 }