Changeset 34976 in osm for applications/editors/josm/plugins/turnrestrictions

Timestamp:

2019-04-13T15:12:48+02:00 (6 years ago)

Author:

donvip

Message:

see #josm17598 #josm17599 #josm17600 #josm17601 #josm17602 - remove deprecated api (patches by taylor.smock)

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• TurnRestrictionBuilder.java (modified) (5 diffs)
• editor/TurnRestrictionLegEditor.java (modified) (4 diffs)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java

@@ -17 +17 @@
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionType;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -313 +314 @@
 
         // we need exactly one node and one way in the selection ...
-        List<Node> nodes = OsmPrimitive.getFilteredList(primitives, Node.class);
-        List<Way> ways = OsmPrimitive.getFilteredList(primitives, Way.class);
+        List<Node> nodes = new ArrayList<>(Utils.filteredCollection(primitives, Node.class));
+        List<Way> ways = new ArrayList<>(Utils.filteredCollection(primitives, Way.class));
         if (nodes.size() != 1 || ways.size() != 1) return null;
 
@@ -374 +375 @@
             // See initNoUTurnRestriction() for the case where we have a selected way
             // and a selected node
-            List<Way> selWays = OsmPrimitive.getFilteredList(primitives, Way.class);
+            List<Way> selWays = new ArrayList<>(Utils.filteredCollection(primitives, Way.class));
             if (selWays.size() != 2) return null;
             w1 = selWays.get(0);
@@ -382 +383 @@
             // if we have exactly three selected primitives, we need two ways and a
             // node, which should be an acceptable via node
-            List<Way> selWays = OsmPrimitive.getFilteredList(primitives, Way.class);
-            List<Node> selNodes = OsmPrimitive.getFilteredList(primitives, Node.class);
+            List<Way> selWays = new ArrayList<>(Utils.filteredCollection(primitives, Way.class));
+            List<Node> selNodes = new ArrayList<>(Utils.filteredCollection(primitives, Node.class));
             if (selWays.size() != 2) return null;
             if (selNodes.size() != 1) return null;
@@ -449 +450 @@
         case 1:
             tr = initEmptyTurnRestriction();
-            if (OsmPrimitive.getFilteredList(primitives, Way.class).size() == 1) {
+            if (Utils.filteredCollection(primitives, Way.class).size() == 1) {
                 // we have exactly one selected way? -> init the "from" leg
                 // of the turn restriction with it

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java

@@ -20 +20 @@
 import java.awt.event.MouseMotionAdapter;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -55 +56 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -293 +295 @@
          @Override
         public void actionPerformed(ActionEvent e) {
-             List<Way> selWays = OsmPrimitive.getFilteredList(model.getJosmSelectionListModel().getSelected(), Way.class);
+             List<Way> selWays = new ArrayList<>(Utils.filteredCollection(model.getJosmSelectionListModel().getSelected(), Way.class));
              if (selWays.size() != 1) return;
              Way w = selWays.get(0);
@@ -300 +302 @@
 
          public void updateEnabledState() {
-            setEnabled(OsmPrimitive.getFilteredList(model.getJosmSelectionListModel().getSelected(), Way.class).size() == 1);
+            setEnabled(Utils.filteredCollection(model.getJosmSelectionListModel().getSelected(), Way.class).size() == 1);
          }