Changeset 16089 in josm for trunk

Timestamp:

2020-03-08T20:17:00+01:00 (5 years ago)

Author:

simon04

Message:

fix #18867 - Presets: combo does not show <DIFFERENT>

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified) (4 diffs)

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

@@ -363 +363 @@
     @Override
     public Collection<String> getValues() {
-        initListEntries();
+        initListEntries(false);
         return presetListEntries.stream().map(x -> x.value).collect(Collectors.toSet());
     }
@@ -372 +372 @@
      */
     public Collection<String> getDisplayValues() {
-        initListEntries();
+        initListEntries(false);
         return presetListEntries.stream().map(PresetListEntry::getDisplayValue).collect(Collectors.toList());
     }
@@ -378 +378 @@
     @Override
     public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel, boolean presetInitiallyMatches) {
-        initListEntries();
+        initListEntries(true);
 
         // find out if our key is already used in the selection.
@@ -396 +396 @@
     }
 
-    private void initListEntries() {
+    private void initListEntries(boolean cleanup) {
         if (initialized) {
-            presetListEntries.remove(new PresetListEntry(DIFFERENT)); // possibly added in #addToPanel
+            if (cleanup) { // do not cleanup for #getDisplayValues used in Combo#addToPanelAnchor
+                presetListEntries.remove(new PresetListEntry(DIFFERENT)); // possibly added in #addToPanel
+            }
             return;
         } else if (presetListEntries.isEmpty()) {