Changeset 10965 in josm for trunk/src/org/openstreetmap/josm/data/validation/routines

Timestamp:

2016-09-05T23:50:16+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1226 - Method parameters, caught exceptions and foreach variables should not be reassigned

File:

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

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

@@ -157 +157 @@
             return false;
         }
-        domain = unicodeToASCII(domain);
+        String asciiDomain = unicodeToASCII(domain);
         // hosts must be equally reachable via punycode and Unicode
         // Unicode is never shorter than punycode, so check punycode
         // if domain did not convert, then it will be caught by ASCII
         // checks in the regexes below
-        if (domain.length() > MAX_DOMAIN_LENGTH) {
+        if (asciiDomain.length() > MAX_DOMAIN_LENGTH) {
             return false;
         }
-        String[] groups = domainRegex.match(domain);
+        String[] groups = domainRegex.match(asciiDomain);
         if (groups != null && groups.length > 0) {
             return isValidTld(groups[0]);
         }
-        return allowLocal && hostnameRegex.isValid(domain);
+        return allowLocal && hostnameRegex.isValid(asciiDomain);
     }
 
@@ -183 +183 @@
             return false;
         }
-        domain = unicodeToASCII(domain);
+        String asciiDomain = unicodeToASCII(domain);
         // hosts must be equally reachable via punycode and Unicode
         // Unicode is never shorter than punycode, so check punycode
         // if domain did not convert, then it will be caught by ASCII
         // checks in the regexes below
-        if (domain.length() > MAX_DOMAIN_LENGTH) {
+        if (asciiDomain.length() > MAX_DOMAIN_LENGTH) {
             return false;
         }
-        String[] groups = domainRegex.match(domain);
+        String[] groups = domainRegex.match(asciiDomain);
         return (groups != null && groups.length > 0)
-                || hostnameRegex.isValid(domain);
+                || hostnameRegex.isValid(asciiDomain);
     }
 
@@ -204 +204 @@
      */
     public boolean isValidTld(String tld) {
-        tld = unicodeToASCII(tld);
-        if (allowLocal && isValidLocalTld(tld)) {
+        String asciiTld = unicodeToASCII(tld);
+        if (allowLocal && isValidLocalTld(asciiTld)) {
             return true;
         }
-        return isValidInfrastructureTld(tld)
-                || isValidGenericTld(tld)
-                || isValidCountryCodeTld(tld);
+        return isValidInfrastructureTld(asciiTld)
+                || isValidGenericTld(asciiTld)
+                || isValidCountryCodeTld(asciiTld);
     }