Changeset 12726 in josm for trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java
- Timestamp:
- 2017-09-04T23:45:49+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java
r12641 r12726 15 15 import org.openstreetmap.josm.command.SelectCommand; 16 16 import org.openstreetmap.josm.command.SequenceCommand; 17 import org.openstreetmap.josm.data.osm.DataSet; 17 18 import org.openstreetmap.josm.data.osm.Node; 18 19 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 20 21 import org.openstreetmap.josm.gui.MainApplication; 21 22 import org.openstreetmap.josm.gui.MapFrame; 22 import org.openstreetmap.josm.gui.layer.OsmDataLayer;23 23 import org.openstreetmap.josm.tools.Shortcut; 24 24 import org.openstreetmap.josm.tools.Utils; … … 61 61 @Override 62 62 public void actionPerformed(ActionEvent evt) { 63 OsmDataLayer osmLayer = getLayerManager().getEditLayer();64 if ( osmLayer== null)63 DataSet ds = getLayerManager().getEditDataSet(); 64 if (ds == null) 65 65 return; 66 66 MapFrame map = MainApplication.getMap(); 67 67 if (!(map.mapMode instanceof DrawAction)) return; // We are not on draw mode 68 68 69 Collection<Node> selectedPoints = osmLayer.data.getSelectedNodes();70 Collection<Way> selectedLines = osmLayer.data.getSelectedWays();69 Collection<Node> selectedPoints = ds.getSelectedNodes(); 70 Collection<Way> selectedLines = ds.getSelectedWays(); 71 71 if ((selectedPoints.size() > 1) || (selectedLines.size() != 1)) // Unsuitable selection 72 72 return; … … 115 115 } 116 116 MainApplication.undoRedo.add(new SequenceCommand(tr("Follow line"), 117 new ChangeCommand( follower, newFollower),118 new SelectCommand( newFollower.isClosed() // see #10028 - unselect last node when closing a way117 new ChangeCommand(ds, follower, newFollower), 118 new SelectCommand(ds, newFollower.isClosed() // see #10028 - unselect last node when closing a way 119 119 ? Arrays.<OsmPrimitive>asList(follower) 120 120 : Arrays.<OsmPrimitive>asList(follower, newPoint)
Note:
See TracChangeset
for help on using the changeset viewer.