Changeset 7322 in josm for trunk

Timestamp:

2014-07-21T16:30:18+02:00 (9 years ago)

Author:

akks

Message:

fix #10288: tagging-preset-tester NPE without data layer

File:

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

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java

@@ -43 +43 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -325 +326 @@
         boolean inTags = ckSearchInTags != null && ckSearchInTags.isSelected();
 
+        DataSet ds = Main.main.getCurrentDataSet();
+        Collection<OsmPrimitive> selected = (ds==null)? Collections.EMPTY_LIST : ds.getSelected();
         final List<PresetClassification> result = classifications.getMatchingPresets(
-                text, onlyApplicable, inTags, getTypesInSelection(), Main.main.getCurrentDataSet().getSelected());
+                text, onlyApplicable, inTags, getTypesInSelection(), selected);
 
         lsResultModel.setPresets(result);