Changeset 7213 in josm for trunk/src/org

Timestamp:

2014-06-03T20:18:18+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10096 - robustness in MapCSS parsing

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (3 diffs)

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

@@ -162 +162 @@
         }
 
+        static final String POSSIBLE_THROWS = possibleThrows();
+
+        static final String possibleThrows() {
+            StringBuffer sb = new StringBuffer();
+            for (Severity s : Severity.values()) {
+                if (sb.length() > 0) {
+                    sb.append('/');
+                }
+                sb.append("throw")
+                .append(s.name().charAt(0))
+                .append(s.name().substring(1).toLowerCase());
+            }
+            return sb.toString();
+        }
+
         static TagCheck ofMapCSSRule(final GroupedMapCSSRule rule) {
             final TagCheck check = new TagCheck(rule);
@@ -178 +193 @@
                             : null;
                     if (ai.key.startsWith("throw")) {
-                        final Severity severity = Severity.valueOf(ai.key.substring("throw".length()).toUpperCase());
-                        check.errors.put(ai, severity);
+                        try {
+                            final Severity severity = Severity.valueOf(ai.key.substring("throw".length()).toUpperCase());
+                            check.errors.put(ai, severity);
+                        } catch (IllegalArgumentException e) {
+                            Main.warn("Unsupported "+ai.key+" instruction. Allowed instructions are "+POSSIBLE_THROWS);
+                        }
                     } else if ("fixAdd".equals(ai.key)) {
                         final PrimitiveToTag toTag = PrimitiveToTag.ofMapCSSObject(ai.val, false);
@@ -203 +222 @@
             }
             if (check.errors.isEmpty() && !containsSetClassExpression) {
-                throw new RuntimeException("No throwError/throwWarning/throwOther given! You should specify a validation error message for " + rule.selectors);
+                throw new RuntimeException("No "+POSSIBLE_THROWS+" given! You should specify a validation error message for " + rule.selectors);
             } else if (check.errors.size() > 1) {
-                throw new RuntimeException("More than one throwError/throwWarning/throwOther given! You should specify a single validation error message for " + rule.selectors);
+                throw new RuntimeException("More than one "+POSSIBLE_THROWS+" given! You should specify a single validation error message for " + rule.selectors);
             }
             return check;