Changeset 12401 in josm for trunk/src/org

Timestamp:

2017-06-12T00:11:39+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14929 - fix NPE in unit tests

File:

• trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java

@@ -171 +171 @@
 
     private static Set<String> getTagValues(String key) {
-        BBox bbox = Main.map.mapView.getState().getViewArea().getLatLonBoundsBox().toBBox();
         DataSet ds = Main.getLayerManager().getEditDataSet();
         Set<String> values = new TreeSet<>();
-        Consumer<OsmPrimitive> consumer = o -> {
-            String value = o.get(key);
-            if (value != null) {
-                for (String v : value.split(";")) {
-                    values.add(v);
+        if (ds != null) {
+            BBox bbox = Main.map.mapView.getState().getViewArea().getLatLonBoundsBox().toBBox();
+            Consumer<OsmPrimitive> consumer = o -> {
+                String value = o.get(key);
+                if (value != null) {
+                    for (String v : value.split(";")) {
+                        values.add(v);
+                    }
                 }
-            }
-        };
-        ds.searchNodes(bbox).forEach(consumer);
-        ds.searchWays(bbox).forEach(consumer);
-        ds.searchRelations(bbox).forEach(consumer);
+            };
+            ds.searchNodes(bbox).forEach(consumer);
+            ds.searchWays(bbox).forEach(consumer);
+            ds.searchRelations(bbox).forEach(consumer);
+        }
         return values;
     }