Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java

Timestamp:

2018-02-18T05:02:23+01:00 (7 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

File:

• trunk/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -34 +34 @@
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled() || relations.isEmpty()) return;
-        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        if (editLayer == null || editLayer.data == null) return;
+        DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+        if (ds == null) return;
         if (add) {
-            editLayer.data.addSelected(relations);
+            ds.addSelected(relations);
         } else {
-            editLayer.data.setSelected(relations);
+            ds.setSelected(relations);
         }
     }