Changeset 7902 in josm for trunk

Timestamp:

2014-12-28T18:59:56+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10696 - allow URLs without protocol

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/InternetTags.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/InternetTagsTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java

@@ -157 +157 @@
     private static final Pattern PORT_PATTERN = Pattern.compile(PORT_REGEX);
 
-    private static final String SIMPLE_WEBSITE = "^www[.].*";
-    private static final Pattern SIMPLE_WEBSITE_PATTERN = Pattern.compile(SIMPLE_WEBSITE);
-
     /**
      * Holds the set of current validation options.
@@ -301 +298 @@
         if (!isValidScheme(scheme)) {
             setErrorMessage(tr("URL contains an invalid protocol: {0}", scheme));
-            if (SIMPLE_WEBSITE_PATTERN.matcher(value).matches()) {
-                setFix("http://" + value);
-            }
             return false;
         }

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

@@ -128 +128 @@
     private TestError doValidateTag(OsmPrimitive p, String k, String v, AbstractValidator validator, int code) {
         TestError error = null;
-        if (!validator.isValid(v != null ? v : p.get(k))) {
-            String msg = tr("''{0}'': {1}", k, validator.getErrorMessage());
+        String value = v != null ? v : p.get(k);
+        if (!validator.isValid(value)) {
+            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)) {
+                String proto = validator instanceof EmailValidator ? "mailto://" : "http://";
+                return doValidateTag(p, k, proto+value, validator, code);
+            }
+            String msg = tr("''{0}'': {1}", k, errMsg);
             String fix = validator.getFix();
             if (fix != null) {

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/InternetTagsTest.java

@@ -37 +37 @@
 
         // Valid URLs
+        testUrl("url", "www.domain.com", true);                                // No protocol
         testUrl("url", "http://josm.openstreetmap.de", true);                  // Simple HTTP
         testUrl("url", "http://josm.openstreetmap.de/", true);                 // Simple HTTP + slash
@@ -48 +49 @@
 
         // Invalid URLs
-        testUrl("url", "www.domain.com", false);                               // No protocol
         testUrl("url", "something://www.domain.com", false);                   // invalid protocol
         testUrl("url", "http://www.domain.invalidtld", false);                 // invalid TLD