Changeset 11385 in josm for trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java

Timestamp:

2016-12-13T01:57:37+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java (modified) (1 diff)

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

@@ -314 +314 @@
         String authority = urlMatcher.group(PARSE_URL_AUTHORITY);
         if ("file".equals(scheme)) { // Special case - file: allows an empty authority
-            if (!"".equals(authority)) {
-                if (authority.contains(":")) { // but cannot allow trailing :
-                    setErrorMessage(tr("URL contains an invalid authority: {0}", authority));
-                    return false;
-                }
+            if (!"".equals(authority) && authority.contains(":")) { // but cannot allow trailing :
+                setErrorMessage(tr("URL contains an invalid authority: {0}", authority));
+                return false;
             }
             // drop through to continue validation