Changeset 12726 in josm for trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java

Timestamp:

2017-09-04T23:45:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #13036 - deprecate Command() default constructor, fix unit tests and java warnings

File:

• trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java (modified) (4 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.command.SelectCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -20 +21 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -61 +61 @@
     @Override
     public void actionPerformed(ActionEvent evt) {
-        OsmDataLayer osmLayer = getLayerManager().getEditLayer();
-        if (osmLayer == null)
+        DataSet ds = getLayerManager().getEditDataSet();
+        if (ds == null)
             return;
         MapFrame map = MainApplication.getMap();
         if (!(map.mapMode instanceof DrawAction)) return; // We are not on draw mode
 
-        Collection<Node> selectedPoints = osmLayer.data.getSelectedNodes();
-        Collection<Way> selectedLines = osmLayer.data.getSelectedWays();
+        Collection<Node> selectedPoints = ds.getSelectedNodes();
+        Collection<Way> selectedLines = ds.getSelectedWays();
         if ((selectedPoints.size() > 1) || (selectedLines.size() != 1)) // Unsuitable selection
             return;
@@ -115 +115 @@
             }
             MainApplication.undoRedo.add(new SequenceCommand(tr("Follow line"),
-                    new ChangeCommand(follower, newFollower),
-                    new SelectCommand(newFollower.isClosed() // see #10028 - unselect last node when closing a way
+                    new ChangeCommand(ds, follower, newFollower),
+                    new SelectCommand(ds, newFollower.isClosed() // see #10028 - unselect last node when closing a way
                             ? Arrays.<OsmPrimitive>asList(follower)
                             : Arrays.<OsmPrimitive>asList(follower, newPoint)