Index: trunk/src/org/openstreetmap/josm/actions/AlignInRectangleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AlignInRectangleAction.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/actions/AlignInRectangleAction.java	(revision 999)
@@ -17,5 +17,4 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 999)
@@ -15,8 +15,6 @@
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 999)
@@ -6,7 +6,4 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
 
 import org.openstreetmap.josm.Main;
Index: trunk/src/org/openstreetmap/josm/actions/PasteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PasteAction.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/actions/PasteAction.java	(revision 999)
@@ -12,7 +12,4 @@
 import java.util.LinkedList;
 import java.util.List;
-
-import java.awt.event.MouseMotionListener;
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -56,5 +53,5 @@
 		} else {
 			mPosition = Main.map.mapView.getEastNorth(Main.map.mapView.lastMEvent.getX(), Main.map.mapView.lastMEvent.getY());
-		};
+		}
 
 		double offsetEast  = mPosition.east() - (maxEast + minEast)/2.0;
Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 999)
@@ -15,5 +15,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 999)
@@ -39,5 +39,4 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 999)
@@ -22,5 +22,4 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -68,10 +67,4 @@
 
 	/**
-	 * The screen distance which needs to be travelled before something
-	 * counts as a move, in pixels
-	 */
-	private int initialMoveThreshold = 15;
-	private boolean initialMoveThresholdExceeded = false;
-	/**
 	 * Create a new SelectAction
 	 * @param mapFrame The MapFrame this action belongs to.
@@ -82,6 +75,5 @@
 			getCursor("normal", "selection", Cursor.DEFAULT_CURSOR));
 		putValue("help", "Action/Extrude/Extrude");
-		try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","200")); } catch (NumberFormatException x) {}
-		try { initialMoveThreshold = Integer.parseInt(Main.pref.get("edit.initial-move-threshold","5")); } catch (NumberFormatException x) {}
+		initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
 		selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW);
 	}
@@ -268,5 +260,3 @@
 		}
 	}
-	
-
 }
Index: trunk/src/org/openstreetmap/josm/data/Bounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Bounds.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/data/Bounds.java	(revision 999)
@@ -3,5 +3,4 @@
 
 import java.awt.geom.Rectangle2D;
-import java.awt.geom.RectangularShape;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -71,6 +70,6 @@
 	
 	/**
-	 * Returns the lat/lon bounding box as an object of type Rectangle2D.Double
-	 * @return
+	 * Converts the lat/lon bounding box to an object of type Rectangle2D.Double
+	 * @return the bounding box to Rectangle2D.Double
 	 */
 	public Rectangle2D.Double asRect() {
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 999)
@@ -2,6 +2,4 @@
 package org.openstreetmap.josm.data.osm;
 
