Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 import java.util.HashSet;
-import java.util.Set;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -44 +43 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (MainApplication.getLayerManager().getEditLayer() != null) {
+            if (MainApplication.getLayerManager().getActiveDataSet() != null) {
                 TaggingPresetSearchPrimitiveDialog.getInstance().showDialog();
             }
@@ -51 +50 @@
         @Override
         protected void updateEnabledState() {
-            setEnabled(getLayerManager().getEditLayer() != null);
+            setEnabled(getLayerManager().getActiveDataSet() != null);
         }
     }
@@ -87 +86 @@
             TaggingPreset preset = selector.getSelectedPresetAndUpdateClassification();
             if (preset != null) {
-                final Set<OsmPrimitive> matching = new HashSet<>(Main.main.getEditDataSet().getPrimitives(preset));
-                Main.main.getEditDataSet().setSelected(matching);
+                DataSet ds = Main.main.getActiveDataSet();
+                ds.setSelected(new HashSet<>(ds.getPrimitives(preset)));
             }
         }