Changeset 34093 in osm for applications

Timestamp:

2018-03-21T01:49:16+01:00 (7 years ago)

Author:

floscher

Message:

Fix #15623 – Check if editDataSet is present before adding wikipedia tag to selected object(s)

File:

• applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikipediaToggleDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikipediaToggleDialog.java

@@ -27 +27 @@
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -316 +317 @@
 
         static void addTag(Tag tag) {
-            if (tag == null) {
-                return;
-            }
-            final Collection<OsmPrimitive> selected = MainApplication.getLayerManager().getEditDataSet().getSelected();
+            final DataSet editDataSet = MainApplication.getLayerManager().getEditDataSet();
+            if (tag == null || editDataSet == null) {
+                return;
+            }
+            final Collection<OsmPrimitive> selected = editDataSet.getSelected();
             if (selected.isEmpty() || !GuiUtils.confirmOverwrite(tag.getKey(), tag.getValue(), selected)) {
                 return;