Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

Timestamp:

2024-04-22T20:59:26+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (5 diffs)

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

@@ -74 +74 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -113 +112 @@
     private int cachedTileSize = -1;
 
-    private static class TileMatrix {
+    private static final class TileMatrix {
         private String identifier;
         private double scaleDenominator;
@@ -123 +122 @@
     }
 
-    private static class TileMatrixSetBuilder {
+    private static final class TileMatrixSetBuilder {
         // sorted by zoom level
         SortedSet<TileMatrix> tileMatrix = new TreeSet<>((o1, o2) -> -1 * Double.compare(o1.scaleDenominator, o2.scaleDenominator));
@@ -194 +193 @@
     }
 
-    private static class Dimension {
+    private static final class Dimension {
         private String identifier;
         private String defaultValue;
@@ -454 +453 @@
                 setCachingStrategy(CachedFile.CachingStrategy.IfModifiedSince).
                 getInputStream()) {
-            byte[] data = Utils.readBytesFromStream(in);
+            byte[] data = in.readAllBytes();
             if (data.length == 0) {
                 cf.clear();