Index: trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java	(revision 6603)
@@ -51,5 +51,5 @@
      */
     private void addNodes(Node node) {
-        if (node == null) ;
+        if (node == null) return;
         else if (!nodes.add(node))
             outerNodes.remove(node);
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java	(revision 6603)
@@ -1,4 +1,6 @@
+// License: GPL. See LICENSE file for details.
 package org.openstreetmap.josm.data.validation.tests;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -15,6 +17,13 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+/**
+ * Test that validates {@code lane:} tags.
+ * @since 6592
+ */
 public class Lanes extends Test.TagTest {
 
+    /**
+     * Constructs a new {@code Lanes} test.
+     */
     public Lanes() {
         super(tr("Lane tags"));
@@ -48,4 +57,5 @@
                 }
             } catch (NumberFormatException ignore) {
+                Main.debug(ignore.getMessage());
             }
         }
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 6603)
@@ -80,5 +80,5 @@
          * A function mapping the matched {@link OsmPrimitive} to a {@link Tag}.
          */
-        static abstract class PrimitiveToTag implements Utils.Function<OsmPrimitive, Tag> {
+        abstract static class PrimitiveToTag implements Utils.Function<OsmPrimitive, Tag> {
 
             /**
@@ -226,4 +226,5 @@
                 }
             } catch (IndexOutOfBoundsException ignore) {
+                Main.debug(ignore.getMessage());
             }
             return null;
Index: trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java	(revision 6603)
@@ -24,9 +24,8 @@
 public class SourceButton extends JComponent {
 
-    private final int layerHeight = 20;
-    private final int leftPadding = 5;
-    private final int topPadding = 5;
-    private final int bottomPadding = 5;
-
+    private static final int LAYER_HEIGHT = 20;
+    private static final int LEFT_PADDING = 5;
+    private static final int TOP_PADDING = 5;
+    private static final int BOTTOM_PADDING = 5;
 
     private TileSource[] sources;
@@ -47,5 +46,4 @@
 
     public SourceButton(SlippyMapBBoxChooser slippyMapBBoxChooser, Collection<TileSource> sources) {
-        super();
         this.slippyMapBBoxChooser = slippyMapBBoxChooser;
         setSources(sources);
@@ -68,5 +66,5 @@
                         toggle();
                     } else {
-                        int result = (point.y - 5) / layerHeight;
+                        int result = (point.y - 5) / LAYER_HEIGHT;
                         if (result >= 0 && result < SourceButton.this.sources.length) {
                             SourceButton.this.slippyMapBBoxChooser.toggleMapSource(SourceButton.this.sources[result]);
@@ -78,5 +76,4 @@
                     toggle();
                 }
-
             }
         }
@@ -105,12 +102,12 @@
 
                 g.setColor(new Color(0, 0, 139, 179));
-                g.fillRoundRect(0, 0, barWidth + shrinkImage.getIconWidth(), sources.length * layerHeight + topPadding + bottomPadding, 10, 10);
+                g.fillRoundRect(0, 0, barWidth + shrinkImage.getIconWidth(), sources.length * LAYER_HEIGHT + TOP_PADDING + BOTTOM_PADDING, 10, 10);
                 for (int i=0; i<sources.length; i++) {
                     g.setColor(Color.WHITE);
-                    g.fillOval(leftPadding, topPadding + i * layerHeight + 6, radioButtonSize, radioButtonSize);
-                    g.drawString(sources[i].getName(), leftPadding + radioButtonSize + leftPadding, topPadding + i * layerHeight + g.getFontMetrics().getHeight());
+                    g.fillOval(LEFT_PADDING, TOP_PADDING + i * LAYER_HEIGHT + 6, radioButtonSize, radioButtonSize);
+                    g.drawString(sources[i].getName(), LEFT_PADDING + radioButtonSize + LEFT_PADDING, TOP_PADDING + i * LAYER_HEIGHT + g.getFontMetrics().getHeight());
                     if (currentMap == i) {
                         g.setColor(Color.BLACK);
-                        g.fillOval(leftPadding + 1, topPadding + 7 + i * layerHeight, radioButtonSize - 2, radioButtonSize - 2);
+                        g.fillOval(LEFT_PADDING + 1, TOP_PADDING + 7 + i * LAYER_HEIGHT, radioButtonSize - 2, radioButtonSize - 2);
                     }
                 }
@@ -155,5 +152,5 @@
             }
             barWidth = textWidth + 50;
-            shownDimension = new Dimension(barWidth + shrinkImage.getIconWidth(), sources.length * layerHeight + topPadding + bottomPadding);
+            shownDimension = new Dimension(barWidth + shrinkImage.getIconWidth(), sources.length * LAYER_HEIGHT + TOP_PADDING + BOTTOM_PADDING);
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java	(revision 6603)
@@ -20,4 +20,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.DefaultListSelectionModel;
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -61,4 +62,9 @@
 public class ChangesetCacheManager extends JFrame {
 
+    /** The changeset download icon **/
+    public static final ImageIcon DOWNLOAD_CONTENT_ICON = ImageProvider.get("dialogs/changeset", "downloadchangesetcontent");
+    /** The changeset update icon **/
+    public static final ImageIcon UPDATE_CONTENT_ICON   = ImageProvider.get("dialogs/changeset", "updatechangesetcontent");
+
     /** the unique instance of the cache manager  */
     private static ChangesetCacheManager instance;
@@ -160,6 +166,6 @@
 
         // -- add the details panel
-        ChangesetDetailPanel pnlChangesetDetail;
-        tp.add(pnlChangesetDetail = new ChangesetDetailPanel());
+        ChangesetDetailPanel pnlChangesetDetail = new ChangesetDetailPanel();
+        tp.add(pnlChangesetDetail);
         model.addPropertyChangeListener(pnlChangesetDetail);
 
@@ -284,4 +290,7 @@
     }
 
+    /**
+     * Constructs a new {@code ChangesetCacheManager}.
+     */
     public ChangesetCacheManager() {
         build();
@@ -483,5 +492,5 @@
         public DownloadSelectedChangesetContentAction() {
             putValue(NAME, tr("Download changeset content"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangesetcontent"));
+            putValue(SMALL_ICON, DOWNLOAD_CONTENT_ICON);
             putValue(SHORT_DESCRIPTION, tr("Download the content of the selected changesets from the server"));
             updateEnabledState();
@@ -627,13 +636,17 @@
     }
 
+    /**
+     * Runs the given changeset download task.
+     * @param task The changeset download task to run
+     */
     public void runDownloadTask(final ChangesetDownloadTask task) {
         Main.worker.submit(task);
-        Runnable r = new Runnable() {
-            @Override public void run() {
+        Main.worker.submit(new Runnable() {
+            @Override
+            public void run() {
                 if (task.isCanceled() || task.isFailed()) return;
                 setSelectedChangesets(task.getDownloadedChangesets());
             }
-        };
-        Main.worker.submit(r);
+        });
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 6603)
@@ -59,20 +59,20 @@
  *
  */
-public class ChangesetContentPanel extends JPanel implements PropertyChangeListener{
+public class ChangesetContentPanel extends JPanel implements PropertyChangeListener {
 
     private ChangesetContentTableModel model;
     private Changeset currentChangeset;
 
-    private DonwloadChangesetContentAction actDownloadContentAction;
+    private DownloadChangesetContentAction actDownloadContentAction;
     private ShowHistoryAction actShowHistory;
     private SelectInCurrentLayerAction actSelectInCurrentLayerAction;
     private ZoomInCurrentLayerAction actZoomInCurrentLayerAction;
 
-    private HeaderPanel pnlHeader;
+    private final HeaderPanel pnlHeader = new HeaderPanel();
 
     protected void buildModels() {
         DefaultListSelectionModel selectionModel =new DefaultListSelectionModel();
         model = new ChangesetContentTableModel(selectionModel);
-        actDownloadContentAction = new DonwloadChangesetContentAction();
+        actDownloadContentAction = new DownloadChangesetContentAction();
         actDownloadContentAction.initProperties(currentChangeset);
         actShowHistory = new ShowHistoryAction();
@@ -126,13 +126,12 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         setLayout(new BorderLayout());
         buildModels();
 
-        add(pnlHeader = new HeaderPanel(), BorderLayout.NORTH);
+        add(pnlHeader, BorderLayout.NORTH);
         add(buildActionButtonPanel(), BorderLayout.WEST);
         add(buildContentPanel(), BorderLayout.CENTER);
-
     }
 
@@ -173,4 +172,18 @@
         setCurrentChangeset(cs);
     }
+    
+    private final void alertNoPrimitivesTo(Collection<HistoryOsmPrimitive> primitives, String title, String helpTopic) {
+        HelpAwareOptionPane.showOptionDialog(
+                ChangesetContentPanel.this,
+                trn("<html>The selected object is not available in the current<br>"
+                        + "edit layer ''{0}''.</html>",
+                        "<html>None of the selected objects is available in the current<br>"
+                        + "edit layer ''{0}''.</html>",
+                        primitives.size(),
+                        Main.main.getEditLayer().getName()
+                ),
+                title, JOptionPane.WARNING_MESSAGE, helpTopic
+        );
+    }
 
     /**
@@ -178,8 +191,8 @@
      *
      */
-    class DonwloadChangesetContentAction extends AbstractAction{
-        public DonwloadChangesetContentAction() {
+    class DownloadChangesetContentAction extends AbstractAction{
+        public DownloadChangesetContentAction() {
             putValue(NAME, tr("Download content"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset","downloadchangesetcontent"));
+            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
             putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
         }
@@ -201,9 +214,9 @@
             if (cs.getContent() == null) {
                 putValue(NAME, tr("Download content"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset","downloadchangesetcontent"));
+                putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
                 putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
             } else {
                 putValue(NAME, tr("Update content"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset","updatechangesetcontent"));
+                putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
                 putValue(SHORT_DESCRIPTION, tr("Update the changeset content from the OSM server"));
             }
@@ -221,5 +234,39 @@
     }
 
-    class ShowHistoryAction extends AbstractAction implements ListSelectionListener{
+    class ShowHistoryAction extends AbstractAction implements ListSelectionListener {
+        
+        private final class ShowHistoryTask implements Runnable {
+            private final Collection<HistoryOsmPrimitive> primitives;
+
+            private ShowHistoryTask(Collection<HistoryOsmPrimitive> primitives) {
+                this.primitives = primitives;
+            }
+
+            @Override
+            public void run() {
+                try {
+                    for (HistoryOsmPrimitive p : primitives) {
+                        final History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
+                        if (h == null) {
+                            continue;
+                        }
+                        GuiHelper.runInEDT(new Runnable() {
+                            @Override
+                            public void run() {
+                                HistoryBrowserDialogManager.getInstance().show(h);
+                            }
+                        });
+                    }
+                } catch (final Exception e) {
+                    GuiHelper.runInEDT(new Runnable() {
+                        @Override
+                        public void run() {
+                            BugReportExceptionHandler.handleException(e);
+                        }
+                    });
+                }
+            }
+        }
+
         public ShowHistoryAction() {
             putValue(NAME, tr("Show history"));
@@ -250,34 +297,8 @@
             }
 
-            Runnable r = new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        for (HistoryOsmPrimitive p : primitives) {
-                            final History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
-                            if (h == null) {
-                                continue;
-                            }
-                            GuiHelper.runInEDT(new Runnable() {
-                                @Override public void run() {
-                                    HistoryBrowserDialogManager.getInstance().show(h);
-                                }
-                            });
-                        }
-                    } catch (final Exception e) {
-                        GuiHelper.runInEDT(new Runnable() {
-                            @Override
-                            public void run() {
-                                BugReportExceptionHandler.handleException(e);
-                            }
-                        });
-                    }
-
-                }
-            };
-            Main.worker.submit(r);
-        }
-
-        protected void updateEnabledState() {
+            Main.worker.submit(new ShowHistoryTask(primitives));
+        }
+
+        protected final void updateEnabledState() {
             setEnabled(model.hasSelectedPrimitives());
         }
@@ -303,20 +324,4 @@
             putValue(SHORT_DESCRIPTION, tr("Select the corresponding primitives in the current data layer"));
             updateEnabledState();
-        }
-
-        protected void alertNoPrimitivesToSelect(Collection<HistoryOsmPrimitive> primitives) {
-            HelpAwareOptionPane.showOptionDialog(
-                    ChangesetContentPanel.this,
-                    trn("<html>The selected object is not available in the current<br>"
-                            + "edit layer ''{0}''.</html>",
-                            "<html>None of the selected objects is available in the current<br>"
-                            + "edit layer ''{0}''.</html>",
-                            primitives.size(),
-                            Main.main.getEditLayer().getName()
-                    ),
-                    tr("Nothing to select"),
-                    JOptionPane.WARNING_MESSAGE,
-                    HelpUtil.ht("/Dialog/ChangesetCacheManager#NothingToSelectInLayer")
-            );
         }
 
@@ -336,5 +341,6 @@
             }
             if (target.isEmpty()) {
-                alertNoPrimitivesToSelect(selected);
+                alertNoPrimitivesTo(selected, tr("Nothing to select"), 
+                        HelpUtil.ht("/Dialog/ChangesetCacheManager#NothingToSelectInLayer"));
                 return;
             }
@@ -342,5 +348,5 @@
         }
 
-        public void updateEnabledState() {
+        public final void updateEnabledState() {
             if (Main.main == null || !Main.main.hasEditLayer()) {
                 setEnabled(false);
@@ -368,20 +374,4 @@
             putValue(SHORT_DESCRIPTION, tr("Zoom to the corresponding objects in the current data layer"));
             updateEnabledState();
-        }
-
-        protected void alertNoPrimitivesToZoomTo(Collection<HistoryOsmPrimitive> primitives) {
-            HelpAwareOptionPane.showOptionDialog(
-                    ChangesetContentPanel.this,
-                    trn("<html>The selected object is not available in the current<br>"
-                            + "edit layer ''{0}''.</html>",
-                            "<html>None of the selected objects is available in the current<br>"
-                            + "edit layer ''{0}''.</html>",
-                            primitives.size(),
-                            Main.main.getEditLayer().getName()
-                    ),
-                    tr("Nothing to zoom to"),
-                    JOptionPane.WARNING_MESSAGE,
-                    HelpUtil.ht("/Dialog/ChangesetCacheManager#NothingToZoomTo")
-            );
         }
 
@@ -401,5 +391,6 @@
             }
             if (target.isEmpty()) {
-                alertNoPrimitivesToZoomTo(selected);
+                alertNoPrimitivesTo(selected, tr("Nothing to zoom to"), 
+                        HelpUtil.ht("/Dialog/ChangesetCacheManager#NothingToZoomTo"));
                 return;
             }
@@ -408,5 +399,5 @@
         }
 
-        public void updateEnabledState() {
+        public final void updateEnabledState() {
             if (Main.main == null || !Main.main.hasEditLayer()) {
                 setEnabled(false);
@@ -427,10 +418,10 @@
     }
 
-    static private class HeaderPanel extends JPanel {
+    private static class HeaderPanel extends JPanel {
 
         private JMultilineLabel lblMessage;
         private Changeset current;
 
-        protected void build() {
+        protected final void build() {
             setLayout(new FlowLayout(FlowLayout.LEFT));
             lblMessage = new JMultilineLabel(
@@ -455,5 +446,5 @@
                 putValue(NAME, tr("Download now"));
                 putValue(SHORT_DESCRIPTION, tr("Download the changeset content"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangesetcontent"));
+                putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
             }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 6603)
@@ -42,5 +42,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
 /**
  * This panel displays the properties of the currently selected changeset in the
@@ -48,17 +47,18 @@
  *
  */
-public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener{
-
-    private JosmTextField tfID;
-    private JosmTextArea taComment;
-    private JosmTextField tfOpen;
-    private JosmTextField tfUser;
-    private JosmTextField tfCreatedOn;
-    private JosmTextField tfClosedOn;
-    private DonwloadChangesetContentAction actDownloadChangesetContent;
-    private UpdateChangesetAction actUpdateChangesets;
-    private RemoveFromCacheAction actRemoveFromCache;
-    private SelectInCurrentLayerAction actSelectInCurrentLayer;
-    private ZoomInCurrentLayerAction actZoomInCurrentLayerAction;
+public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener {
+
+    private final JosmTextField tfID        = new JosmTextField(10);
+    private final JosmTextArea  taComment   = new JosmTextArea(5,40);
+    private final JosmTextField tfOpen      = new JosmTextField(10);
+    private final JosmTextField tfUser      = new JosmTextField("");
+    private final JosmTextField tfCreatedOn = new JosmTextField(20);
+    private final JosmTextField tfClosedOn  = new JosmTextField(20);
+
+    private final DownloadChangesetContentAction actDownloadChangesetContent = new DownloadChangesetContentAction();
+    private final UpdateChangesetAction          actUpdateChangesets         = new UpdateChangesetAction();
+    private final RemoveFromCacheAction          actRemoveFromCache          = new RemoveFromCacheAction();
+    private final SelectInCurrentLayerAction     actSelectInCurrentLayer     = new SelectInCurrentLayerAction();
+    private final ZoomInCurrentLayerAction       actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction();
 
     private Changeset current = null;
@@ -71,19 +71,19 @@
 
         // -- remove from cache action
-        tb.add(actRemoveFromCache = new RemoveFromCacheAction());
+        tb.add(actRemoveFromCache);
         actRemoveFromCache.initProperties(current);
 
         // -- changeset update
-        tb.add(actUpdateChangesets = new UpdateChangesetAction());
+        tb.add(actUpdateChangesets);
         actUpdateChangesets.initProperties(current);
 
         // -- changeset content download
-        tb.add(actDownloadChangesetContent =new DonwloadChangesetContentAction());
+        tb.add(actDownloadChangesetContent);
         actDownloadChangesetContent.initProperties(current);
 
-        tb.add(actSelectInCurrentLayer = new SelectInCurrentLayerAction());
+        tb.add(actSelectInCurrentLayer);
         MapView.addEditLayerChangeListener(actSelectInCurrentLayer);
 
-        tb.add(actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction());
+        tb.add(actZoomInCurrentLayerAction);
         MapView.addEditLayerChangeListener(actZoomInCurrentLayerAction);
 
@@ -119,5 +119,5 @@
         gc.weightx = 0.0;
         gc.gridx = 1;
-        pnl.add(tfID = new JosmTextField(10), gc);
+        pnl.add(tfID, gc);
         tfID.setEditable(false);
 
@@ -133,5 +133,5 @@
         gc.weighty = 1.0;
         gc.gridx = 1;
-        pnl.add(taComment= new JosmTextArea(5,40), gc);
+        pnl.add(taComment, gc);
         taComment.setEditable(false);
 
@@ -146,5 +146,5 @@
         gc.fill = GridBagConstraints.HORIZONTAL;
         gc.gridx = 1;
-        pnl.add(tfOpen= new JosmTextField(10), gc);
+        pnl.add(tfOpen, gc);
         tfOpen.setEditable(false);
 
@@ -159,5 +159,5 @@
         gc.weightx = 1.0;
         gc.gridx = 1;
-        pnl.add(tfUser= new JosmTextField(""), gc);
+        pnl.add(tfUser, gc);
         tfUser.setEditable(false);
 
@@ -171,5 +171,5 @@
         gc.fill = GridBagConstraints.HORIZONTAL;
         gc.gridx = 1;
-        pnl.add(tfCreatedOn= new JosmTextField(20), gc);
+        pnl.add(tfCreatedOn, gc);
         tfCreatedOn.setEditable(false);
 
@@ -183,5 +183,5 @@
         gc.fill = GridBagConstraints.HORIZONTAL;
         gc.gridx = 1;
-        pnl.add(tfClosedOn= new JosmTextField(20), gc);
+        pnl.add(tfClosedOn, gc);
         tfClosedOn.setEditable(false);
 
@@ -189,5 +189,5 @@
     }
 
-    protected void build() {
+    protected final void build() {
         setLayout(new BorderLayout());
         setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
@@ -259,6 +259,5 @@
         if (! evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP))
             return;
-        Changeset cs = (Changeset)evt.getNewValue();
-        setCurrentChangeset(cs);
+        setCurrentChangeset((Changeset)evt.getNewValue());
     }
 
@@ -289,8 +288,8 @@
      *
      */
-    class DonwloadChangesetContentAction extends AbstractAction{
-        public DonwloadChangesetContentAction() {
+    class DownloadChangesetContentAction extends AbstractAction {
+        public DownloadChangesetContentAction() {
             putValue(NAME, tr("Download content"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset","downloadchangesetcontent"));
+            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
             putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
         }
@@ -299,5 +298,5 @@
         public void actionPerformed(ActionEvent evt) {
             if (current == null) return;
-            ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetDetailPanel.this,current.getId());
+            ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetDetailPanel.this, current.getId());
             ChangesetCacheManager.getInstance().runDownloadTask(task);
         }
@@ -312,9 +311,9 @@
             if (cs.getContent() == null) {
                 putValue(NAME, tr("Download content"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset","downloadchangesetcontent"));
+                putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
                 putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
             } else {
                 putValue(NAME, tr("Update content"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset","updatechangesetcontent"));
+                putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
                 putValue(SHORT_DESCRIPTION, tr("Update the changeset content from the OSM server"));
             }
@@ -329,5 +328,5 @@
         public UpdateChangesetAction() {
             putValue(NAME, tr("Update changeset"));
-            putValue(SMALL_ICON,ImageProvider.get("dialogs/changeset","updatechangeset"));
+            putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
             putValue(SHORT_DESCRIPTION, tr("Update the changeset from the OSM server"));
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java	(revision 6603)
@@ -20,5 +20,4 @@
 import org.openstreetmap.josm.gui.widgets.ChangesetIdTextField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -80,5 +79,5 @@
 
         public DownloadAction() {
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangesetcontent"));
+            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
             putValue(SHORT_DESCRIPTION, tr("Download the changeset with the specified id, including the changeset content"));
             updateEnabledState();
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java	(revision 6603)
@@ -153,5 +153,5 @@
          * The list of default name tags from which a label candidate is derived.
          */
-        static public final String[] DEFAULT_NAME_TAGS = {
+        public static final String[] DEFAULT_NAME_TAGS = {
             "name:" + LanguageInfo.getJOSMLocaleCode(),
             "name",
@@ -167,5 +167,5 @@
          * @since 6541
          */
-        static public final String[] DEFAULT_NAME_COMPLEMENT_TAGS = {
+        public static final String[] DEFAULT_NAME_COMPLEMENT_TAGS = {
             "capacity"
         };
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java	(revision 6603)
@@ -12,5 +12,4 @@
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -120,6 +119,4 @@
             if (llEditor.getValue() == 1) {
                 List<List<String>> data = llEditor.getData();
-                @SuppressWarnings("unchecked")
-                Collection<Collection<String>> stgValue = (Collection<Collection<String>>) stg.getValue();
                 if (!llSetting.equalVal(data)) {
                     e.setValue(new Preferences.ListListSetting(data));
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java	(revision 6603)
@@ -55,4 +55,8 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * Preference settings for plugins.
+ * @since 168
+ */
 public final class PluginPreference extends DefaultTabPreferenceSetting {
 
@@ -71,4 +75,9 @@
     }
 
+    /**
+     * Returns the download summary string to be shown.
+     * @param task The plugin download task that has completed
+     * @return the download summary string to be shown. Contains summary of success/failed plugins.
+     */
     public static String buildDownloadSummary(PluginDownloadTask task) {
         Collection<PluginInformation> downloaded = task.getDownloadedPlugins();
@@ -469,5 +478,5 @@
     }
 
-    static private class PluginConfigurationSitesPanel extends JPanel {
+    private static class PluginConfigurationSitesPanel extends JPanel {
 
         private DefaultListModel model;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java	(revision 6602)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java	(revision 6603)
@@ -32,4 +32,8 @@
     public final JButton deleteSrcButton = new JButton(tr("Delete"));
 
+    /**
+     * Constructs a new {@code EditableList}.
+     * @param title The title displayed in input dialog
+     */
     public EditableList(String title) {
         this.title = title;
@@ -37,7 +41,6 @@
     }
 
-    protected void build() {
+    protected final void build() {
 
-        //setLayout(new GridBagLayout());
         setLayout(new BorderLayout());
 
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 6602)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 6603)
@@ -1,18 +1,9 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.openstreetmap.TestUtils;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.validation.Severity;
-import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.tools.Predicate;
-import org.openstreetmap.josm.tools.Predicates;
-import org.openstreetmap.josm.tools.Utils;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.io.StringReader;
@@ -22,9 +13,16 @@
 import java.util.Map;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.TestUtils;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 public class MapCSSTagCheckerTest {
@@ -32,5 +30,5 @@
     @Before
     public void setUp() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java	(revision 6602)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java	(revision 6603)
@@ -1,18 +1,17 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
+
+import static org.CustomMatchers.isEmpty;
+import static org.junit.Assert.assertThat;
+
+import java.io.FileInputStream;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmReader;
-
-import java.io.FileInputStream;
-
-import static org.CustomMatchers.isEmpty;
-import static org.junit.Assert.assertThat;
 
 public class UnconnectedWaysTest {
@@ -23,5 +22,5 @@
     public void setUp() throws Exception {
         bib = new UnconnectedWays.UnconnectedHighways();
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         bib.initialize();