Changeset 10965 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2016-09-05T23:50:16+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1226 - Method parameters, caught exceptions and foreach variables should not be reassigned

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -550 +550 @@
      * Zoom to the given coordinate and scale.
      *
-     * @param newCenter The center x-value (easting) to zoom to.
-     * @param newScale The scale to use.
+     * @param center The center x-value (easting) to zoom to.
+     * @param scale The scale to use.
      * @param initial true if this call initializes the viewport.
      */
-    public void zoomTo(EastNorth newCenter, double newScale, boolean initial) {
+    public void zoomTo(EastNorth center, double scale, boolean initial) {
         Bounds b = getProjection().getWorldBoundsLatLon();
         ProjectionBounds pb = getProjection().getWorldBoundsBoxEastNorth();
+        double newScale = scale;
         int width = getWidth();
         int height = getHeight();
 
         // make sure, the center of the screen is within projection bounds
-        double east = newCenter.east();
-        double north = newCenter.north();
+        double east = center.east();
+        double north = center.north();
         east = Math.max(east, pb.minEast);
         east = Math.min(east, pb.maxEast);
         north = Math.max(north, pb.minNorth);
         north = Math.min(north, pb.maxNorth);
-        newCenter = new EastNorth(east, north);
+        EastNorth newCenter = new EastNorth(east, north);
 
         // don't zoom out too much, the world bounds should be at least