Changeset 5791 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac

Timestamp:

2013-03-22T01:17:06+01:00 (11 years ago)

Author:

Don-vip

Message:

see #8530 - workaround for NPE when loading "Steps properties" presets ("No handrail" item) + various minor stuff

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -151 +151 @@
                 if (item instanceof TaggingPreset.KeyedItem) {
                     TaggingPreset.KeyedItem ki = (TaggingPreset.KeyedItem) item;
-                    if (ki.key == null) {
-                        continue;
+                    if (ki.key != null && ki.getValues() != null) {
+                        try {
+                            presetTagCache.putAll(ki.key, ki.getValues());
+                        } catch (NullPointerException e) {
+                            System.err.println(p+": Unable to cache "+ki);
+                        }
                     }
-                    presetTagCache.putAll(ki.key, ki.getValues());
                 } else if (item instanceof TaggingPreset.Roles) {
                     TaggingPreset.Roles r = (TaggingPreset.Roles) item;