Changeset 10382 in josm for trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.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/UpdateModifiedAction.java (modified) (3 diffs)

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -45 +46 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null && !Main.isOffline(OnlineResource.OSM_API));
+        setEnabled(getLayerManager().getEditDataSet() != null && !Main.isOffline(OnlineResource.OSM_API));
     }
 
@@ -55 +56 @@
     @Override
     public Collection<OsmPrimitive> getData() {
-        if (getCurrentDataSet() == null) return Collections.emptyList();
-        return getCurrentDataSet().allModifiedPrimitives();
+        DataSet ds = getLayerManager().getEditDataSet();
+        return ds == null ? Collections.<OsmPrimitive>emptyList() : ds.allModifiedPrimitives();
     }
 }