Changeset 10971 in josm for trunk

Timestamp:

2016-09-07T00:10:08+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S138 - Methods should not have too many lines

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1680 +1680 @@
             ts = dts.getTileSet(displayZoomLevel);
             if (!dts.getTileSetInfo(displayZoomLevel).hasAllLoadedTiles && displayZoomLevel < zoom) {
-                /*
-                 * if we are showing tiles from lower zoom level, ensure that all tiles are loaded
-                 * as they are few, and should not trash the tile cache
-                 * This is especially needed when dts.getTileSet(zoom).tooLarge() is true and we are
-                 * not loading tiles
-                 */
+                 // if we are showing tiles from lower zoom level, ensure that all tiles are loaded as they are few,
+                 // and should not trash the tile cache
+                 // This is especially needed when dts.getTileSet(zoom).tooLarge() is true and we are not loading tiles
                 ts.loadAllTiles(false);
             }
@@ -1713 +1710 @@
                 }
                 Tile t2 = tempCornerTile(missed);
-                TileSet ts2 = getTileSet(
-                        getShiftedLatLon(tileSource.tileXYToLatLon(missed)),
-                        getShiftedLatLon(tileSource.tileXYToLatLon(t2)),
-                        newzoom);
-                // Instantiating large TileSets is expensive.  If there
-                // are no loaded tiles, don't bother even trying.
+                TileSet ts2 = getTileSet(getShiftedLatLon(tileSource.tileXYToLatLon(missed)),
+                                         getShiftedLatLon(tileSource.tileXYToLatLon(t2)),
+                                         newzoom);
+                // Instantiating large TileSets is expensive. If there are no loaded tiles, don't bother even trying.
                 if (ts2.allLoadedTiles().isEmpty()) {
                     newlyMissedTiles.add(missed);
@@ -1746 +1741 @@
                 displayZoomLevel, this);
 
-        //g.drawString("currentZoomLevel=" + currentZoomLevel, 120, 120);
         g.setColor(Color.lightGray);
 
@@ -1756 +1750 @@
             myDrawString(g, tr("increase tiles zoom level (change resolution) to see more detail"), 120, 120);
         }
-
         if (noTilesAtZoom) {
             myDrawString(g, tr("No tiles at this zoom level"), 120, 120);
@@ -1767 +1760 @@
             myDrawString(g, tr("Estimated cache size: {0}", estimateTileCacheSize()), 50, 200);
             if (tileLoader instanceof TMSCachedTileLoader) {
-                TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
                 int offset = 200;
-                for (String part: cachedTileLoader.getStats().split("\n")) {
+                for (String part: ((TMSCachedTileLoader) tileLoader).getStats().split("\n")) {
                     offset += 15;
                     myDrawString(g, tr("Cache stats: {0}", part), 50, offset);