Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.util.Collection;
-import java.util.LinkedList;
+import java.util.Objects;
 
 import javax.swing.JOptionPane;
@@ -24 +24 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.StreamUtils;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -41 +42 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Collection<Command> cmds = new LinkedList<>();
-        for (Relation orig : Utils.filteredCollection(relations, Relation.class)) {
-            Command c = GenericRelationEditor.addPrimitivesToRelation(orig, MainApplication.getLayerManager().getActiveDataSet().getSelected());
-            if (c != null) {
-                cmds.add(c);
-            }
-        }
+        Collection<Command> cmds = Utils.filteredCollection(relations, Relation.class).stream()
+                .map(orig -> GenericRelationEditor.addPrimitivesToRelation(orig, MainApplication.getLayerManager().getActiveDataSet().getSelected()))
+                .filter(Objects::nonNull)
+                .collect(StreamUtils.toUnmodifiableList());
         if (!cmds.isEmpty()) {
             UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Add selection to relation"), cmds));