Changeset 9830 in josm for trunk/src/org

Timestamp:

2016-02-19T08:04:01+01:00 (8 years ago)

Author:

wiktorn

Message:

Fix findbugs warning / NPE.

See: #12350

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (1 diff)

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

@@ -628 +628 @@
                 this.currentTileMatrixSet = newLayer.tileMatrixSet;
                 this.currentLayer = newLayer;
-            }
-        }
-
+                Collection<Double> scales = new ArrayList<>(currentTileMatrixSet.tileMatrix.size());
+                for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
+                    scales.add(tileMatrix.scaleDenominator * 0.28e-03);
+                }
+                this.nativeScaleList = new ScaleList(scales);
+            }
+        }
         this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit();
-
-        Collection<Double> scales = new ArrayList<>(currentTileMatrixSet.tileMatrix.size());
-        if (currentTileMatrixSet != null) {
-            for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
-                scales.add(tileMatrix.scaleDenominator * 0.28e-03);
-            }
-        }
-        this.nativeScaleList = new ScaleList(scales);
     }