Changeset 31434 in osm for applications/viewer

Timestamp:

2015-08-02T17:09:43+02:00 (10 years ago)

Author:

donvip

Message:

[jmapviewer] fix a bunch of Sonar issues

Location:

applications/viewer/jmapviewer

Files:

• .settings/org.sonar.ide.eclipse.core.prefs (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java (modified) (2 diffs)
• src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java (modified) (2 diffs)
• src/org/openstreetmap/gui/jmapviewer/Demo.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (modified) (3 diffs)
• src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java (modified) (4 diffs)
• src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java (modified) (4 diffs)
• src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/Style.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/Tile.java (modified) (3 diffs)
• src/org/openstreetmap/gui/jmapviewer/TileController.java (modified) (2 diffs)
• src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java (modified) (3 diffs)
• src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java (modified) (1 diff)
• src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (7 diffs)
• src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java (modified) (4 diffs)
• src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java (modified) (7 diffs)

applications/viewer/jmapviewer/.settings/org.sonar.ide.eclipse.core.prefs

@@ -1 +1 @@
 eclipse.preferences.version=1
 extraProperties=
-lastAnalysisDate=1438525666226
+lastAnalysisDate=1438527074033
 projectKey=jmapviewer
 serverUrl=https\://josm.openstreetmap.de/sonar

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java

@@ -11 +11 @@
     private Style style;
     private Boolean visible;
-    private Boolean visibleTexts = true;
+    private Boolean visibleTexts = Boolean.TRUE;
 
     public AbstractLayer(String name) {
@@ -42 +42 @@
         setDescription(description);
         setStyle(style);
-        setVisible(true);
+        setVisible(Boolean.TRUE);
 
         if (parent != null) parent.add(this);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java

@@ -23 +23 @@
 
     private static final int MAC_MOUSE_BUTTON3_MASK = MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON1_DOWN_MASK;
-    public DefaultMapController(JMapViewer map) {
-        super(map);
-    }
 
     private Point lastDragPoint;
@@ -38 +35 @@
     private boolean wheelZoomEnabled = true;
     private boolean doubleClickZoomEnabled = true;
+
+    public DefaultMapController(JMapViewer map) {
+        super(map);
+    }
 
     @Override

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java

@@ -202 +202 @@
         Layer spain = treeMap.addLayer("Spain");
         map().addMapMarker(new MapMarkerCircle(spain, "La Garena", new Coordinate(40.4838, -3.39), .002));
-        spain.setVisible(false);
+        spain.setVisible(Boolean.FALSE);
 
         Layer wales = treeMap.addLayer("UK");

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -92 +92 @@
 
     protected transient AttributionSupport attribution = new AttributionSupport();
+
+    protected EventListenerList evtListenerList = new EventListenerList();
 
     /**
@@ -1099 +1101 @@
     }
 
-    protected EventListenerList evtListenerList = new EventListenerList();
-
     /**
      * @param listener listener to set
@@ -1120 +1120 @@
      * @param evt event to dispatch
      */
-    void fireJMVEvent(JMVCommandEvent evt) {
+    private void fireJMVEvent(JMVCommandEvent evt) {
         Object[] listeners = evtListenerList.getListenerList();
         for (int i = 0; i < listeners.length; i += 2) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java

@@ -115 +115 @@
     }
 
-    private void setVisibleTexts(AbstractLayer layer, boolean visible) {
+    private static void setVisibleTexts(AbstractLayer layer, boolean visible) {
         layer.setVisibleTexts(visible);
         if (layer instanceof LayerGroup) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java

@@ -21 +21 @@
     private static final JobDispatcher instance = new JobDispatcher();
 
+    private static int workerThreadMaxCount = 8;
+
+    private BlockingDeque<TileJob> jobQueue = new LinkedBlockingDeque<>();
+
+    private JobDispatcher() {
+        addWorkerThread().firstThread = true;
+    }
+
     /**
      * @return the singelton instance of the {@link JobDispatcher}
@@ -27 +35 @@
         return instance;
     }
-
-    private JobDispatcher() {
-        addWorkerThread().firstThread = true;
-    }
-
-    protected BlockingDeque<TileJob> jobQueue = new LinkedBlockingDeque<>();
-
-    private static int workerThreadMaxCount = 8;
 
     /**
@@ -47 +47 @@
      * Type of queue, FIFO if <code>false</code>, LIFO if <code>true</code>
      */
-    protected boolean modeLIFO = false;
+    private boolean modeLIFO = false;
 
     /**
      * Total number of worker threads currently idle or active
      */
-    protected int workerThreadCount = 0;
+    private int workerThreadCount = 0;
 
     /**
      * Number of worker threads currently idle
      */
-    protected int workerThreadIdleCount = 0;
+    private int workerThreadIdleCount = 0;
 
     /**
      * Just an id for identifying an worker thread instance
      */
-    protected int workerThreadId = 0;
+    private int workerThreadId = 0;
 
     /**
@@ -124 +124 @@
     public class JobThread extends Thread {
 
-        Runnable job;
-        boolean firstThread = false;
+        private Runnable job;
+        private boolean firstThread = false;
 
+        /**
+         * Constructs a new {@code JobThread}.
+         * @param threadId Thread ID
+         */
         public JobThread(int threadId) {
             super("OSMJobThread " + threadId);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java

@@ -21 +21 @@
 public class MapMarkerCircle extends MapObjectImpl implements MapMarker {
 
-    Coordinate coord;
-    double radius;
-    STYLE markerStyle;
+    private Coordinate coord;
+    private double radius;
+    private STYLE markerStyle;
 
+    /**
+     * Constructs a new {@code MapMarkerCircle}.
+     * @param coord Coordinates of the map marker
+     * @param radius Radius of the map marker position
+     */
     public MapMarkerCircle(Coordinate coord, double radius) {
         this(null, null, coord, radius);
     }
 
+    /**
+     * Constructs a new {@code MapMarkerCircle}.
+     * @param name Name of the map marker
+     * @param coord Coordinates of the map marker
+     * @param radius Radius of the map marker position
+     */
     public MapMarkerCircle(String name, Coordinate coord, double radius) {
         this(null, name, coord, radius);
     }
 
+    /**
+     * Constructs a new {@code MapMarkerCircle}.
+     * @param layer Layer of the map marker
+     * @param coord Coordinates of the map marker
+     * @param radius Radius of the map marker position
+     */
     public MapMarkerCircle(Layer layer, Coordinate coord, double radius) {
         this(layer, null, coord, radius);
     }
 
+    /**
+     * Constructs a new {@code MapMarkerCircle}.
+     * @param lat Latitude of the map marker
+     * @param lon Longitude of the map marker
+     * @param radius Radius of the map marker position
+     */
     public MapMarkerCircle(double lat, double lon, double radius) {
         this(null, null, new Coordinate(lat, lon), radius);
     }
 
+    /**
+     * Constructs a new {@code MapMarkerCircle}.
+     * @param layer Layer of the map marker
+     * @param lat Latitude of the map marker
+     * @param lon Longitude of the map marker
+     * @param radius Radius of the map marker position
+     */
     public MapMarkerCircle(Layer layer, double lat, double lon, double radius) {
         this(layer, null, new Coordinate(lat, lon), radius);
     }
 
+    /**
+     * Constructs a new {@code MapMarkerCircle}.
+     * @param layer Layer of the map marker
+     * @param name Name of the map marker
+     * @param coord Coordinates of the map marker
+     * @param radius Radius of the map marker position
+     */
     public MapMarkerCircle(Layer layer, String name, Coordinate coord, double radius) {
         this(layer, name, coord, radius, STYLE.VARIABLE, getDefaultStyle());
     }
 
+    /**
+     * Constructs a new {@code MapMarkerCircle}.
+     * @param layer Layer of the map marker
+     * @param name Name of the map marker
+     * @param coord Coordinates of the map marker
+     * @param radius Radius of the map marker position
+     * @param markerStyle Marker style (fixed or variable)
+     * @param style Graphical style
+     */
     public MapMarkerCircle(Layer layer, String name, Coordinate coord, double radius, STYLE markerStyle, Style style) {
         super(layer, name, style);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java

@@ -43 +43 @@
     public synchronized void addTile(Tile tile) {
         CacheEntry entry = createCacheEntry(tile);
-            hash.put(tile.getKey(), entry);
-            lruTiles.addFirst(entry);
-            if (hash.size() > cacheSize) {
-                removeOldEntries();
-            }
+        hash.put(tile.getKey(), entry);
+        lruTiles.addFirst(entry);
+        if (hash.size() > cacheSize) {
+            removeOldEntries();
+        }
     }
 
@@ -116 +116 @@
      */
     protected static class CacheEntry {
-        Tile tile;
-        CacheEntry next;
-        CacheEntry prev;
+        private Tile tile;
+        private CacheEntry next;
+        private CacheEntry prev;
 
         protected CacheEntry(Tile tile) {
@@ -137 +137 @@
         protected int elementCount;
 
+        /**
+         * Constructs a new {@code CacheLinkedListElement}.
+         */
         public CacheLinkedListElement() {
             clear();
@@ -208 +211 @@
             return firstElement;
         }
-
     }
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -24 +24 @@
     private final class OsmTileJob implements TileJob {
         private final Tile tile;
-        InputStream input = null;
-        boolean force = false;
+        private InputStream input = null;
+        private boolean force = false;
 
         private OsmTileJob(Tile tile) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Style.java

@@ -60 +60 @@
     }
 
-    private AlphaComposite getAlphaComposite(Color color) {
+    private static AlphaComposite getAlphaComposite(Color color) {
         return color.getAlpha() == 255 ? OPAQUE : TRANSPARENCY;
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java

@@ -89 +89 @@
     /**
      * Tries to get tiles of a lower or higher zoom level (one or two level
-     * difference) from cache and use it as a placeholder until the tile has
-     * been loaded.
+     * difference) from cache and use it as a placeholder until the tile has been loaded.
      */
     public void loadPlaceholderFromCache(TileCache cache) {
         BufferedImage tmpImage = new BufferedImage(source.getTileSize(), source.getTileSize(), BufferedImage.TYPE_INT_RGB);
         Graphics2D g = (Graphics2D) tmpImage.getGraphics();
-        // g.drawImage(image, 0, 0, null);
         for (int zoomDiff = 1; zoomDiff < 5; zoomDiff++) {
             // first we check if there are already the 2^x tiles
             // of a higher detail level
-            int zoom_high = zoom + zoomDiff;
-            if (zoomDiff < 3 && zoom_high <= JMapViewer.MAX_ZOOM) {
+            int zoomHigh = zoom + zoomDiff;
+            if (zoomDiff < 3 && zoomHigh <= JMapViewer.MAX_ZOOM) {
                 int factor = 1 << zoomDiff;
-                int xtile_high = xtile << zoomDiff;
-                int ytile_high = ytile << zoomDiff;
+                int xtileHigh = xtile << zoomDiff;
+                int ytileHigh = ytile << zoomDiff;
                 double scale = 1.0 / factor;
                 g.setTransform(AffineTransform.getScaleInstance(scale, scale));
@@ -109 +107 @@
                 for (int x = 0; x < factor; x++) {
                     for (int y = 0; y < factor; y++) {
-                        Tile tile = cache.getTile(source, xtile_high + x, ytile_high + y, zoom_high);
+                        Tile tile = cache.getTile(source, xtileHigh + x, ytileHigh + y, zoomHigh);
                         if (tile != null && tile.isLoaded()) {
                             paintedTileCount++;
@@ -122 +120 @@
             }
 
-            int zoom_low = zoom - zoomDiff;
-            if (zoom_low >= JMapViewer.MIN_ZOOM) {
-                int xtile_low = xtile >> zoomDiff;
-                int ytile_low = ytile >> zoomDiff;
-                int factor = (1 << zoomDiff);
+            int zoomLow = zoom - zoomDiff;
+            if (zoomLow >= JMapViewer.MIN_ZOOM) {
+                int xtileLow = xtile >> zoomDiff;
+                int ytileLow = ytile >> zoomDiff;
+                int factor = 1 << zoomDiff;
                 double scale = factor;
                 AffineTransform at = new AffineTransform();
-                int translate_x = (xtile % factor) * source.getTileSize();
-                int translate_y = (ytile % factor) * source.getTileSize();
-                at.setTransform(scale, 0, 0, scale, -translate_x, -translate_y);
+                int translateX = (xtile % factor) * source.getTileSize();
+                int translateY = (ytile % factor) * source.getTileSize();
+                at.setTransform(scale, 0, 0, scale, -translateX, -translateY);
                 g.setTransform(at);
-                Tile tile = cache.getTile(source, xtile_low, ytile_low, zoom_low);
+                Tile tile = cache.getTile(source, xtileLow, ytileLow, zoomLow);
                 if (tile != null && tile.isLoaded()) {
                     tile.paint(g, 0, 0);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileController.java

@@ -13 +13 @@
     protected TileSource tileSource;
 
-    JobDispatcher jobDispatcher;
+    protected JobDispatcher jobDispatcher;
 
     public TileController(TileSource source, TileCache tileCache, TileLoaderListener listener) {
@@ -33 +33 @@
      */
     public Tile getTile(int tilex, int tiley, int zoom) {
-        int max = (1 << zoom);
+        int max = 1 << zoom;
         if (tilex < 0 || tilex >= max || tiley < 0 || tiley >= max)
             return null;

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java

@@ -22 +22 @@
     private final CheckBoxNodePanel panel = new CheckBoxNodePanel();
     private final DefaultTreeCellRenderer defaultRenderer = new DefaultTreeCellRenderer();
-    private final Color selectionForeground, selectionBackground;
-    private final Color textForeground, textBackground;
+    private final Color selectionForeground;
+    private final Color selectionBackground;
+    private final Color textForeground;
+    private final Color textBackground;
 
-    protected CheckBoxNodePanel getPanel() {
-        return panel;
-    }
-
+    /**
+     * Constructs a new {@code CheckBoxNodeRenderer}.
+     */
     public CheckBoxNodeRenderer() {
         final Font fontValue = UIManager.getFont("Tree.font");
@@ -43 +44 @@
     }
 
+    protected CheckBoxNodePanel getPanel() {
+        return panel;
+    }
+
     public void addNodeListener(MouseAdapter listener) {
         panel.addMouseListener(listener);
     }
+
     // -- TreeCellRenderer methods --
 
@@ -65 +71 @@
         //panel.label.setText(stringValue);
 
-        panel.setSelected(false);
+        panel.setSelected(Boolean.FALSE);
 
         panel.setEnabled(tree.isEnabled());

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java

@@ -90 +90 @@
 
     public static void main(final String[] args) {
-        final DefaultMutableTreeNode root = new DefaultMutableTreeNode(new CheckBoxNodeData("Root", true));
+        final DefaultMutableTreeNode root = new DefaultMutableTreeNode(new CheckBoxNodeData("Root", Boolean.TRUE));
 
         final DefaultMutableTreeNode accessibility =

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java

@@ -17 +17 @@
 public interface MapMarker extends MapObject, ICoordinate{
 
-    public static enum STYLE {FIXED, VARIABLE}
+    public static enum STYLE {
+        FIXED,
+        VARIABLE
+    }
 
     /**

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java

@@ -26 +26 @@
     public AbstractOsmTileSource(String name, String base_url, String id) {
         super(new TileSourceInfo(name, base_url, id));
-
     }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java

@@ -283 +283 @@
     }
 
-    private int getTileMax(int zoom) {
+    private static int getTileMax(int zoom) {
         return (int) Math.pow(2.0, zoom) - 1;
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -39 +39 @@
 public class BingAerialTileSource extends AbstractTMSTileSource {
 
-    private static String API_KEY = "Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU";
+    private static final String API_KEY = "Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU";
     private static volatile Future<List<Attribution>> attributions; // volatile is required for getAttribution(), see below.
     private static String imageUrlTemplate;
@@ -57 +57 @@
     }
 
+    /**
+     * Constructs a new {@code BingAerialTileSource}.
+     */
     public BingAerialTileSource(TileSourceInfo info) {
         super(info);
@@ -62 +65 @@
 
     protected static class Attribution {
-        String attribution;
-        int minZoom;
-        int maxZoom;
-        Coordinate min;
-        Coordinate max;
+        private String attribution;
+        private int minZoom;
+        private int maxZoom;
+        private Coordinate min;
+        private Coordinate max;
     }
 
@@ -100 +103 @@
             imageUrlTemplate = xpath.compile("//ImageryMetadata/ImageUrl/text()").evaluate(document);
             imageUrlTemplate = culturePattern.matcher(imageUrlTemplate).replaceAll(Locale.getDefault().toString());
-            imageryZoomMax = Integer.parseInt(xpath.compile("//ImageryMetadata/ZoomMax/text()").evaluate(document));
+            imageryZoomMax = Integer.valueOf(xpath.compile("//ImageryMetadata/ZoomMax/text()").evaluate(document));
 
             NodeList subdomainTxt = (NodeList) xpath.compile("//ImageryMetadata/ImageUrlSubdomains/string/text()")
@@ -137 +140 @@
                     attr.minZoom = Integer.parseInt(zoomMinXpath.evaluate(areaNode));
 
-                    Double southLat = Double.parseDouble(southLatXpath.evaluate(areaNode));
-                    Double northLat = Double.parseDouble(northLatXpath.evaluate(areaNode));
-                    Double westLon = Double.parseDouble(westLonXpath.evaluate(areaNode));
-                    Double eastLon = Double.parseDouble(eastLonXpath.evaluate(areaNode));
+                    Double southLat = Double.valueOf(southLatXpath.evaluate(areaNode));
+                    Double northLat = Double.valueOf(northLatXpath.evaluate(areaNode));
+                    Double westLon = Double.valueOf(westLonXpath.evaluate(areaNode));
+                    Double eastLon = Double.valueOf(eastLonXpath.evaluate(areaNode));
                     attr.min = new Coordinate(southLat, westLon);
                     attr.max = new Coordinate(northLat, eastLon);
@@ -281 +284 @@
                             && topLeft.getLat() > attr.min.getLat() && botRight.getLat() < attr.max.getLat()) {
                         a.append(attr.attribution);
-                        a.append(" ");
+                        a.append(' ');
                     }
                 }
@@ -292 +295 @@
     }
 
-    static String computeQuadTree(int zoom, int tilex, int tiley) {
+    private static String computeQuadTree(int zoom, int tilex, int tiley) {
         StringBuilder k = new StringBuilder();
         for (int i = zoom; i > 0; i--) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java

@@ -16 +16 @@
         private static final String[] SERVER = {"a", "b", "c"};
 
-        private int SERVER_NUM = 0;
+        private int serverNum = 0;
 
         /**
@@ -27 +27 @@
         @Override
         public String getBaseUrl() {
-            String url = String.format(this.baseUrl, new Object[] {SERVER[SERVER_NUM]});
-            SERVER_NUM = (SERVER_NUM + 1) % SERVER.length;
+            String url = String.format(this.baseUrl, new Object[] {SERVER[serverNum]});
+            serverNum = (serverNum + 1) % SERVER.length;
             return url;
-        }
-
-        @Override
-        public int getMaxZoom() {
-            return 19;
         }
 
@@ -52 +47 @@
         private static final String[] SERVER = {"a", "b", "c"};
 
-        private int SERVER_NUM = 0;
+        private int serverNum = 0;
 
         /**
@@ -63 +58 @@
         @Override
         public String getBaseUrl() {
-            String url = String.format(this.baseUrl, new Object[] {SERVER[SERVER_NUM]});
-            SERVER_NUM = (SERVER_NUM + 1) % SERVER.length;
+            String url = String.format(this.baseUrl, new Object[] {SERVER[serverNum]});
+            serverNum = (serverNum + 1) % SERVER.length;
             return url;
         }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java

@@ -10 +10 @@
  *
  * Earth is assumed an ellipsoid in this projection, unlike
- * sphere in OsmMercator, so latitude calculation differs
- * a lot.
+ * sphere in OsmMercator, so latitude calculation differs a lot.
  *
  * The longitude calculation is the same as in OsmMercator,
@@ -21 +20 @@
     private static final String DEFAULT_URL = "http://maps.kosmosnimki.ru";
     private static final int DEFAULT_MAXZOOM = 14;
-    private static String API_KEY = "4018C5A9AECAD8868ED5DEB2E41D09F7";
+    private static final String API_KEY = "4018C5A9AECAD8868ED5DEB2E41D09F7";
 
     private enum ScanexLayer {
@@ -45 +44 @@
 
     /* IRS by default */
-    private ScanexLayer Layer = ScanexLayer.IRS;
+    private ScanexLayer layer = ScanexLayer.IRS;
 
     public ScanexTileSource(TileSourceInfo info) {
@@ -53 +52 @@
         for (ScanexLayer layer : ScanexLayer.values()) {
             if (url.equalsIgnoreCase(layer.getName())) {
-                this.Layer = layer;
+                this.layer = layer;
                 /*
                  * Override baseUrl and maxZoom in base class.
@@ -77 +76 @@
         tiley = tmp - tiley - 1;
 
-        return this.Layer.getUri() + "&apikey=" + API_KEY + "&x=" + tilex + "&y=" + tiley + "&z=" + zoom;
-    }
-
-    @Override
-    public TileUpdate getTileUpdate() {
-        return TileUpdate.IfNoneMatch;
+        return this.layer.getUri() + "&apikey=" + API_KEY + "&x=" + tilex + "&y=" + tiley + "&z=" + zoom;
     }
 
@@ -122 +116 @@
      * value.
      */
-    private double cached_lat = 0;
+    private double cachedLat = 0;
     private double tileYToLat(double y, int zoom) {
-        double lat0, lat;
-
-        lat = cached_lat;
+        double lat0;
+        double lat = cachedLat;
         do {
             lat0 = lat;
-            lat = lat - Math.toDegrees(NextTerm(Math.toRadians(lat), y, zoom));
+            lat = lat - Math.toDegrees(nextTerm(Math.toRadians(lat), y, zoom));
             if (lat > OsmMercator.MAX_LAT || lat < OsmMercator.MIN_LAT) {
                 Random r = new Random();
@@ -137 +130 @@
         } while ((Math.abs(lat0 - lat) > 0.000001));
 
-        cached_lat = lat;
+        cachedLat = lat;
 
-        return (lat);
+        return lat;
     }
 
     /* Next term in Newton's polynomial */
-    private double NextTerm(double lat, double y, int zoom) {
+    private static double nextTerm(double lat, double y, int zoom) {
         double sinl = Math.sin(lat);
         double cosl = Math.cos(lat);
-        double ec, f, df;
 
         zoom = (int) Math.pow(2.0, zoom - 1);
-        ec = Math.exp((1 - y/zoom)*Math.PI);
+        double ec = Math.exp((1 - y/zoom)*Math.PI);
 
-        f = (Math.tan(Math.PI/4+lat/2) -
+        double f = (Math.tan(Math.PI/4+lat/2) -
             ec * Math.pow(Math.tan(Math.PI/4 + Math.asin(E * sinl)/2), E));
-        df = 1/(1 - sinl) - ec * E * cosl/((1 - E * sinl) *
+        double df = 1/(1 - sinl) - ec * E * cosl/((1 - E * sinl) *
             (Math.sqrt(1 - E * E * sinl * sinl)));
 
-        return (f/df);
+        return f/df;
     }
 }