Changeset 5795 in josm for trunk/src

Timestamp:

2013-03-22T21:07:01+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8530 - Robustness to presets defining keys without value

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -1332 +1332 @@
             return Collections.singleton(value);
         }
+
+        @Override
+        public String toString() {
+            return "Key [key=" + key + ", value=" + value + ", text=" + text
+                    + ", text_context=" + text_context + ", match=" + match
+                    + "]";
+        }
     }
 
@@ -1543 +1550 @@
                         if (o instanceof ComboMultiSelect) {
                             ((ComboMultiSelect) o).addListEntries(listEntries);
+                        } else if (o instanceof Key) {
+                            if (((Key) o).value == null) {
+                                ((Key) o).value = ""; // Fix #8530
+                            }
                         }
                         listEntries = new LinkedList<PresetListEntry>();