Changeset 7698 in josm for trunk/src

Timestamp:

2014-11-02T23:01:57+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10696 - Provide a fix for website's with no scheme (patch by brianegge)

File:

• trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.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.
@@ -298 +301 @@
         if (!isValidScheme(scheme)) {
             setErrorMessage(tr("URL contains an invalid protocol: {0}", scheme));
+            if (SIMPLE_WEBSITE_PATTERN.matcher(value).matches()) {
+                setFix("http://" + value);
+            }
             return false;
         }