Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 1047)
@@ -31,5 +31,4 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 import javax.swing.UIManager;
 
Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 1047)
@@ -6,5 +6,4 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 1047)
@@ -7,5 +7,4 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
Index: trunk/src/org/openstreetmap/josm/actions/NewAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/NewAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/NewAction.java	(revision 1047)
@@ -5,5 +5,4 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
Index: trunk/src/org/openstreetmap/josm/actions/OpenAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/OpenAction.java	(revision 1047)
@@ -5,5 +5,4 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.InputStream;
Index: trunk/src/org/openstreetmap/josm/actions/RedoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/RedoAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/RedoAction.java	(revision 1047)
@@ -5,5 +5,4 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
Index: trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java	(revision 1047)
@@ -14,5 +14,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
Index: trunk/src/org/openstreetmap/josm/actions/SaveAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 1047)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
Index: trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java	(revision 1047)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 1047)
@@ -19,6 +19,4 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
Index: trunk/src/org/openstreetmap/josm/actions/UndoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UndoAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/UndoAction.java	(revision 1047)
@@ -5,5 +5,4 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
Index: trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java	(revision 1047)
@@ -6,5 +6,4 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import javax.swing.KeyStroke;
 import javax.swing.JComponent;
 
Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1047)
@@ -6,5 +6,4 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.Collection;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1047)
@@ -32,5 +32,4 @@
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 1047)
@@ -12,5 +12,4 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
-import org.openstreetmap.josm.tools.ShortCut;
 
 /**
Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 1047)
@@ -32,7 +32,5 @@
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;
-import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.UrlLabel;
 
 /**
Index: trunk/src/org/openstreetmap/josm/gui/MapMover.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapMover.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/gui/MapMover.java	(revision 1047)
@@ -15,5 +15,4 @@
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 import org.openstreetmap.josm.tools.ShortCut;
 import static org.openstreetmap.josm.tools.I18n.tr;
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 1047)
@@ -13,5 +13,4 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
@@ -22,5 +21,4 @@
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1047)
@@ -10,5 +10,4 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
Index: trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 1047)
@@ -19,5 +19,4 @@
 import javax.swing.event.DocumentEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 1047)
@@ -5,5 +5,4 @@
 
 import java.awt.Component;
-import java.lang.reflect.*;
 
 import javax.swing.DefaultListCellRenderer;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java	(revision 1047)
@@ -6,7 +6,7 @@
 
 package org.openstreetmap.josm.gui.preferences;
+
 import static org.openstreetmap.josm.tools.I18n.tr;
 import javax.swing.table.TableModel;
-import javax.swing.table.AbstractTableModel;
 import java.awt.event.KeyEvent;
 import java.util.Map;
@@ -99,5 +99,4 @@
 
     private void initComponents() {
-        java.awt.GridBagConstraints gridBagConstraints;
 
         // Did I mention auto-generated? That's the reason we
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 1047)
@@ -5,7 +5,4 @@
 import org.openstreetmap.josm.tools.ShortCut;
 
-import java.awt.event.KeyEvent;
-import java.util.HashMap;
-import java.util.Map;
 import java.io.IOException;
 
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 1047)
@@ -8,6 +8,4 @@
 
 import java.awt.event.KeyEvent;
-import java.util.HashMap;
-import java.util.Map;
 import java.lang.reflect.*;
 import java.io.IOException;
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 1047)
@@ -7,8 +7,5 @@
 
 import java.awt.event.KeyEvent;
-import java.util.HashMap;
-import java.util.Map;
 import java.io.IOException;
-import javax.swing.KeyStroke;
 
 /**
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 1046)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 1047)
@@ -8,6 +8,4 @@
 
 import java.awt.event.KeyEvent;
-import java.util.HashMap;
-import java.util.Map;
 import java.io.IOException;