Changeset 12835 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-09-12T23:03:55+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI references from TaggingPresetItem

File:

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

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

@@ -18 +18 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -44 +43 @@
     protected void initAutoCompletionField(AutoCompletingTextField field, List<String> keys) {
         if (Main.main == null) return;
-        OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();
-        if (layer == null) {
+        DataSet data = Main.main.getEditDataSet();
+        if (data == null) {
             return;
         }
         AutoCompletionList list = new AutoCompletionList();
-        AutoCompletionManager.of(layer.data).populateWithTagValues(list, keys);
+        AutoCompletionManager.of(data).populateWithTagValues(list, keys);
         field.setAutoCompletionList(list);
     }