Changeset 10382 in josm for trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java

Timestamp:

2016-06-15T12:45:52+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12943 - gsoc-core - fix most of deprecation warnings (static accesses must be fixed)

File:

• trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -33 +34 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || (getCurrentDataSet().getSelectedNodes().size() != 1))
+        Collection<Node> selNodes = getLayerManager().getEditDataSet().getSelectedNodes();
+        if (!isEnabled() || selNodes.size() != 1)
             return;
 
         LatLonDialog dialog = new LatLonDialog(Main.parent, tr("Move Node..."), ht("/Action/MoveNode"));
-        Node n = (Node) getCurrentDataSet().getSelectedNodes().toArray()[0];
+        Node n = (Node) selNodes.toArray()[0];
         dialog.setCoordinates(n.getCoor());
         dialog.showDialog();
@@ -54 +56 @@
     @Override
     protected void updateEnabledState() {
-        if (getCurrentDataSet() == null) {
+        DataSet ds = getLayerManager().getEditDataSet();
+        if (ds == null) {
             setEnabled(false);
         } else {
-            updateEnabledState(getCurrentDataSet().getSelected());
+            updateEnabledState(ds.getSelected());
         }
     }