Changeset 9422 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-01-12T20:12:47+01:00 (8 years ago)

Author:

simon04

Message:

see #12237 - Preset search: fix NPE when having selected a preset which is no longer shown after filtering

To reproduce: Select a primitive, open the preset search, select the first preset, type nonsense in the filter box

Location:

trunk/src/org/openstreetmap/josm/gui/tagging/presets

Files:

• TaggingPresetSearchDialog.java (modified) (1 diff)
• TaggingPresetSearchPrimitiveDialog.java (modified) (1 diff)
• TaggingPresetSelector.java (modified) (5 diffs)

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

@@ -57 +57 @@
         super.buttonAction(buttonIndex, evt);
         if (buttonIndex == 0) {
-            TaggingPreset preset = selector.getSelectedPreset();
+            TaggingPreset preset = selector.getSelectedPresetAndUpdateClassification();
             if (preset != null) {
                 preset.actionPerformed(null);

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

@@ -86 +86 @@
         super.buttonAction(buttonIndex, evt);
         if (buttonIndex == 0) {
-            TaggingPreset preset = selector.getSelectedPreset();
+            TaggingPreset preset = selector.getSelectedPresetAndUpdateClassification();
             if (preset != null) {
                 final Set<OsmPrimitive> matching = new HashSet<>(Utils.filter(Main.main.getCurrentDataSet().allPrimitives(), preset));

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

@@ -222 +222 @@
             @Override
             public void actionPerformed(ActionEvent ae) {
-                final TaggingPreset preset = lsResult.getSelectedValue();
+                final TaggingPreset preset = getSelectedPreset();
                 if (preset != null) {
                     Main.toolbar.addCustomButton(preset.getToolbarString(), -1, false);
@@ -246 +246 @@
                 text, onlyApplicable, inTags, getTypesInSelection(), selected);
 
-        final TaggingPreset oldPreset = lsResult.getSelectedValue();
+        final TaggingPreset oldPreset = getSelectedPreset();
         lsResultModel.setItems(Utils.transform(result, new Utils.Function<PresetClassification, TaggingPreset>() {
             @Override
@@ -253 +253 @@
             }
         }));
-        final TaggingPreset newPreset = lsResult.getSelectedValue();
+        final TaggingPreset newPreset = getSelectedPreset();
         if (!Objects.equals(oldPreset, newPreset)) {
             int[] indices = lsResult.getSelectedIndices();
@@ -414 +414 @@
 
     /**
-     * Determines, which preset is selected at the moment. Updates {@link PresetClassification#favoriteIndex}!
+     * Determines, which preset is selected at the moment.
      * @return selected preset (as action)
      */
@@ -423 +423 @@
             idx = 0;
         }
-        TaggingPreset preset = lsResultModel.getElementAt(idx);
+        return lsResultModel.getElementAt(idx);
+    }
+
+    /**
+     * Determines, which preset is selected at the moment. Updates {@link PresetClassification#favoriteIndex}!
+     * @return selected preset (as action)
+     */
+    public synchronized TaggingPreset getSelectedPresetAndUpdateClassification() {
+        final TaggingPreset preset = getSelectedPreset();
         for (PresetClassification pc: classifications) {
             if (pc.preset == preset) {