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

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

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -99 +100 @@
     protected void launchInfoBrowsersForSelectedPrimitivesAndNote() {
         List<OsmPrimitive> primitivesToShow = new ArrayList<>();
-        if (getCurrentDataSet() != null) {
-            primitivesToShow.addAll(getCurrentDataSet().getAllSelected());
+        DataSet ds = getLayerManager().getEditDataSet();
+        if (ds != null) {
+            primitivesToShow.addAll(ds.getAllSelected());
         }
 
@@ -157 +159 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty());
+        DataSet ds = getLayerManager().getEditDataSet();
+        setEnabled(ds != null && !ds.getSelected().isEmpty());
     }