-import java.awt.Polygon;
-import java.awt.Shape;
 import java.awt.geom.Area;
 import java.util.Arrays;
Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 999)
@@ -3,6 +3,4 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
-
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 999)
@@ -5,5 +5,4 @@
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 999)
@@ -7,9 +7,7 @@
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Polygon;
-import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.geom.GeneralPath;
@@ -20,6 +18,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.UnselectAllAction;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -28,5 +24,4 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
-import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
 import org.openstreetmap.josm.gui.mappaint.ElemStyle;
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java	(revision 999)
@@ -16,5 +16,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -22,5 +21,4 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.NavigatableComponent;
Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 999)
@@ -19,5 +19,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.WikiReader;
@@ -26,9 +25,7 @@
 public class GettingStarted extends JPanel {
 
-    private JPanel panel;
     static private String content = "";    
 
     public class LinkGeneral extends JEditorPane implements HyperlinkListener {
-        private String action;
         public LinkGeneral(String text) {
             setContentType("text/html");
@@ -73,5 +70,4 @@
             /* look for hrefs of the form wiki/MessageOfTheDay>123 where > can also be <,<=,>= and the number is the revision number */
             int start = 0;
-            boolean nothingIncluded = true;
             Pattern versionPattern = Pattern.compile("\\<a[^\\>]*href\\=\\\"([^\\\"]*\\/wiki\\/)(MessageOfTheDay(\\%3E%3D|%3C%3D|\\%3E|\\%3C)([0-9]+))\\\"[^\\>]*\\>[^\\<]*\\<\\/a\\>", Pattern.CASE_INSENSITIVE|Pattern.DOTALL|Pattern.MULTILINE);
             Matcher matcher = versionPattern.matcher(motdcontent);
@@ -119,5 +115,4 @@
                         if (message.indexOf(emptyIndicator) == -1) {
                             content += message.replace("<html>", "").replace("</html>", "").replace("<div id=\"searchable\">", "").replace("</div>", "");
-                            nothingIncluded = false;
                         }
                     } catch (IOException ioe) {
@@ -125,5 +120,4 @@
                         try {
                             content += wr.read(url).replace("<html>", "").replace("</html>", "").replace("<div id=\"searchable\">", "").replace("</div>", "");
-                            nothingIncluded = false;
                         } catch (IOException ioe2) {
                         }            
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 999)
@@ -52,5 +52,4 @@
 	 * Main application Startup
 	 */
-	@SuppressWarnings("deprecation")
 	public static void main(final String[] argArray) {
 		/////////////////////////////////////////////////////////////////////////
Index: trunk/src/org/openstreetmap/josm/gui/MapScaler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapScaler.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/MapScaler.java	(revision 999)
@@ -15,14 +15,10 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.tools.ColorHelper;
 
 public class MapScaler extends JComponent implements Helpful {
 
 	private final NavigatableComponent mv;
-	private final Projection proj;
-
 	public MapScaler(NavigatableComponent mv, Projection proj) {
 		this.mv = mv;
-		this.proj = proj;
 		setSize(100,30);
 		setOpaque(false);
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 999)
@@ -68,5 +68,4 @@
 	class ImageLabel extends JPanel {
 		private JLabel tf; 
-		private JLabel lbl;
 		private int chars;
 		public ImageLabel(String img, String tooltip, int chars) {
@@ -74,5 +73,5 @@
 			setLayout(new GridBagLayout());
 			setBackground(Color.decode("#b8cfe5"));
-			add(lbl = new JLabel(ImageProvider.get("statusline/"+img+".png")), GBC.std().anchor(GBC.WEST).insets(0,1,1,0));
+			add(new JLabel(ImageProvider.get("statusline/"+img+".png")), GBC.std().anchor(GBC.WEST).insets(0,1,1,0));
 			add(tf = new JLabel(), GBC.std().fill(GBC.BOTH).anchor(GBC.WEST).insets(2,1,1,0));
 			setToolTipText(tooltip);
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 999)
@@ -9,5 +9,4 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
-import java.awt.Transparency;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
@@ -29,5 +28,4 @@
 import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 999)
@@ -7,7 +7,5 @@
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -18,9 +16,4 @@
 import java.util.LinkedList;
 
-import javax.swing.AbstractAction;
-import javax.swing.JComponent;
-import javax.swing.KeyStroke;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
Index: trunk/src/org/openstreetmap/josm/gui/SideButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 999)
@@ -2,6 +2,4 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.marktr;
-
 import java.awt.event.ActionListener;
 import java.awt.Insets;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 999)
@@ -31,5 +31,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ConflictResolveCommand;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java	(revision 999)
@@ -219,8 +219,8 @@
 						if (RelationEditor.this.relation == null) {
 							Main.main.undoRedo.add(new AddCommand(clone));
-							Main.ds.fireSelectionChanged(Main.ds.getSelected());
+							DataSet.fireSelectionChanged(Main.ds.getSelected());
 						} else if (!RelationEditor.this.relation.realEqual(clone, true)) {
 							Main.main.undoRedo.add(new ChangeCommand(RelationEditor.this.relation, clone));
-							Main.ds.fireSelectionChanged(Main.ds.getSelected());
+							DataSet.fireSelectionChanged(Main.ds.getSelected());
 						}
 					}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 999)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -114,5 +115,5 @@
 		list.setSize(Main.ds.relations.size());
 		int i = 0;
-		for (OsmPrimitive e : Main.ds.sort(Main.ds.relations)) {
+		for (OsmPrimitive e : DataSet.sort(Main.ds.relations)) {
 			if (!e.deleted && !e.incomplete)
 				list.setElementAt(e, i++);
Index: trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 999)
@@ -99,5 +99,5 @@
 				}
 			}
