Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 6235)
@@ -22,5 +22,4 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.concurrent.Future;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6235)
@@ -982,6 +982,4 @@
 
     public boolean putArray(String key, Collection<Collection<String>> value) {
-        //boolean changed = false;
-
         List<List<String>> oldValue = null;
         List<List<String>> valueCopy = null;
Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 6235)
@@ -124,8 +124,8 @@
                 return this;
             else {
-                int index = bbox.getIndex(level);
-                if (index == -1)
+                int idx = bbox.getIndex(level);
+                if (idx == -1)
                     return this;
-                return getChild(index).findBucket(bbox);
+                return getChild(idx).findBucket(bbox);
             }
         }
@@ -160,9 +160,9 @@
 
             for (T o : tmpcontent) {
-                int index = o.getBBox().getIndex(level);
-                if (index == -1) {
+                int idx = o.getBBox().getIndex(level);
+                if (idx == -1) {
                     __add_content(o);
                 } else {
-                    getChild(index).doAdd(o);
+                    getChild(idx).doAdd(o);
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 6235)
@@ -47,5 +47,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 6235)
@@ -30,6 +30,8 @@
     private int defaultNodesIdx, defaultLinesIdx;
 
-    public ElemStyles()
-    {
+    /**
+     * Constructs a new {@code ElemStyles}.
+     */
+    public ElemStyles() {
         styleSources = new ArrayList<StyleSource>();
     }
@@ -116,6 +118,8 @@
             osm.mappaintStyle = style.put(p.a, p.b);
         } catch (StyleCache.RangeViolatedError e) {
-            throw new AssertionError("Range violated. object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+            AssertionError error = new AssertionError("Range violated. object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
                     + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b);
+            error.initCause(e);
+            throw error;
         }
         osm.mappaintCacheIdx = cacheIdx;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 6235)
@@ -118,5 +118,5 @@
     }
 
-    private class QuadStateDecorator implements ButtonModel {
+    private final class QuadStateDecorator implements ButtonModel {
         private final ButtonModel other;
         
Index: trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 6235)
@@ -945,7 +945,4 @@
         final int buffered_lines;
 
-        /** Number of common prefix elements. */
-        final int prefix_lines = 0;
-
         /** Vector, indexed by line number, containing an equivalence code for
            each line.  It is this vector that is actually compared with that
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 6234)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 6235)
@@ -116,7 +116,7 @@
      * Caches the image data for rotated versions of the same image.
      */
-    private static final Map<Image, Map<Long, ImageResource>> rotateCache = new HashMap<Image, Map<Long, ImageResource>>();
-
-    private static final ExecutorService imageFetcher = Executors.newSingleThreadExecutor();
+    private static final Map<Image, Map<Long, ImageResource>> ROTATE_CACHE = new HashMap<Image, Map<Long, ImageResource>>();
+
+    private static final ExecutorService IMAGE_FETCHER = Executors.newSingleThreadExecutor();
 
     public interface ImageCallback {
@@ -339,5 +339,5 @@
                 }
             };
-            imageFetcher.submit(fetch);
+            IMAGE_FETCHER.submit(fetch);
         } else {
             ImageIcon result = get();
@@ -856,8 +856,8 @@
         ImageResource imageResource = null;
 
-        synchronized (rotateCache) {
-            Map<Long, ImageResource> cacheByAngle = rotateCache.get(img);
+        synchronized (ROTATE_CACHE) {
+            Map<Long, ImageResource> cacheByAngle = ROTATE_CACHE.get(img);
             if (cacheByAngle == null) {
-                rotateCache.put(img, cacheByAngle = new HashMap<Long, ImageResource>());
+                ROTATE_CACHE.put(img, cacheByAngle = new HashMap<Long, ImageResource>());
             }