Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java

@@ -11 +11 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.swing.TransferHandler.TransferSupport;
@@ -126 +128 @@
 
     private static void updateNodes(Map<Long, Long> newNodeIds, PrimitiveData data) {
-        List<Long> newNodes = new ArrayList<>();
-        for (Long oldNodeId : ((WayData) data).getNodeIds()) {
-            Long newNodeId = newNodeIds.get(oldNodeId);
-            if (newNodeId != null) {
-                newNodes.add(newNodeId);
-            }
-        }
+        List<Long> newNodes = ((WayData) data).getNodeIds().stream()
+                .map(newNodeIds::get)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
         ((WayData) data).setNodeIds(newNodes);
     }