Changeset 17077 in josm

Timestamp:

2020-09-30T23:55:37+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #19813 - see #16031 - fix selection of Multiselect presets (regression from r16687:16688)

Location:

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

Files:

• Combo.java (modified) (1 diff)
• ComboMultiSelect.java (modified) (3 diffs)
• MultiSelect.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java

@@ -77 +77 @@
         }
         combobox.setEditor(tf);
-        combobox.setSelectedItem(getItemToSelect(def, presetInitiallyMatches));
+        combobox.setSelectedItem(getItemToSelect(def, presetInitiallyMatches, false));
 
         if (key != null && ("colour".equals(key) || key.startsWith("colour:") || key.endsWith(":colour"))) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -342 +342 @@
     }
 
-    protected Object getItemToSelect(String def, boolean presetInitiallyMatches) {
+    protected Object getItemToSelect(String def, boolean presetInitiallyMatches, boolean multi) {
         final Object itemToSelect;
         if (usage.hasUniqueValue()) {
             // all items have the same value (and there were no unset items)
-            originalValue = getListEntry(usage.getFirst());
+            originalValue = multi ? usage.getFirst() : getListEntry(usage.getFirst());
             itemToSelect = originalValue;
         } else if (def != null && usage.unused()) {
@@ -352 +352 @@
             if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || isForceUseLastAsDefault()) {
                 // selected osm primitives are untagged or filling default feature is enabled
-                PresetListEntry entry = getListEntry(def);
-                itemToSelect = entry == null ? "" : entry.getDisplayValue();
+                if (multi) {
+                    itemToSelect = def;
+                } else {
+                    PresetListEntry entry = getListEntry(def);
+                    itemToSelect = entry == null ? "" : entry.getDisplayValue();
+                }
             } else {
                 // selected osm primitives are tagged and filling default feature is disabled
                 itemToSelect = "";
             }
-            originalValue = getListEntry(DIFFERENT);
+            originalValue = multi ? DIFFERENT : getListEntry(DIFFERENT);
         } else if (usage.unused()) {
             // all items were unset (and so is default)
-            originalValue = getListEntry("");
+            originalValue = multi ? null : getListEntry("");
             if (LAST_VALUES.containsKey(key) && isUseLastAsDefault() && (!presetInitiallyMatches || isForceUseLastAsDefault())) {
                 itemToSelect = getListEntry(LAST_VALUES.get(key));
@@ -368 +372 @@
             }
         } else {
-            originalValue = getListEntry(DIFFERENT);
+            originalValue = multi ? DIFFERENT : getListEntry(DIFFERENT);
             itemToSelect = originalValue;
         }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java

@@ -35 +35 @@
         ListCellRenderer<PresetListEntry> renderer = getListCellRenderer();
         list.setCellRenderer(renderer);
-        list.setSelectedItem(getItemToSelect(def, presetInitiallyMatches));
-
+        list.setSelectedItem(getItemToSelect(def, presetInitiallyMatches, true));
         JScrollPane sp = new JScrollPane(list);
         // if a number of rows has been specified in the preset,