Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 31434)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 31435)
@@ -39,11 +39,11 @@
     private static final long serialVersionUID = 1L;
 
-    private JMapViewerTree treeMap = null;
-
-    private JLabel zoomLabel = null;
-    private JLabel zoomValue = null;
-
-    private JLabel mperpLabelName = null;
-    private JLabel mperpLabelValue = null;
+    private final JMapViewerTree treeMap;
+
+    private final JLabel zoomLabel;
+    private final JLabel zoomValue;
+
+    private final JLabel mperpLabelName;
+    private final JLabel mperpLabelValue;
 
     /**
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java	(revision 31434)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java	(revision 31435)
@@ -23,5 +23,5 @@
     private static int workerThreadMaxCount = 8;
 
-    private BlockingDeque<TileJob> jobQueue = new LinkedBlockingDeque<>();
+    private final BlockingDeque<TileJob> jobQueue = new LinkedBlockingDeque<>();
 
     private JobDispatcher() {
@@ -113,5 +113,5 @@
     }
 
-    protected JobThread addWorkerThread() {
+    private JobThread addWorkerThread() {
         JobThread jobThread = new JobThread(++workerThreadId);
         synchronized (this) {
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java	(revision 31434)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java	(revision 31435)
@@ -53,5 +53,5 @@
     public void calculateVisibleTexts() {
         Boolean calculate = null;
-        if (layers != null && layers.size() > 0) {
+        if (layers != null && !layers.isEmpty()) {
             calculate = layers.get(0).isVisibleTexts();
             for (int i = 1; i < layers.size(); i++) {
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileXY.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileXY.java	(revision 31434)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileXY.java	(revision 31435)
@@ -10,9 +10,10 @@
      * x index of the tile (horizontal)
      */
-    private double x;
+    private final double x;
+
     /**
      * y number of the tile (vertical)
      */
-    private double y;
+    private final double y;
 
     /**
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java	(revision 31434)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java	(revision 31435)
@@ -26,6 +26,6 @@
     protected String baseUrl;
     protected String id;
-    private Map<String, String> noTileHeaders;
-    private Map<String, String> metadataHeaders;
+    private final Map<String, String> noTileHeaders;
+    private final Map<String, String> metadataHeaders;
     protected int tileSize;
     protected OsmMercator osmMercator;
@@ -46,5 +46,5 @@
         this.metadataHeaders = info.getMetadataHeaders();
         this.tileSize = info.getTileSize();
-        osmMercator = new OsmMercator(this.tileSize);
+        this.osmMercator = new OsmMercator(this.tileSize);
     }
 
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java	(revision 31434)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java	(revision 31435)
@@ -43,5 +43,5 @@
     }
 
-    /* IRS by default */
+    /** IRS by default */
     private ScanexLayer layer = ScanexLayer.IRS;
 
@@ -50,10 +50,8 @@
         String url = info.getUrl();
 
-        for (ScanexLayer layer : ScanexLayer.values()) {
-            if (url.equalsIgnoreCase(layer.getName())) {
-                this.layer = layer;
-                /*
-                 * Override baseUrl and maxZoom in base class.
-                 */
+        for (ScanexLayer slayer : ScanexLayer.values()) {
+            if (url.equalsIgnoreCase(slayer.getName())) {
+                this.layer = slayer;
+                // Override baseUrl and maxZoom in base class.
                 this.baseUrl = DEFAULT_URL;
                 if (maxZoom == 0)
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 31434)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 31435)
@@ -34,5 +34,5 @@
     private Random rand = null;
     private String[] randomParts = null;
-    private Map<String, String> headers = new HashMap<>();
+    private final Map<String, String> headers = new HashMap<>();
 
     private static final String COOKIE_HEADER   = "Cookie";