Changeset 9465 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-01-15T15:59:13+01:00 (8 years ago)

Author:

simon04

Message:

fix #12160 - Combobox List Entries with Empty Value – display_value and short_description not shown

Location:

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

Files:

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

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

@@ -39 +39 @@
             lhm.put(def, new PresetListEntry(def));
         }
-        lhm.put("", new PresetListEntry(""));
+        if (!lhm.containsKey("")) {
+            lhm.put("", new PresetListEntry(""));
+        }
 
         combo = new JosmComboBox<>(lhm.values().toArray(new PresetListEntry[0]));

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

@@ -201 +201 @@
         public String getListDisplay() {
             if (value.equals(DIFFERENT))
-                return "<b>"+DIFFERENT.replaceAll("<", "&lt;").replaceAll(">", "&gt;")+"</b>";
-
-            if (value.isEmpty())
-                return "&nbsp;";
+                return "<b>" + Utils.escapeReservedCharactersHTML(DIFFERENT) + "</b>";
 
             final StringBuilder res = new StringBuilder("<b>");
-            res.append(getDisplayValue(true).replaceAll("<", "&lt;").replaceAll(">", "&gt;"))
+            res.append(Utils.escapeReservedCharactersHTML(getDisplayValue(true)))
                .append("</b>");
             if (getShortDescription(true) != null) {