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

Timestamp:

2016-12-23T15:30:46+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14152 - NPE

File:

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

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

@@ -94 +94 @@
             TaggingPreset group = preset.group;
             while (group != null) {
-                Collections.addAll(groups, group.getLocaleName().toLowerCase(Locale.ENGLISH).split("\\s"));
+                addLocaleNames(groups, group);
                 group = group.group;
             }
-            Collections.addAll(names, preset.getLocaleName().toLowerCase(Locale.ENGLISH).split("\\s"));
+            addLocaleNames(names, preset);
             for (TaggingPresetItem item: preset.data) {
                 if (item instanceof KeyedItem) {
@@ -115 +115 @@
                     }
                 }
+            }
+        }
+
+        private static void addLocaleNames(Collection<String> collection, TaggingPreset preset) {
+            String locName = preset.getLocaleName();
+            if (locName != null) {
+                Collections.addAll(collection, locName.toLowerCase(Locale.ENGLISH).split("\\s"));
             }
         }