Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

Timestamp:

2015-06-20T23:42:21+02:00 (11 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -135 +135 @@
 
         for (Object propKey: layersIndex.keySet()) {
-            String s = (String)propKey;
+            String s = (String) propKey;
             if (url.equals(layersIndex.getProperty(s))) {
                 cacheDirName = s;
@@ -186 +186 @@
             WmsCacheType cacheEntries;
             try (InputStream is = new FileInputStream(indexFile)) {
-                cacheEntries = (WmsCacheType)unmarshaller.unmarshal(is);
+                cacheEntries = (WmsCacheType) unmarshaller.unmarshal(is);
             }
             totalFileSize = cacheEntries.getTotalFileSize();
@@ -440 +440 @@
             drawAtLeastOnce = true;
 
-            int xDiff = (int)((ce.east - east) * pixelPerDegree);
-            int yDiff = (int)((ce.north - north) * pixelPerDegree);
-            int size = (int)(pixelPerDegree / ce.pixelPerDegree  * tileSize);
+            int xDiff = (int) ((ce.east - east) * pixelPerDegree);
+            int yDiff = (int) ((ce.north - north) * pixelPerDegree);
+            int size = (int) (pixelPerDegree / ce.pixelPerDegree  * tileSize);
 
             int x = xDiff;
@@ -467 +467 @@
         double deltaLat = Math.abs(ll3.lat() - ll1.lat());
         double deltaLon = Math.abs(ll3.lon() - ll1.lon());
-        int precisionLat = Math.max(0, -(int)Math.ceil(Math.log10(deltaLat)) + 1);
-        int precisionLon = Math.max(0, -(int)Math.ceil(Math.log10(deltaLon)) + 1);
+        int precisionLat = Math.max(0, -(int) Math.ceil(Math.log10(deltaLat)) + 1);
+        int precisionLon = Math.max(0, -(int) Math.ceil(Math.log10(deltaLon)) + 1);
 
         String zoom = SystemOfMeasurement.METRIC.getDistText(ll1.greatCircleDistance(ll2));
@@ -493 +493 @@
             while (true) {
                 String result = String.format("%s_%." + precisionLat + "f_%." + precisionLon +"f%s.%s",
-                        zoom, ll1.lat(), ll1.lon(), counter==0?"":"_" + counter, extension);
+                        zoom, ll1.lat(), ll1.lon(), counter == 0 ? "" : "_" + counter, extension);
                 for (CacheEntry entry: projectionEntries.entries) {
                     if (entry.filename.equals(result)) {
@@ -528 +528 @@
             }
             entry = new CacheEntry(pixelPerDegree, east, north,
-                    tileSize,generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType));
+                    tileSize, generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType));
             entry.lastUsed = System.currentTimeMillis();
             entry.lastModified = entry.lastUsed;