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

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

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/JCSCacheManager.java (modified) (3 diffs)
• projection/proj/ObliqueMercator.java (modified) (1 diff)
• validation/routines/DomainValidator.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -201 +201 @@
         IDiskCacheAttributes ret;
         removeStaleFiles(cachePath + File.separator + cacheName, USE_BLOCK_CACHE.get() ? "_INDEX_v2" : "_BLOCK_v2");
-        cacheName = cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK_v2" : "_INDEX_v2");
+        String newCacheName = cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK_v2" : "_INDEX_v2");
 
         if (USE_BLOCK_CACHE.get()) {
@@ -211 +211 @@
              * wants to reduce the file size, (s)he may just go to preferences and there it should be handled (by removing old file)
              */
-            File diskCacheFile = new File(cachePath + File.separator + cacheName + ".data");
+            File diskCacheFile = new File(cachePath + File.separator + newCacheName + ".data");
             if (diskCacheFile.exists()) {
                 blockAttr.setMaxKeySize((int) Math.max(maxDiskObjects, diskCacheFile.length()/1024));
@@ -231 +231 @@
             ret.setDiskPath(cachePath);
         }
-        ret.setCacheName(cacheName);
+        ret.setCacheName(newCacheName);
 
         return ret;

trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java

@@ -414 +414 @@
         double up = (vp * cosgamma0 + sp * singamma0) / (0.5 * (qp + temp));
         if (Math.abs(Math.abs(up) - 1.0) < EPSILON) {
-            x = 0.0;
-            y = up < 0.0 ? -Math.PI / 2.0 : Math.PI / 2.0;
+            return new double[] {
+                up < 0.0 ? -(Math.PI / 2.0) : (Math.PI / 2.0),
+                0.0};
         } else {
-            y = Math.pow(e / Math.sqrt((1. + up) / (1. - up)), 1.0 / b);  //calculate t
-            y = cphi2(y);
-            x = -Math.atan2(sp * cosgamma0 - vp * singamma0, Math.cos(bra * u)) / b;
-        }
-        return new double[] {y, x};
+            return new double[] {
+                cphi2(Math.pow(e / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t
+                -Math.atan2(sp * cosgamma0 - vp * singamma0, Math.cos(bra * u)) / b};
+        }
     }
 

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);
     }