Changeset 17509 in josm for trunk/src/org

Timestamp:

2021-02-21T16:10:35+01:00 (3 years ago)

Author:

wiktorn

Message:

Checkstyle fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)

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

@@ -188 +188 @@
      * Simple implementation. All errors should be cached as empty. Though some JDK (JDK8 on Windows for example)
      * doesn't return 4xx error codes, instead they do throw an FileNotFoundException or IOException
-     * @param responseCode
-     * @param headerFields
+     * @param headerFields headers sent by server
+     * @param responseCode http status code
      *
      * @return true if we should put empty object into cache, regardless of what remote resource has returned

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

@@ -136 +136 @@
         }
         if (isNotImage(headers, statusCode)) {
-            String message = detectErrorMessage( new String(content, StandardCharsets.UTF_8));
+            String message = detectErrorMessage(new String(content, StandardCharsets.UTF_8));
             if (message != null && !message.isEmpty()) {
                 tile.setError(message);
@@ -148 +148 @@
         if (statusCode == 200 && headers.containsKey("Content-Type") && !headers.get("Content-Type").isEmpty()) {
             String contentType = headers.get("Content-Type").stream().findAny().get();
-            if (contentType !=null && !contentType.startsWith("image")) {
+            if (contentType != null && !contentType.startsWith("image")) {
                 Logging.warn("Image not returned for tile: " + url + " content type was: " + contentType);
                 // not an image - do not store response in cache, so next time it will be queried again from the server

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

@@ -664 +664 @@
                 Math.pow(2d, ZOOM_OFFSET.get()) * visibileTiles // use offset to decide, how many tiles are visible
                 * 8);
-        Logging.info("AbstractTileSourceLayer: estimated tiles proccessed on current zoom level: {0}, estimated cache size: {1}", visibileTiles, ret);
+        Logging.info("AbstractTileSourceLayer: estimated tiles proccessed on current zoom level: {0}, estimated cache size: {1}",
+                visibileTiles, ret);
         return ret;
     }
@@ -1598 +1599 @@
             int[] otherZooms = {1, 2, -1, -2, -3, -4, -5};
 
-            for(int otherZoom: otherZooms) {
+            for (int otherZoom: otherZooms) {
                 missedTiles = tryLoadFromDifferentZoom(g, displayZoomLevel, missedTiles, otherZoom);
                 if (missedTiles.isEmpty()) {