Changeset 7124 in josm for trunk

Timestamp:

2014-05-14T13:47:05+02:00 (11 years ago)

Author:

simon04

Message:

MapCSS parsing: warn on unknown base selectors

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (1 diff)

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

@@ -10 +10 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -126 +127 @@
             }
             MapCSSRule optRule = new MapCSSRule(r.selector.optimizedBaseCheck(), r.declaration);
-            switch (((GeneralSelector) selRightmost).getBase()) {
+            final String base = ((GeneralSelector) selRightmost).getBase();
+            switch (base) {
                 case "node":
                     nodeRules.add(optRule);
@@ -149 +151 @@
                 case "canvas":
                     canvasRules.add(r);
+                default:
+                    final RuntimeException e = new RuntimeException(MessageFormat.format("Unknown MapCSS base selector {0}", base));
+                    Main.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
+                    Main.error(e);
+                    logError(e);
             }
         }

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -310 +310 @@
         assert !s1.matches(new Environment().withPrimitive(w))
     }
+
+    @Test
+    public void testInvalidBaseSelector() throws Exception {
+        def css = new MapCSSStyleSource("invalid_base[key=value] {}")
+        css.loadStyleSource()
+        assert !css.getErrors().isEmpty()
+        assert css.getErrors().iterator().next().toString().contains("Unknown MapCSS base selector invalid_base")
+    }
 }