Changeset 6548 in josm for trunk/src

Timestamp:

2013-12-27T17:14:34+01:00 (11 years ago)

Author:

simon04

Message:

see #9414 - MapCSS-based tagchecker: migrate remaining tagchecks

All former tagchecker.cfg checks are now located in data/validator/*mapcss :-)

File:

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

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

@@ -255 +255 @@
                 cmds.add(new ChangePropertyKeyCommand(p, oldKey, newKey));
             }
-            return new SequenceCommand(tr("Fix of {0}", getDescription()), cmds);
+            return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(matchingSelector)), cmds);
         }
 
@@ -271 +271 @@
          *
          * @return a description (possibly with alternative suggestions)
+         * @see {@link #getDescriptionForMatchingSelector(Selector)}
          */
         String getDescription() {
@@ -281 +282 @@
         }
 
+        /**
+         * Constructs a (localized) description for this deprecation check
+         * where any placeholders are replaced by values of the matched selector.
+         *
+         * @return a description (possibly with alternative suggestions)
+         */
+        String getDescriptionForMatchingSelector(Selector matchingSelector) {
+            return insertArguments(matchingSelector, getDescription());
+        }
+
         Severity getSeverity() {
             return errors.values().iterator().next();
+        }
+
+        @Override
+        public String toString() {
+            return getDescription();
         }
 
@@ -295 +311 @@
             if (matchingSelector != null) {
                 final Command fix = fixPrimitive(p);
-                final String description = TagCheck.insertArguments(matchingSelector, getDescription());
+                final String description = getDescriptionForMatchingSelector(matchingSelector);
                 if (fix != null) {
                     return new FixableTestError(null, getSeverity(), description, 3000, p, fix);
@@ -363 +379 @@
         addMapCSS("religion.mapcss");
         addMapCSS("relation.mapcss");
+        addMapCSS("combinations.mapcss");
+        addMapCSS("unnecessary.mapcss");
+        addMapCSS("wikipedia.mapcss");
+        addMapCSS("power.mapcss");
     }
 }