-		};
+		}
 		
 		osmUrl.getDocument().addDocumentListener(new osmUrlRefresher());
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 999)
@@ -67,5 +67,4 @@
 import org.openstreetmap.josm.io.GpxWriter;
 import org.openstreetmap.josm.io.MultiPartFormOutputStream;
-import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;
 import org.openstreetmap.josm.tools.GBC;
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 999)
@@ -35,5 +35,4 @@
 import org.openstreetmap.josm.actions.SaveAsAction;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
Index: trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 999)
@@ -49,5 +49,4 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.io.MultiPartFormOutputStream;
-import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;
 import org.openstreetmap.josm.tools.GBC;
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 999)
@@ -39,5 +39,4 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.AudioPlayer;
-import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(revision 999)
@@ -37,5 +37,5 @@
 			icon.init();
 		}
-	};
+	}
 
 	public ElemStyleHandler(String name) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 999)
@@ -8,5 +8,4 @@
 
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Way;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java	(revision 999)
@@ -12,5 +12,5 @@
 
 	public boolean over;
-	public enum WidthMode { ABSOLUTE, PERCENT, OFFSET };
+	public enum WidthMode { ABSOLUTE, PERCENT, OFFSET }
 	public WidthMode widthMode;
 
@@ -57,5 +57,5 @@
 		widthMode = WidthMode.ABSOLUTE;
 		overlays = null;
-	};
+	}
 
 	// get width for overlays
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 999)
@@ -1,17 +1,10 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import java.awt.Toolkit;
-import java.io.File;
-import java.io.FileReader;
-import java.net.URL;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Iterator;
 
 import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.io.MirroredInputStream;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 999)
@@ -48,5 +48,5 @@
 			{
 				JLabel label=new JLabel();
-				String s = defaults.get((String)value);
+				String s = defaults.get(value);
 				if(s != null)
 				{
@@ -60,5 +60,5 @@
 				label.setText((String)value);
 				return label;
-			};
+			}
 		};
 		final JTable list = new JTable(model);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java	(revision 999)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.Box;
 import javax.swing.JCheckBox;
 import javax.swing.JSeparator;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 999)
@@ -47,5 +47,5 @@
 
 	/**
-	 * Only the plugin name, it's jar location and the description.
+	 * Only the plugin name, its jar location and the description.
 	 * In other words, this is the minimal requirement the plugin preference page
 	 * needs to show the plugin as available
@@ -53,5 +53,5 @@
 	 * @author imi
 	 */
-	public static class PluginDescription implements Comparable {
+	public static class PluginDescription implements Comparable<Object> {
 		// Note: All the following need to be public instance variables of
 		// type String.  (Plugin description XMLs from the server are parsed
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 999)
@@ -11,5 +11,5 @@
 
 	/**
-	 * Called, when OK is pressed to save the setting in the Preferences file.
+	 * Called when OK is pressed to save the setting in the preferences file.
 	 */
 	void ok();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 999)
@@ -12,5 +12,4 @@
 import java.util.StringTokenizer;
 
-import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 999)
@@ -145,5 +145,5 @@
 		for (Action a : actions.values())
 		{
-			us.put(a.getValue(a.NAME).toString()+a.toString(), a);
+			us.put(a.getValue(Action.NAME).toString()+a.toString(), a);
 		}
 		for (String a : us.keySet())
Index: trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 999)
@@ -8,8 +8,5 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.xml.sax.SAXException;
Index: trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 999)
@@ -2,7 +2,4 @@
 package org.openstreetmap.josm.io;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.io.BufferedReader;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -11,5 +8,4 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.IOException;
 import java.net.URL;
@@ -22,9 +18,4 @@
  * <p>
  * The file mirrored is only downloaded if it has been more than one day since last download
- *
- * @param url The URL of the remote file
- * @param destDir The destination dir of the mirrored file
- * @param maxTime The time interval, in seconds, to check if the file changed. If less than 0, it defaults to 1 week
- * @return The local file
  */
 public class MirroredInputStream extends InputStream {
Index: trunk/src/org/openstreetmap/josm/io/MyHttpURLConnection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MyHttpURLConnection.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/io/MyHttpURLConnection.java	(revision 999)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.io;
 
-import java.net.ProtocolException;
 import java.io.*;
 import java.net.URL;
Index: trunk/src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 998)
+++ trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 999)
@@ -8,12 +8,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collection;
-import java.util.Date;
 
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;