Ticket #16031: 16031.patch

File 16031.patch, 2.0 KB (added by mikko.lukas, 6 years ago)

Fixed multiselect and combo ignoring use_last_as_default="true" in preset XML-file

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

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
     
    9494        } else if (usage.unused()) {
    9595            // all items were unset (and so is default)
    9696            originalValue = getListEntry("");
    97             if (!presetInitiallyMatches && isForceUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
     97            if (!presetInitiallyMatches && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
    9898                combobox.setSelectedItem(getListEntry(LAST_VALUES.get(key)));
    9999            } else {
    100100                combobox.setSelectedItem(originalValue);

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

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
     
    3838            list.setSelectedItem(def);
    3939        } else if (usage.unused()) {
    4040            originalValue = null;
    41             list.setSelectedItem(originalValue);
     41            if (!presetInitiallyMatches && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
     42                list.setSelectedItem(getListEntry(LAST_VALUES.get(key)));
     43            } else {
     44                list.setSelectedItem(originalValue);
     45            }
    4246        } else {
    4347            originalValue = DIFFERENT;
    4448            list.setSelectedItem(originalValue);