Changeset 6677 in josm for trunk/src/org

Timestamp:

2014-01-12T23:04:43+01:00 (11 years ago)

Author:

simon04

Message:

see #9414 fix #9566: MapCSS validator: allow error message to access tags of primitive

For instance, throwWarning: tr("{0} is bad", tag("highway")).

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -74 +74 @@
         protected final Map<String, String> keyChange = new LinkedHashMap<String, String>();
         protected final List<String> alternatives = new ArrayList<String>();
-        protected final Map<String, Severity> errors = new HashMap<String, Severity>();
+        protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<Instruction.AssignmentInstruction, Severity>();
         protected final Map<String, Boolean> assertions = new HashMap<String, Boolean>();
 
@@ -131 +131 @@
                     if (ai.key.startsWith("throw")) {
                         final Severity severity = Severity.valueOf(ai.key.substring("throw".length()).toUpperCase());
-                        check.errors.put(val, severity);
+                        check.errors.put(ai, severity);
                     } else if ("fixAdd".equals(ai.key)) {
                         final PrimitiveToTag toTag = PrimitiveToTag.ofMapCSSObject(ai.val, false);
@@ -296 +296 @@
                 cmds.add(new ChangePropertyKeyCommand(p, oldKey, newKey));
             }
-            return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(matchingSelector)), cmds);
+            return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
         }
 
@@ -304 +304 @@
          * @return a message
          */
-        String getMessage() {
-            return errors.isEmpty() ? null : errors.keySet().iterator().next();
+        String getMessage(OsmPrimitive p) {
+            if (errors.isEmpty()) {
+                return null;
+            } else {
+                final Object val = errors.keySet().iterator().next().val;
+                return String.valueOf(
+                        val instanceof Expression
+                                ? ((Expression) val).evaluate(new Environment().withPrimitive(p))
+                                : val
+                );
+            }
         }
 
@@ -312 +321 @@
          *
          * @return a description (possibly with alternative suggestions)
-         * @see #getDescriptionForMatchingSelector(Selector)
-         */
-        String getDescription() {
+         * @see #getDescriptionForMatchingSelector
+         */
+        String getDescription(OsmPrimitive p) {
             if (alternatives.isEmpty()) {
-                return getMessage();
+                return getMessage(p);
             } else {
                 /* I18N: {0} is the test error message and {1} is an alternative */
-                return tr("{0}, use {1} instead", getMessage(), Utils.join(tr(" or "), alternatives));
+                return tr("{0}, use {1} instead", getMessage(p), Utils.join(tr(" or "), alternatives));
             }
         }
@@ -329 +338 @@
          * @return a description (possibly with alternative suggestions)
          */
-        String getDescriptionForMatchingSelector(Selector matchingSelector) {
-            return insertArguments(matchingSelector, getDescription());
+        String getDescriptionForMatchingSelector(OsmPrimitive p, Selector matchingSelector) {
+            return insertArguments(matchingSelector, getDescription(p));
         }
 
@@ -339 +348 @@
         @Override
         public String toString() {
-            return getDescription();
+            return getDescription(null);
         }
 
@@ -355 +364 @@
             if (matchingSelector != null && !errors.isEmpty()) {
                 final Command fix = fixPrimitive(p);
-                final String description = getDescriptionForMatchingSelector(matchingSelector);
+                final String description = getDescriptionForMatchingSelector(p, matchingSelector);
                 if (fix != null) {
                     return new FixableTestError(null, getSeverity(), description, null, matchingSelector.toString(), 3000, p, fix);

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

@@ -468 +468 @@
          * and the subsequent arguments are parameters for the string indicated by {@code {0}}, {@code {1}}, …
          */
+        @NullableArguments
         public static String tr(String... args) {
             final String text = args[0];