- Timestamp:
- 2020-05-31T16:25:11+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
r16525 r16526 516 516 Object obj = getSelectedItem(); 517 517 String display = obj == null ? getDisplayIfNull() : obj.toString(); 518 String value = null; 519 520 if (display != null) { 521 for (PresetListEntry entry : presetListEntries) { 522 String k = entry.toString(); 523 if (k.equals(display)) { 524 value = entry.value; 525 break; 526 } 527 } 528 if (value == null) { 529 value = display; 530 } 531 } else { 532 value = ""; 533 } 534 return Utils.removeWhiteSpaces(value); 518 519 if (display == null) { 520 return ""; 521 } 522 return presetListEntries.stream() 523 .filter(entry -> Objects.equals(entry.toString(), display)) 524 .findFirst() 525 .map(entry -> entry.value) 526 .map(Utils::removeWhiteSpaces) 527 .orElse(display); 535 528 } 536 529
Note:
See TracChangeset
for help on using the changeset viewer.