Changeset 11860 in josm for trunk/src

Timestamp:

2017-04-09T13:52:57+02:00 (8 years ago)

Author:

Don-vip

Message:

see #7427 - checkstyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/TemplatedWMSTileSource.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• gui/layer/TMSLayer.java (modified) (2 diffs)
• gui/layer/WMSLayer.java (modified) (2 diffs)
• gui/layer/imagery/ReprojectionTile.java (modified) (5 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.WMSLayer;

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

@@ -1076 +1076 @@
     }
 
-     /**
+    /**
      * Draw a tile image on screen.
      * @param g the Graphics2D
@@ -1184 +1184 @@
 
             // applying all filters to this layer
-            img = applyImageProcessors((BufferedImage) img);
+            img = applyImageProcessors(img);
 
             Shape clip;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.layer;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 import org.apache.commons.jcs.access.CacheAccess;
@@ -24 +21 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.projection.Projection;
 
 /**

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

@@ -13 +13 @@
 import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.JOptionPane;
 
 import org.apache.commons.jcs.access.CacheAccess;
@@ -29 +28 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
 import org.openstreetmap.josm.tools.CheckParameterUtil;

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

@@ -18 +18 @@
 /**
  * Tile class that stores a reprojected version of the original tile.
+ * @since 11858
  */
 public class ReprojectionTile extends Tile {
@@ -25 +26 @@
     protected boolean maxZoomReached;
 
+    /**
+     * Constructs a new {@code ReprojectionTile}.
+     * @param source sourec tile
+     * @param xtile X coordinate
+     * @param ytile Y coordinate
+     * @param zoom zoom level
+     */
     public ReprojectionTile(TileSource source, int xtile, int ytile, int zoom) {
         super(source, xtile, ytile, zoom);
@@ -50 +58 @@
         return true;
     }
-    
+
     @Override
     public void setImage(BufferedImage image) {
@@ -100 +108 @@
         Dimension dim = getDimension(pbTargetAligned, scaleMapView);
         Integer scaleFix = limitScale(source.getTileSize(), Math.sqrt(dim.getWidth() * dim.getHeight()));
-        double scale = scaleFix == null ? scaleMapView : scaleMapView * scaleFix;
+        double scale = scaleFix == null ? scaleMapView : (scaleMapView * scaleFix);
 
         ImageWarp.PointTransform pointTransform = pt -> {
@@ -153 +161 @@
      */
     protected Integer limitScale(double lenOrig, double lenNow) {
-        double LIMIT = 3;
-        if (lenNow > LIMIT * lenOrig) {
-            int n = (int) Math.ceil((Math.log(lenNow) - Math.log(LIMIT * lenOrig)) / Math.log(2));
+        final double limit = 3;
+        if (lenNow > limit * lenOrig) {
+            int n = (int) Math.ceil((Math.log(lenNow) - Math.log(limit * lenOrig)) / Math.log(2));
             int f = 1 << n;
             double lenNowFixed = lenNow / f;
-            if (!(lenNowFixed <= LIMIT * lenOrig)) throw new AssertionError();
-            if (!(lenNowFixed > LIMIT * lenOrig / 2)) throw  new AssertionError();
+            if (lenNowFixed > limit * lenOrig) throw new AssertionError();
+            if (lenNowFixed <= limit * lenOrig / 2) throw new AssertionError();
             return f;
         }
-        if (lenNow > LIMIT * lenOrig / 2)
+        if (lenNow > limit * lenOrig / 2)
             return 1;
         return null;