Index: trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 10173)
@@ -121,8 +121,10 @@
             @Override
             public void menuDeselected(MenuEvent e) {
+                // Do nothing
             }
 
             @Override
             public void menuCanceled(MenuEvent e) {
+                // Do nothing
             }
         });
@@ -238,4 +240,5 @@
     @Override
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 10173)
@@ -33,5 +33,4 @@
 import org.openstreetmap.josm.actions.ChangesetManagerToggleAction;
 import org.openstreetmap.josm.actions.CloseChangesetAction;
-import org.openstreetmap.josm.actions.DeleteLayerAction;
 import org.openstreetmap.josm.actions.CombineWayAction;
 import org.openstreetmap.josm.actions.CopyAction;
@@ -40,4 +39,5 @@
 import org.openstreetmap.josm.actions.CreateMultipolygonAction;
 import org.openstreetmap.josm.actions.DeleteAction;
+import org.openstreetmap.josm.actions.DeleteLayerAction;
 import org.openstreetmap.josm.actions.DialogsToggleAction;
 import org.openstreetmap.josm.actions.DistributeAction;
@@ -403,8 +403,12 @@
     public static final MenuListener menuSeparatorHandler = new MenuListener() {
         @Override
-        public void menuCanceled(MenuEvent e) {}
+        public void menuCanceled(MenuEvent e) {
+            // Do nothing
+        }
 
         @Override
-        public void menuDeselected(MenuEvent e) {}
+        public void menuDeselected(MenuEvent e) {
+            // Do nothing
+        }
 
         @Override
Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 10173)
@@ -220,4 +220,5 @@
                     @Override
                     public void setBorder(Border b) {
+                        // Do nothing
                     }
                 };
@@ -546,5 +547,7 @@
 
                 @Override
-                public void popupMenuCanceled(PopupMenuEvent e) {}
+                public void popupMenuCanceled(PopupMenuEvent e) {
+                    // Do nothing
+                }
             });
 
@@ -777,5 +780,7 @@
 
     @Override
-    public void layerAdded(Layer newLayer) { }
+    public void layerAdded(Layer newLayer) {
+        // Do nothing
+    }
 
     @Override
Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java	(revision 10173)
@@ -8,6 +8,6 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
 
 import javax.swing.BorderFactory;
@@ -65,14 +65,5 @@
         setCustomText("");
         setLocationRelativeTo(getParent());
