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

Timestamp:

2020-04-12T22:31:36+02:00 (5 years ago)

Author:

simon04

Message:

see #8352, see #19075 - Presets: fix unit tests

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java (modified) (1 diff)

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

@@ -101 +101 @@
             combobox.setSelectedItem(originalValue);
         }
-        if ("colour".equals(key) || key.startsWith("colour:") || key.endsWith(":colour")) {
+        if (key != null && ("colour".equals(key) || key.startsWith("colour:") || key.endsWith(":colour"))) {
             p.add(combobox, GBC.std().fill(GBC.HORIZONTAL));
             JButton button = new JButton(new ChooseColorAction());