Changeset 35200 in osm for applications/editors/josm/plugins/indoorhelper

Timestamp:

2019-10-27T13:46:14+01:00 (5 years ago)

Author:

donvip

Message:

fix #josm17309 - NPE

File:

• applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (modified) (2 diffs)

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -43 +43 @@
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmDataManager;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -571 +572 @@
    public void unsetSpecificKeyFilter(String key) {
 
-     Collection<OsmPrimitive> p = OsmDataManager.getInstance().getEditDataSet().allPrimitives();
-     int level = Integer.parseInt(levelValue);
-
-     //Find all primitives with the specific tag and check if value is part of the current
-     //workinglevel. After that unset the disabled status.
-     for (OsmPrimitive osm: p) {
-         if ((osm.isDisabledAndHidden() || osm.isDisabled()) && osm.hasKey(key)) {
-             for (Map.Entry<String, String> e: osm.getInterestingTags().entrySet()) {
-                if (e.getKey().equals(key)) {
-                    //Compare values to current working level
-                    if (IndoorLevel.isPartOfWorkingLevel(e.getValue(), level)) {
-                        osm.unsetDisabledState();
-                    } else {
-                        osm.setDisabledState(true);
+     DataSet editDataSet = OsmDataManager.getInstance().getEditDataSet();
+     if (editDataSet != null) {
+         Collection<OsmPrimitive> p = editDataSet.allPrimitives();
+         int level = Integer.parseInt(levelValue);
+
+         //Find all primitives with the specific tag and check if value is part of the current
+         //workinglevel. After that unset the disabled status.
+         for (OsmPrimitive osm: p) {
+             if ((osm.isDisabledAndHidden() || osm.isDisabled()) && osm.hasKey(key)) {
+                 for (Map.Entry<String, String> e: osm.getInterestingTags().entrySet()) {
+                    if (e.getKey().equals(key)) {
+                        //Compare values to current working level
+                        if (IndoorLevel.isPartOfWorkingLevel(e.getValue(), level)) {
+                            osm.unsetDisabledState();
+                        } else {
+                            osm.setDisabledState(true);
+                        }
                     }
-                }
+                 }
              }
          }