Changeset 16687 in josm

Timestamp:

2020-06-21T09:54:46+02:00 (4 years ago)

Author:

simon04

Message:

fix #16031 - Presets: make use_last_as_default="true" work (patch by mikko.lukas)

Location:

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

Files:

• Combo.java (modified) (1 diff)
• MultiSelect.java (modified) (1 diff)

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

@@ -95 +95 @@
             // all items were unset (and so is default)
             originalValue = getListEntry("");
-            if (!presetInitiallyMatches && isForceUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
+            if (!presetInitiallyMatches && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
                 combobox.setSelectedItem(getListEntry(LAST_VALUES.get(key)));
             } else {

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

@@ -39 +39 @@
         } else if (usage.unused()) {
             originalValue = null;
-            list.setSelectedItem(originalValue);
+            if (!presetInitiallyMatches && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
+                list.setSelectedItem(getListEntry(LAST_VALUES.get(key)));
+            } else {
+                list.setSelectedItem(originalValue);
+            }
         } else {
             originalValue = DIFFERENT;