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

Timestamp:

2017-04-13T01:08:58+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1126 - Return of boolean expressions should not be wrapped into an "if-then-else" statement

File:

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

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

@@ -373 +373 @@
         }
 
-        if (isOff(ALLOW_ALL_SCHEMES) && !allowedSchemes.contains(scheme.toLowerCase(Locale.ENGLISH))) {
-            return false;
-        }
-
-        return true;
+        return isOn(ALLOW_ALL_SCHEMES) || allowedSchemes.contains(scheme.toLowerCase(Locale.ENGLISH));
     }
 
@@ -458 +454 @@
         }
 
-        int slash2Count = countToken("//", path);
-        if (slash2Count > 0 && isOff(ALLOW_2_SLASHES)) {
-            return false;
-        }
-
-        return true;
+        return isOn(ALLOW_2_SLASHES) || countToken("//", path) <= 0;
     }