Changeset 12314 in josm for trunk/src

Timestamp:

2017-06-04T20:52:03+02:00 (7 years ago)

Author:

michael2402

Message:

Use DataSet getSelectedWays/Nodes helper functions.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• CopyCoordinatesAction.java (modified) (2 diffs)
• mapmode/SelectAction.java (modified) (1 diff)

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

@@ -209 +209 @@
         if (ds == null)
             return;
-        Collection<OsmPrimitive> selection = ds.getSelected();
-        Set<Way> selectedWays = OsmPrimitive.getFilteredSet(selection, Way.class);
+        Collection<Way> selectedWays = ds.getSelectedWays();
         if (selectedWays.size() < 2) {
             new Notification(

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

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
 
 public class CopyCoordinatesAction extends JosmAction {
@@ -54 +53 @@
             return Collections.emptyList();
         } else {
-            return Utils.filteredCollection(ds.getSelected(), Node.class);
+            return ds.getSelectedNodes();
         }
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -882 +882 @@
         DataSet ds = getLayerManager().getEditDataSet();
         final Collection<OsmPrimitive> elementsToTest = new HashSet<>(ds.getSelected());
-        for (Way osm : Utils.filteredCollection(ds.getSelected(), Way.class)) {
+        for (Way osm : ds.getSelectedWays()) {
             elementsToTest.addAll(osm.getNodes());
         }