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

Timestamp:

2018-03-03T20:33:09+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #16044 - Autofix invalid URL with the wrong type of slashes

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• TestError.java (modified) (1 diff)
• tests/InternetTags.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -191 +191 @@
          * Sets a supplier to obtain a command to fix the error.
          *
-         * @param fixingCommand the fix supplier
+         * @param fixingCommand the fix supplier. Can be null
          * @return {@code this}
          */

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.function.Supplier;
+
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -97 +101 @@
         String value = v != null ? v : p.get(k);
         if (!validator.isValid(value)) {
+            Supplier<Command> fix = null;
             String errMsg = validator.getErrorMessage();
-            // Special treatment to allow URLs without protocol. See UrlValidator#isValid
             if (tr("URL contains an invalid protocol: {0}", (String) null).equals(errMsg)) {
+                // Special treatment to allow URLs without protocol. See UrlValidator#isValid
                 String proto = validator instanceof EmailValidator ? "mailto://" : "http://";
                 return doValidateTag(p, k, proto+value, validator, code);
+            } else if (tr("URL contains an invalid authority: {0}", (String) null).equals(errMsg)
+                    && value.contains("\\") && validator.isValid(value.replaceAll("\\\\", "/"))) {
+                // Special treatment to autofix URLs with backslashes. See UrlValidator#isValid
+                errMsg = tr("URL contains backslashes instead of slashes");
+                fix = () -> new ChangePropertyCommand(p, k, value.replaceAll("\\\\", "/"));
             }
             error = TestError.builder(this, Severity.WARNING, code)
                     .message(validator.getValidatorName(), marktr("''{0}'': {1}"), k, errMsg)
                     .primitives(p)
+                    .fix(fix)
                     .build();
         }