-        addComponentListener(new ComponentListener() {
-            @Override
-            public void componentHidden(ComponentEvent e) {}
-
-            @Override
-            public void componentMoved(ComponentEvent e) {}
-
-            @Override
-            public void componentShown(ComponentEvent e) {}
-
+        addComponentListener(new ComponentAdapter() {
             @Override
             public void componentResized(ComponentEvent ev) {
Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 10173)
@@ -453,13 +453,21 @@
 
     @Override
-    public void mouseClicked(MouseEvent e) {}
-
-    @Override
-    public void mouseEntered(MouseEvent e) {}
-
-    @Override
-    public void mouseExited(MouseEvent e) {}
-
-    @Override
-    public void mouseMoved(MouseEvent e) {}
+    public void mouseClicked(MouseEvent e) {
+        // Do nothing
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+        // Do nothing
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+        // Do nothing
+    }
+
+    @Override
+    public void mouseMoved(MouseEvent e) {
+        // Do nothing
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 10173)
@@ -310,4 +310,5 @@
         @Override
         public void setTicks(int ticks) {
+            // Not used
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 10173)
@@ -251,14 +251,26 @@
     }
 
-    @Override public void windowOpened(WindowEvent e) {}
-
-    @Override public void windowClosing(WindowEvent e) {}
-
-    @Override public void windowIconified(WindowEvent e) {}
-
-    @Override public void windowDeiconified(WindowEvent e) {}
-
-    @Override public void windowActivated(WindowEvent e) {}
-
-    @Override public void windowDeactivated(WindowEvent e) {}
+    @Override public void windowOpened(WindowEvent e) {
+        // Do nothing
+    }
+
+    @Override public void windowClosing(WindowEvent e) {
+        // Do nothing
+    }
+
+    @Override public void windowIconified(WindowEvent e) {
+        // Do nothing
+    }
+
+    @Override public void windowDeiconified(WindowEvent e) {
+        // Do nothing
+    }
+
+    @Override public void windowActivated(WindowEvent e) {
+        // Do nothing
+    }
+
+    @Override public void windowDeactivated(WindowEvent e) {
+        // Do nothing
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 10173)
@@ -459,5 +459,4 @@
     /**
      * Closes the detached dialog if this toggle dialog is currently displayed in a detached dialog.
-     *
      */
     public void closeDetachedDialog() {
@@ -474,18 +473,16 @@
      */
     public void showNotify() {
-
-    }
-
-    /**
-     * Called when toggle dialog is hidden (collapsed, removed, MapFrame is removed, ...). Good place to unregister
-     * listeners
+        // Do nothing
+    }
+
+    /**
+     * Called when toggle dialog is hidden (collapsed, removed, MapFrame is removed, ...). Good place to unregister listeners
      */
     public void hideNotify() {
-
+        // Do nothing
     }
 
     /**
      * The title bar displayed in docked mode
-     *
      */
     protected class TitleBar extends JPanel {
@@ -855,4 +852,5 @@
      */
     protected void toggleButtonHook() {
+        // Do nothing
     }
 
@@ -865,4 +863,5 @@
      */
     protected void stateChanged() {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 10173)
@@ -477,4 +477,5 @@
 
     protected void buildMainPanelAboveDownloadSelections(JPanel pnl) {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 10173)
@@ -153,8 +153,12 @@
     /* ----------------------------------------------------------------------------- */
     @Override
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        // Do nothing
+    }
 
     @Override
-    public void layerAdded(Layer newLayer) {}
+    public void layerAdded(Layer newLayer) {
+        // Do nothing
+    }
 
     @Override
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 10173)
@@ -761,8 +761,12 @@
 
     @Override
-    public void layerAdded(Layer newLayer) {}
-
-    @Override
-    public void layerRemoved(Layer oldLayer) {}
+    public void layerAdded(Layer newLayer) {
+        // Do nothing
+    }
+
+    @Override
+    public void layerRemoved(Layer oldLayer) {
+        // Do nothing
+    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 10173)
@@ -10,6 +10,6 @@
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
+import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.util.Arrays;
 import java.util.Collections;
@@ -135,5 +135,5 @@
         hcb.getEditor().addActionListener(handler);
         hcb.getEditorComponent().addKeyListener(
-                new KeyListener() {
+                new KeyAdapter() {
                     @Override
                     public void keyTyped(KeyEvent e) {
@@ -141,14 +141,4 @@
                             handler.actionPerformed(new ActionEvent(hcb, 0, "focusDown"));
                         }
-                    }
-
-                    @Override
-                    public void keyReleased(KeyEvent e) {
-                        // Do nothing
-                    }
-
-                    @Override
-                    public void keyPressed(KeyEvent e) {
-                        // Do nothing
                     }
                 }
Index: trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java	(revision 10173)
@@ -14,6 +14,6 @@
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
+import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -344,5 +344,5 @@
      *   If both text fields contain characters, submits the form by calling owner's {@link OKAction}.
      */
-    private static class TFKeyListener implements KeyListener {
+    private static class TFKeyListener extends KeyAdapter {
         protected CredentialDialog owner; // owner Dependency Injection to call OKAction
         protected JTextField currentTF;
@@ -371,12 +371,4 @@
             }
         }
-
-        @Override
-        public void keyReleased(KeyEvent e) {
-        }
-
-        @Override
-        public void keyTyped(KeyEvent e) {
-        }
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java	(revision 10173)
@@ -85,5 +85,7 @@
 
     @Override
-    protected void finish() {}
+    protected void finish() {
+        // Do nothing
+    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java	(revision 10173)
@@ -27,4 +27,7 @@
     private ClearAction clearAction;
 
+    /**
+     * Constructs a new {@code RecentlyOpenedFilesMenu}.
+     */
     public RecentlyOpenedFilesMenu() {
         super(tr("Open Recent"));
@@ -42,8 +45,10 @@
             @Override
             public void menuDeselected(MenuEvent e) {
+                // Do nothing
             }
 
             @Override
             public void menuCanceled(MenuEvent e) {
+                // Do nothing
             }
         });
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 10173)
@@ -12,6 +12,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -389,5 +389,5 @@
     }
 
-    static class TextFieldFocusHandler implements FocusListener {
+    static class TextFieldFocusHandler extends FocusAdapter {
         @Override
         public void focusGained(FocusEvent e) {
@@ -398,7 +398,4 @@
             }
         }
-
-        @Override
-        public void focusLost(FocusEvent e) {}
     }
 
@@ -467,5 +464,5 @@
     }
 
-    class StrategyChangeListener implements ItemListener, FocusListener, ActionListener {
+    class StrategyChangeListener extends FocusAdapter implements ItemListener, ActionListener {
 
         protected void notifyStrategy() {
@@ -489,7 +486,4 @@
 
         @Override
-        public void focusGained(FocusEvent arg0) {}
-
-        @Override
         public void focusLost(FocusEvent arg0) {
             notifyStrategy();
Index: trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java	(revision 10173)
@@ -195,4 +195,5 @@
         @Override
         public void actionPerformed(ActionEvent e) {
+            // Do nothing
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java	(revision 10173)
@@ -108,4 +108,5 @@
     @Override
     public void mergeFrom(Layer from) {
+        // Do nothing
     }
 
@@ -122,4 +123,5 @@
     @Override
     public void visitBoundingBox(BoundingXYVisitor v) {
+        // Do nothing
     }
 
@@ -142,8 +144,10 @@
     @Override
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        // Do nothing
     }
 
     @Override
     public void layerAdded(Layer newLayer) {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 10173)
@@ -793,4 +793,5 @@
         @Override
         public void changedUpdate(DocumentEvent ev) {
+            // Do nothing
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 10173)
@@ -900,4 +900,5 @@
             @Override
             public void layerAdded(Layer newLayer) {
+                // Do nothing
             }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 10173)
@@ -402,12 +402,15 @@
         @Override
         public void mouseEntered(MouseEvent e) {
+            // Do nothing
         }
 
         @Override
         public void mouseExited(MouseEvent e) {
+            // Do nothing
         }
 
         @Override
         public void mouseMoved(MouseEvent e) {
+            // Do nothing
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java	(revision 10173)
@@ -119,4 +119,5 @@
             @Override
             protected void finish() {
+                // Do nothing
             }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 10173)
@@ -388,4 +388,5 @@
      */
     public void actionPerformed(ActionEvent ev) {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 10173)
@@ -411,5 +411,7 @@
 
         @Override
-        protected void finish() {}
+        protected void finish() {
+            // Do nothing
+        }
 
         protected void alertAuthorisationFailed(OsmOAuthAuthorizationException e) {
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 10173)
@@ -13,6 +13,6 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
+import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -216,5 +216,5 @@
         spAuthorisationProcedureUI = GuiHelper.embedInVerticalScrollPane(new JPanel());
         spAuthorisationProcedureUI.getVerticalScrollBar().addComponentListener(
-                new ComponentListener() {
+                new ComponentAdapter() {
                     @Override
                     public void componentShown(ComponentEvent e) {
@@ -226,10 +226,4 @@
                         spAuthorisationProcedureUI.setBorder(null);
                     }
-
-                    @Override
-                    public void componentResized(ComponentEvent e) {}
-
-                    @Override
-                    public void componentMoved(ComponentEvent e) {}
                 }
         );
Index: trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java	(revision 10173)
@@ -78,5 +78,7 @@
 
     @Override
-    protected void finish() {}
+    protected void finish() {
+        // Do nothing
+    }
 
     protected void sign(HttpClient con) throws OAuthException {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 10173)
@@ -462,8 +462,12 @@
 
                 @Override
-                public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
-
-                @Override
-                public void popupMenuCanceled(PopupMenuEvent e) {}
+                public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                    // Do nothing
+                }
+
+                @Override
+                public void popupMenuCanceled(PopupMenuEvent e) {
+                    // Do nothing
+                }
             });
             add(remove);
@@ -820,8 +824,12 @@
             p.setLayout(new LayoutManager() {
                 @Override
-                public void addLayoutComponent(String name, Component comp) {}
-
-                @Override
-                public void removeLayoutComponent(Component comp) {}
+                public void addLayoutComponent(String name, Component comp) {
+                    // Do nothing
+                }
+
+                @Override
+                public void removeLayoutComponent(Component comp) {
+                    // Do nothing
+                }
 
                 @Override
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java	(revision 10173)
@@ -54,4 +54,5 @@
     @Override
     public void setPreferences(Collection<String> args) {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java	(revision 10173)
@@ -143,5 +143,7 @@
 
     @Override
-    protected void finish() {}
+    protected void finish() {
+        // Do nothing
+    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/progress/ChildProgress.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/ChildProgress.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/progress/ChildProgress.java	(revision 10173)
@@ -30,4 +30,5 @@
     @Override
     protected void doBeginTask() {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java	(revision 10173)
@@ -16,9 +16,10 @@
 
     private NullProgressMonitor() {
-
+        // Do nothing
     }
 
     @Override
     public void addCancelListener(CancelListener listener) {
+        // Do nothing
     }
 
@@ -39,4 +40,5 @@
     @Override
     public void cancel() {
+        // Do nothing
     }
 
@@ -48,8 +50,5 @@
     @Override
     public void finishTask() {
-    }
-
-    public String getErrorMessage() {
-        return null;
+        // Do nothing
     }
 
@@ -68,4 +67,5 @@
     @Override
     public void invalidate() {
+        // Do nothing
     }
 
@@ -77,30 +77,30 @@
     @Override
     public void removeCancelListener(CancelListener listener) {
+        // Do nothing
     }
 
     @Override
     public void setCustomText(String text) {
-    }
-
-    public void setErrorMessage(String message) {
+        // Do nothing
     }
 
     @Override
     public void setExtraText(String text) {
+        // Do nothing
     }
 
     @Override
     public void appendLogMessage(String message) {
-    }
-
-    public void setSilent(boolean value) {
+        // Do nothing
     }
 
     @Override
     public void setTicks(int ticks) {
+        // Do nothing
     }
 
     @Override
     public void setTicksCount(int ticks) {
+        // Do nothing
     }
 
@@ -114,4 +114,5 @@
     @Override
     public void worked(int ticks) {
+        // Do nothing
     }
 
@@ -123,4 +124,5 @@
     @Override
     public void setProgressTaskId(ProgressTaskId taskId) {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 10173)
@@ -94,4 +94,5 @@
     @Override
     public void setProgressTaskId(ProgressTaskId taskId) {
+        // Do nothing
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 10173)
@@ -384,8 +384,12 @@
 
         @Override
-        public void keyReleased(KeyEvent e) { }
-
-        @Override
-        public void keyTyped(KeyEvent e) { }
+        public void keyReleased(KeyEvent e) {
+            // Do nothing
+        }
+
+        @Override
+        public void keyTyped(KeyEvent e) {
+            // Do nothing
+        }
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java	(revision 10173)
@@ -4,6 +4,6 @@
 import java.awt.Component;
 import java.awt.Point;
+import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -95,8 +95,5 @@
     protected void checkFocusAndShowMenu(final Component component, final MouseEvent evt) {
         if (component != null && component.isFocusable() && !component.hasFocus() && component.requestFocusInWindow()) {
-            component.addFocusListener(new FocusListener() {
-                @Override
-                public void focusLost(FocusEvent e) {}
-
+            component.addFocusListener(new FocusAdapter() {
                 @Override
                 public void focusGained(FocusEvent e) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 10173)
@@ -92,5 +92,7 @@
     /** Do not let anyone add mouse listeners */
     @Override
-    public void addMouseListener(MouseListener l) { }
+    public void addMouseListener(MouseListener l) {
+        // Do nothing
+    }
 
     /**
@@ -211,11 +213,17 @@
 
         @Override
-        public void setArmed(boolean b) { }
-
-        @Override
-        public void setSelected(boolean b) { }
-
-        @Override
-        public void setPressed(boolean b) { }
+        public void setArmed(boolean b) {
+            // Do nothing
+        }
+
+        @Override
+        public void setSelected(boolean b) {
+            // Do nothing
+        }
+
+        @Override
+        public void setPressed(boolean b) {
+            // Do nothing
+        }
 
         /** We disable focusing on the component when it is not enabled. */
Index: trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 10173)
@@ -114,4 +114,5 @@
         @Override
         public void visit(IRelation r) {
+            // Do nothing
         }
     }
Index: trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java	(revision 10173)
@@ -58,5 +58,7 @@
 
     @Override
-    protected void finish() {}
+    protected void finish() {
+        // Do nothing
+    }
 
     protected void processJarFile(File f, String pluginName) throws PluginException {
Index: trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 10173)
@@ -97,5 +97,7 @@
 
     @Override
-    protected void finish() {}
+    protected void finish() {
+        // Do nothing
+    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 10172)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 10173)
@@ -108,4 +108,5 @@
     @Override
     public void afterPrefStartupHook() {
+        // Do nothing
     }