Changeset 14654 in josm for trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

Timestamp:

2019-01-06T20:22:48+01:00 (5 years ago)

Author:

simon04

Message:

Deprecate OsmPrimitive.getFilteredList/getFilteredSet in favour of Stream

Most use-cases involved filtering referring primitives. This can now be
accomplished using OsmPrimitive.referrers involving the Stream API and
thus avoids creation of intermediate collections.

File:

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

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -16 +16 @@
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -98 +99 @@
         ds.beginUpdate();
         try {
-            List<Way> ways = OsmPrimitive.getFilteredList(ds.getSelected(), Way.class);
-            ways.removeIf(OsmPrimitive::isIncomplete);
+            List<Way> ways = ds.getSelectedWays().stream()
+                    .filter(p -> !p.isIncomplete())
+                    .collect(Collectors.toList());
             if (ways.isEmpty()) {
                 alertSelectAtLeastOneWay();