Ticket #17580: 17580.patch

src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java

@@ -46 +46 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Terraces a quadrilateral, closed way into a series of quadrilateral,
@@ -118 +119 @@
 
                 outline = (Way) prim;
             } else if (sel.size() > 1) {
-                List<Way> ways = OsmPrimitive.getFilteredList(sel, Way.class);
+                List<Way> ways = new ArrayList<>(Utils.filteredCollection(sel, Way.class));
                 Iterator<Way> wit = ways.iterator();
                 while (wit.hasNext()) {
                     Way way = wit.next();
@@ -142 +143 @@
                 if (outline == null)
                     throw new InvalidUserInputException("no outline way found");
 
-                List<Node> nodes = OsmPrimitive.getFilteredList(sel, Node.class);
+                List<Node> nodes = new ArrayList<>(Utils.filteredCollection(sel, Node.class));
                 Iterator<Node> nit = nodes.iterator();
                 // Actually this should test if the selected address nodes lie
                 // within the selected outline. Any ideas how to do this?