Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 8400)
+++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 8401)
@@ -63,8 +63,17 @@
 
     public static class LIFOQueue extends LinkedBlockingDeque<Runnable> {
+
+        /**
+         * Constructs a new {@code LIFOQueue} with a capacity of {@link Integer#MAX_VALUE}.
+         */
         public LIFOQueue() {
             super();
         }
 
+        /**
+         * Constructs a new {@code LIFOQueue} with the given (fixed) capacity.
+         * @param capacity the capacity of this deque
+         * @throws IllegalArgumentException if {@code capacity} is less than 1
+         */
         public LIFOQueue(int capacity) {
             super(capacity);
@@ -83,5 +92,5 @@
 
 
-    /*
+    /**
      * ThreadPoolExecutor starts new threads, until THREAD_LIMIT is reached. Then it puts tasks into LIFOQueue, which is fairly
      * small, but we do not want a lot of outstanding tasks queued, but rather prefer the class consumer to resubmit the task, which are
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 8400)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 8401)
@@ -305,5 +305,5 @@
 
                     errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
-                            tr(s, key, templates.toString()), MessageFormat.format(s, key), ROLE_UNKNOWN, n));
+                            tr(s, key, templates), MessageFormat.format(s, key), ROLE_UNKNOWN, n));
                 } else {
                     String s = marktr("Empty role type found when expecting one of {0}");
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 8400)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 8401)
@@ -64,6 +64,6 @@
     private boolean canceled = false;
 
-    private ImageIcon iconResolved;
-    private ImageIcon iconUnresolved;
+    private final ImageIcon iconResolved;
+    private final ImageIcon iconUnresolved;
     private StatisticsTableModel statisticsModel;
     private JPanel pnlTagResolver;
@@ -306,6 +306,6 @@
             } else {
                 boolean enabled = true;
-                for (OsmPrimitiveType type: resolvers.keySet()) {
-                    enabled &= resolvers.get(type).getModel().isResolvedCompletely();
+                for (TagConflictResolver val: resolvers.values()) {
+                    enabled &= val.getModel().isResolvedCompletely();
                 }
                 setEnabled(enabled);
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 8400)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 8401)
@@ -554,4 +554,5 @@
         tileOptionMenu.add(new JMenuItem(new AbstractAction(
                 tr("Request Update")) {
+            @Override
             public void actionPerformed(ActionEvent ae) {
                 if (clickedTile != null) {
@@ -1080,5 +1081,5 @@
 
     private final TileSet nullTileSet = new TileSet((LatLon)null, (LatLon)null, 0);
-    private class TileSet {
+    private final class TileSet {
         private int x0, x1, y0, y1;
         private int zoom;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 8400)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 8401)
@@ -883,5 +883,5 @@
                 case 0:
                     if (info.projectionCode == null) return "";
-                    return info.projectionCode.toString();
+                    return info.projectionCode;
                 case 1:
                     return info.layerName;
Index: trunk/src/org/openstreetmap/josm/io/CachedFile.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/CachedFile.java	(revision 8400)
+++ trunk/src/org/openstreetmap/josm/io/CachedFile.java	(revision 8401)
@@ -77,7 +77,7 @@
      *  <li>relative or absolute file name</li>
      *  <li>{@code file:///SOME/FILE} the same as above</li>
-     *  <li>{@code http://...} a URL. It will be cached on disk.</li></ul>
+     *  <li>{@code http://...} a URL. It will be cached on disk.</li>
      *  <li>{@code resource://SOME/FILE} file from the classpath (usually in the current *.jar)</li>
-     *  <li>{@code josmdir://SOME/FILE} file inside josm user data directory (since r7058)</li></ul>
+     *  <li>{@code josmdir://SOME/FILE} file inside josm user data directory (since r7058)</li>
      *  <li>{@code josmplugindir://SOME/FILE} file inside josm plugin directory (since r7834)</li></ul>
      */
@@ -91,7 +91,7 @@
      *  <li>relative or absolute file name</li>
      *  <li>{@code file:///SOME/FILE} the same as above</li>
-     *  <li>{@code http://...} a URL. It will be cached on disk.</li></ul>
+     *  <li>{@code http://...} a URL. It will be cached on disk.</li>
      *  <li>{@code resource://SOME/FILE} file from the classpath (usually in the current *.jar)</li>
-     *  <li>{@code josmdir://SOME/FILE} file inside josm user data directory (since r7058)</li></ul>
+     *  <li>{@code josmdir://SOME/FILE} file inside josm user data directory (since r7058)</li>
      *  <li>{@code josmplugindir://SOME/FILE} file inside josm plugin directory (since r7834)</li></ul>
      * @return this object