Changeset 16525 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2020-05-31T16:25:09+02:00 (4 years ago)

Author:

simon04

Message:

see #8352 - PropertiesDialog: use non-localized color name

Location:

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

Files:

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

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

@@ -136 +136 @@
 
     protected Color getColor() {
-        String colorString = String.valueOf(getSelectedItem());
+        String colorString = String.valueOf(getSelectedValue());
         return colorString.startsWith("#")
                 ? ColorHelper.html2color(colorString)

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

@@ -513 +513 @@
     }
 
-    @Override
-    public void addCommands(List<Tag> changedTags) {
+    protected String getSelectedValue() {
         Object obj = getSelectedItem();
         String display = obj == null ? getDisplayIfNull() : obj.toString();
@@ -533 +532 @@
             value = "";
         }
-        value = Utils.removeWhiteSpaces(value);
+        return Utils.removeWhiteSpaces(value);
+    }
+
+    @Override
+    public void addCommands(List<Tag> changedTags) {
+        String value = getSelectedValue();
 
         // no change if same as before