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

Timestamp:

2015-07-10T22:36:42+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11681 - NPE in tagging presets initialization

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (1 diff)
• gui/tagging/TaggingPresets.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -791 +791 @@
                 "waterway=stream | waterway=river | waterway=canal | waterway=drain | waterway=rapids | "+
                 "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
-                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | (highway=motorway_link & -oneway=no & -oneway=reversible)";
+                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
+                "(highway=motorway_link & -oneway=no & -oneway=reversible)";
 
         try {

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

@@ -55 +55 @@
             for (final TaggingPreset p : taggingPresets) {
                 JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;
-                if (p instanceof TaggingPresetSeparator) {
+                if (m == null && p.group != null) {
+                    Main.error("No tagging preset submenu for " + p.group);
+                } else if (m == null) {
+                    Main.error("No tagging preset menu. Tagging preset " + p + " won't be available there");
+                } else if (p instanceof TaggingPresetSeparator) {
                     m.add(new JSeparator());
                 } else if (p instanceof TaggingPresetMenu) {