Changeset 6762 in josm for trunk/src/org

Timestamp:

2014-01-27T03:20:43+01:00 (10 years ago)

Author:

Don-vip

Message:

fix NPEs seen in tagchecker tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/Selector.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -308 +308 @@
         String getMessage(OsmPrimitive p) {
             if (errors.isEmpty()) {
-                return null;
+                // Return something to avoid NPEs
+                return rule.declaration.toString();
             } else {
                 final Object val = errors.keySet().iterator().next().val;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -230 +230 @@
             if (ChildOrParentSelectorType.ELEMENT_OF.equals(type)) {
 
-                if (e.osm instanceof Node) {
+                if (e.osm instanceof Node || e.osm.getDataSet() == null) {
                     // nodes cannot contain elements
                     return false;