Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java	(revision 31790)
@@ -28,7 +28,7 @@
     public static final Font ATTR_LINK_FONT;
 
-    protected Rectangle attrTextBounds = null;
-    protected Rectangle attrToUBounds = null;
-    protected Rectangle attrImageBounds = null;
+    protected Rectangle attrTextBounds;
+    protected Rectangle attrToUBounds;
+    protected Rectangle attrImageBounds;
 
     static {
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 31790)
@@ -26,5 +26,5 @@
     private Point lastDragPoint;
 
-    private boolean isMoving = false;
+    private boolean isMoving;
 
     private boolean movementEnabled = true;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 31790)
@@ -44,5 +44,5 @@
 public class JMapViewer extends JPanel implements TileLoaderListener {
 
-    public static boolean debug = false;
+    public static boolean debug;
 
     /**
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java	(revision 31790)
@@ -142,5 +142,5 @@
      */
     protected static class CacheLinkedListElement {
-        protected CacheEntry firstElement = null;
+        protected CacheEntry firstElement;
         protected CacheEntry lastElement;
         protected int elementCount;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java	(revision 31790)
@@ -27,6 +27,6 @@
     private final class OsmTileJob implements TileJob {
         private final Tile tile;
-        private InputStream input = null;
-        private boolean force = false;
+        private InputStream input;
+        private boolean force;
 
         private OsmTileJob(Tile tile) {
@@ -101,6 +101,6 @@
     public Map<String, String> headers = new HashMap<>();
 
-    public int timeoutConnect = 0;
-    public int timeoutRead = 0;
+    public int timeoutConnect;
+    public int timeoutRead;
 
     protected TileLoaderListener listener;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java	(revision 31790)
@@ -41,7 +41,7 @@
     protected BufferedImage image;
     protected String key;
-    protected volatile boolean loaded = false; // field accessed by multiple threads without any monitors, needs to be volatile
-    protected volatile boolean loading = false;
-    protected volatile boolean error = false;
+    protected volatile boolean loaded; // field accessed by multiple threads without any monitors, needs to be volatile
+    protected volatile boolean loading;
+    protected volatile boolean error;
     protected String error_message;
 
@@ -89,5 +89,5 @@
 
     private static class CachedCallable<V> implements Callable<V> {
-        private V result = null;
+        private V result;
         private Callable<V> callable;
 
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java	(revision 31790)
@@ -48,5 +48,5 @@
     private static final Pattern quadkeyPattern = Pattern.compile("\\{quadkey\\}");
     private static final Pattern culturePattern = Pattern.compile("\\{culture\\}");
-    private String brandLogoUri = null;
+    private String brandLogoUri;
 
     /**
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java	(revision 31790)
@@ -16,5 +16,5 @@
         private static final String[] SERVER = {"a", "b", "c"};
 
-        private int serverNum = 0;
+        private int serverNum;
 
         /**
@@ -42,5 +42,5 @@
         private static final String[] SERVER = {"a", "b", "c"};
 
-        private int serverNum = 0;
+        private int serverNum;
 
         /**
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java	(revision 31790)
@@ -56,5 +56,5 @@
 
     /** cached latitude used in {@link #tileYToLat(double, int)} */
-    private double cachedLat = 0;
+    private double cachedLat;
 
     /**
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java	(revision 31790)
@@ -5,5 +5,5 @@
 
     protected int maxZoom;
-    protected int minZoom = 0;
+    protected int minZoom;
 
     public TMSTileSource(TileSourceInfo info) {
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 31789)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 31790)
@@ -32,6 +32,6 @@
 public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTileSource {
 
-    private Random rand = null;
-    private String[] randomParts = null;
+    private Random rand;
+    private String[] randomParts;
     private final Map<String, String> headers = new HashMap<>();