Changeset 12603 in josm for trunk

Timestamp:

2017-08-14T13:50:50+02:00 (8 years ago)

Author:

bastiK

Message:

see #14524 - make AbstractTileSourceLayer#currentZoomLevel private and use getter instead of public access

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (2 diffs)
• imagery/ZoomToBestAction.java (modified) (1 diff)
• imagery/ZoomToNativeLevelAction.java (modified) (1 diff)

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

@@ -153 +153 @@
     //public static final BooleanProperty PROP_DRAW_DEBUG = new BooleanProperty(PREFERENCE_PREFIX + ".draw_debug", false);
     /** Zoomlevel at which tiles is currently downloaded. Initial zoom lvl is set to bestZoom */
-    public int currentZoomLevel;
+    private int currentZoomLevel;
 
     private final AttributionSupport attribution = new AttributionSupport();
@@ -757 +757 @@
         }
         return true;
+    }
+
+    /**
+     * Get the current zoom level of the layer
+     * @return the current zoom level
+     * @since 12603
+     */
+    public int getZoomLevel() {
+        return currentZoomLevel;
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToBestAction.java

@@ -25 +25 @@
         super(tr("Change resolution"));
         this.layer = layer;
-        setEnabled(!layer.getDisplaySettings().isAutoZoom() && layer.getBestZoom() != layer.currentZoomLevel);
+        setEnabled(!layer.getDisplaySettings().isAutoZoom() && layer.getBestZoom() != layer.getZoomLevel());
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToNativeLevelAction.java

@@ -30 +30 @@
     @Override
     public void actionPerformed(ActionEvent ae) {
-        double newFactor = Math.sqrt(layer.getScaleFactor(layer.currentZoomLevel));
+        double newFactor = Math.sqrt(layer.getScaleFactor(layer.getZoomLevel()));
         Main.map.mapView.zoomToFactor(newFactor);
         layer.invalidate();