Ticket #17584: 17584.patch

src/main/java/org/openstreetmap/josm/plugins/pt_assistant/actions/CreatePlatformNodeAction.java

@@ -47 +47 @@
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopUtils;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Sorts the stop positions in a PT route according to the assigned ways
@@ -263 +264 @@
         return refs;
     }
 
-    private List<String> addRefs(String value) {
+    private static List<String> addRefs(String value) {
         List<String> refs = new ArrayList<>();
         if (new RegexValidator("\\w+([,;].+)*").isValid(value)) {
             for (String ref : value.split("[,;]")) {
@@ -273 +274 @@
         return refs;
     }
 
-    private String getRefs(Set<String> refs) {
+    private static String getRefs(Set<String> refs) {
         StringBuilder sb = new StringBuilder();
         if (refs.isEmpty())
             return sb.toString();
@@ -285 +286 @@
         return sb.toString().substring(0, sb.length() - 1);
     }
 
-    private List<Relation> removeWayFromRelationsCommand(Way way) {
+    private static List<Relation> removeWayFromRelationsCommand(Way way) {
         List<Command> commands = new ArrayList<>();
-        List<Relation> referrers = OsmPrimitive.getFilteredList(way.getReferrers(), Relation.class);
+        List<Relation> referrers = new ArrayList<>(Utils.filteredCollection(way.getReferrers(), Relation.class));
         List<Relation> parentStopAreaRelation = new ArrayList<>();
         referrers.forEach(r -> {
             if (StopUtils.isStopArea(r)) {
@@ -303 +304 @@
         return parentStopAreaRelation;
     }
 
-    private Map<Relation, List<Integer>> getSavedPositions(Way way) {
+    private static Map<Relation, List<Integer>> getSavedPositions(Way way) {
 
         Map<Relation, List<Integer>> savedPositions = new HashMap<>();
-        List<Relation> referrers = OsmPrimitive.getFilteredList(way.getReferrers(), Relation.class);
+        List<Relation> referrers = new ArrayList<>(Utils.filteredCollection(way.getReferrers(), Relation.class));
 
         for (Relation curr : referrers) {
             for (int j = 0; j < curr.getMembersCount(); j++) {
@@ -321 +322 @@
         return savedPositions;
     }
 
-    private List<Command> updateRelation(Map<Relation, List<Integer>> savedPositions, Node platformNode,
+    private static List<Command> updateRelation(Map<Relation, List<Integer>> savedPositions, Node platformNode,
             Way platformWay, List<Relation> parentStopAreaRelation) {
         Map<Relation, Relation> changingRelation = new HashMap<>();
         Map<Relation, Integer> memberOffset = new HashMap<>();
-        List<Relation> referrers = OsmPrimitive.getFilteredList(platformNode.getReferrers(), Relation.class);
+        List<Relation> referrers = new ArrayList<>(Utils.filteredCollection(platformNode.getReferrers(), Relation.class));
 
         savedPositions.forEach((r, positions) -> positions.forEach(i -> {
             if (!changingRelation.containsKey(r))

src/main/java/org/openstreetmap/josm/plugins/pt_assistant/actions/ExtractPlatformNodeAction.java

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopUtils;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Extracts node from its ways and adds the public transport tags to it.
@@ -62 +63 @@
     public void actionPerformed(ActionEvent e) {
         DataSet ds = getLayerManager().getEditDataSet();
         Collection<OsmPrimitive> selection = ds.getSelected();
-        List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
+        List<Node> selectedNodes = new ArrayList<>(Utils.filteredCollection(selection, Node.class));
         if (selectedNodes.size() != 1) {
             new Notification(tr("This action requires single node to be selected."))
                 .setIcon(JOptionPane.WARNING_MESSAGE)

src/main/java/org/openstreetmap/josm/plugins/pt_assistant/actions/MendRelationAction.java

@@ -675 +675 @@
         List<Relation> r1;
         List<Relation> r2;
         try {
-            r1 = OsmPrimitive.getFilteredList(current.getReferrers(), Relation.class);
-            r2 = OsmPrimitive.getFilteredList(next.getReferrers(), Relation.class);
+            r1 = new ArrayList<>(Utils.filteredCollection(current.getReferrers(), Relation.class));
+            r2 = new ArrayList<>(Utils.filteredCollection(next.getReferrers(), Relation.class));
         } catch (Exception e) {
             return list;
         }

src/main/java/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java

@@ -605 +605 @@
         return savedPositions;
     }
 
-    private List<Relation> getPTRouteParents(Way roundabout) {
-        List<Relation> referrers = OsmPrimitive.getFilteredList(roundabout.getReferrers(), Relation.class);
+    private static List<Relation> getPTRouteParents(Way roundabout) {
+        List<Relation> referrers = new ArrayList<>(Utils.filteredCollection(roundabout.getReferrers(), Relation.class));
         referrers.removeIf(r -> (!RouteUtils.isPTRoute(r) && !RouteUtils.isBicycleRoute(r)));
         return referrers;
     }
 
-    private List<Relation> getRouteParents(Way roundabout) {
-        List<Relation> referrers = OsmPrimitive.getFilteredList(roundabout.getReferrers(), Relation.class);
+    private static List<Relation> getRouteParents(Way roundabout) {
+        List<Relation> referrers = new ArrayList<>(Utils.filteredCollection(roundabout.getReferrers(), Relation.class));
         referrers.removeIf(r -> !RouteUtils.isRoute(r));
         return referrers;
     }

src/main/java/org/openstreetmap/josm/plugins/pt_assistant/validation/StopChecker.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopUtils;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Performs tests of the stop area relations
@@ -89 +90 @@
             if (StopUtils.isStopPosition(member)) {
 
                 // Create a list of assigned route relations
-                for (Relation referrer : OsmPrimitive.getFilteredList(member.getReferrers(), Relation.class)) {
+                for (Relation referrer : Utils.filteredCollection(member.getReferrers(), Relation.class)) {
                     if (referrer.get("type") == "route") {
                         stopPositionRelationIds.put(referrer.getId(), referrer.getId());
                     }
@@ -98 +99 @@
             } else if (StopUtils.verifyStopAreaPlatform(member)) {
 
                 // Create a list of assigned route relations
-                for (Relation referrer : OsmPrimitive.getFilteredList(member.getReferrers(), Relation.class)) {
+                for (Relation referrer : Utils.filteredCollection(member.getReferrers(), Relation.class)) {
                     if (referrer.get("type") == "route") {
                         platformRelationIds.put(referrer.getId(), referrer.getId());
                     }

src/main/java/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java

@@ -431 +431 @@
 
         return new ChangeCommand(originalRelation, modifiedRelation);
     }
-
 }