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

Timestamp:

2015-06-21T12:19:37+02:00 (9 years ago)

Author:

simon04

Message:

see #11579 - MapCSS: improve error reporting on invalid pseudo classes

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• Condition.java (modified) (1 diff)
• MapCSSParser.jj (modified) (2 diffs)

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

@@ -500 +500 @@
                 return new PseudoClassCondition(method, not);
             }
-            throw new IllegalArgumentException("Invalid pseudo class specified: " + id);
+            throw new MapCSSException("Invalid pseudo class specified: " + id);
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -36 +36 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -1145 +1146 @@
 
     if (me != null) {
-        me.setLine(pe.currentToken.next.beginLine);
-        me.setColumn(pe.currentToken.next.beginColumn);
+        final Token token = Utils.firstNonNull(pe.currentToken.next, pe.currentToken);
+        me.setLine(token.beginLine);
+        me.setColumn(token.beginColumn);
         e = me;
     } else {