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

Timestamp:

2016-06-15T12:45:52+02:00 (10 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/AlignInCircleAction.java (modified) (3 diffs)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -131 +132 @@
             return;
 
-        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> sel = getLayerManager().getEditDataSet().getSelected();
         List<Node> nodes = new LinkedList<>();
         // fixNodes: All nodes for which the angle relative to center should not be modified
@@ -374 +375 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty());
+        DataSet ds = getLayerManager().getEditDataSet();
+        setEnabled(ds != null && !ds.getSelected().isEmpty());
     }