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

Timestamp:

2013-07-20T22:26:27+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8894 - IndexOutOfBoundsException opening tagging preset selector without any preset matching the current selection

File:

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

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

@@ -197 +197 @@
     }
 
+    /**
+     * Constructs a new {@code TaggingPresetSelector}.
+     */
     public TaggingPresetSelector() {
         super(new BorderLayout());
@@ -430 +433 @@
      */
     public TaggingPreset getSelectedPreset() {
+        List<PresetClassification> presets = lsResultModel.getPresets();
+        if (presets.isEmpty()) return null;
         int idx = lsResult.getSelectedIndex();
         if (idx == -1) {
             idx = 0;
         }
-        TaggingPreset preset = lsResultModel.getPresets().get(idx).preset;
+        TaggingPreset preset = presets.get(idx).preset;
         for (PresetClassification pc: classifications) {
             if (pc.preset == preset) {