Index: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
===================================================================
--- src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 998)
+++ src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(working copy)
@@ -7,10 +7,7 @@
 import java.io.InputStream;
 
 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: src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 998)
+++ src/org/openstreetmap/josm/io/MirroredInputStream.java	(working copy)
@@ -1,9 +1,6 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 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;
 import java.io.File;
@@ -10,7 +7,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -21,11 +17,6 @@
  * Mirrors a file to a local file.
  * <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 {
 	InputStream fs = null;
Index: src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- src/org/openstreetmap/josm/io/NmeaReader.java	(revision 998)
+++ src/org/openstreetmap/josm/io/NmeaReader.java	(working copy)
@@ -7,14 +7,9 @@
 import java.io.IOException;
 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;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
Index: src/org/openstreetmap/josm/io/MyHttpURLConnection.java
===================================================================
--- src/org/openstreetmap/josm/io/MyHttpURLConnection.java	(revision 998)
+++ src/org/openstreetmap/josm/io/MyHttpURLConnection.java	(working copy)
@@ -1,7 +1,6 @@
 /* Stupid package to override the restriction on payloads with DELETEs */
 package org.openstreetmap.josm.io;
 
-import java.net.ProtocolException;
 import java.io.*;
 import java.net.URL;
 import java.net.Proxy;
Index: src/org/openstreetmap/josm/actions/AlignInRectangleAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/AlignInRectangleAction.java	(revision 998)
+++ src/org/openstreetmap/josm/actions/AlignInRectangleAction.java	(working copy)
@@ -16,7 +16,6 @@
 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;
 import org.openstreetmap.josm.data.osm.Way;
Index: src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 998)
+++ src/org/openstreetmap/josm/actions/UnGlueAction.java	(working copy)
@@ -14,7 +14,6 @@
 import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
Index: src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 998)
+++ src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(working copy)
@@ -5,9 +5,6 @@
 
 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;
 import org.openstreetmap.josm.data.osm.Relation;
Index: src/org/openstreetmap/josm/actions/PasteAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/PasteAction.java	(revision 998)
+++ src/org/openstreetmap/josm/actions/PasteAction.java	(working copy)
@@ -12,9 +12,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import java.awt.event.MouseMotionListener;
-import javax.swing.JOptionPane;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.Command;
@@ -55,7 +52,7 @@
 			mPosition = Main.map.mapView.getCenter();
 		} else {
 			mPosition = Main.map.mapView.getEastNorth(Main.map.mapView.lastMEvent.getX(), Main.map.mapView.lastMEvent.getY());
-		};
+		}
 
 		double offsetEast  = mPosition.east() - (maxEast + minEast)/2.0;
 		double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0;
Index: src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 998)
+++ src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(working copy)
@@ -38,7 +38,6 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 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;
 import org.openstreetmap.josm.data.coor.LatLon;
Index: src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 998)
+++ src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(working copy)
@@ -21,7 +21,6 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 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;
 import org.openstreetmap.josm.data.osm.Way;
@@ -67,12 +66,6 @@
 	private int initialMoveDelay = 200;
 
 	/**
-	 * 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,7 +75,7 @@
 			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) {}
+		try { Integer.parseInt(Main.pref.get("edit.initial-move-threshold","5")); } catch (NumberFormatException x) {}
 		selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW);
 	}
 
Index: src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 998)
+++ src/org/openstreetmap/josm/actions/CreateCircleAction.java	(working copy)
@@ -14,10 +14,8 @@
 import org.openstreetmap.josm.command.Command;
 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;
 import org.openstreetmap.josm.data.osm.Way;
Index: src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java	(revision 998)
+++ src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java	(working copy)
@@ -15,7 +15,6 @@
 import java.util.Iterator;
 
 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;
 import org.openstreetmap.josm.data.osm.Node;
@@ -21,7 +20,6 @@
 import org.openstreetmap.josm.data.osm.Node;
 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: src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 998)
+++ src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(working copy)
@@ -6,11 +6,9 @@
 import java.awt.BasicStroke;
 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;
 import java.util.Collection;
@@ -19,8 +17,6 @@
 import javax.swing.ImageIcon;
 
 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;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -27,7 +23,6 @@
 import org.openstreetmap.josm.data.osm.Relation;
 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;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
Index: src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/Relation.java	(revision 998)
+++ src/org/openstreetmap/josm/data/osm/Relation.java	(working copy)
@@ -4,7 +4,6 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
Index: src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 998)
+++ src/org/openstreetmap/josm/data/osm/DataSet.java	(working copy)
@@ -1,8 +1,6 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm;
 
-import java.awt.Polygon;
-import java.awt.Shape;
 import java.awt.geom.Area;
 import java.util.Arrays;
 import java.util.Collection;
Index: src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/Node.java	(revision 998)
+++ src/org/openstreetmap/josm/data/osm/Node.java	(working copy)
@@ -2,8 +2,6 @@
 package org.openstreetmap.josm.data.osm;
 
 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: src/org/openstreetmap/josm/data/Bounds.java
===================================================================
--- src/org/openstreetmap/josm/data/Bounds.java	(revision 998)
+++ src/org/openstreetmap/josm/data/Bounds.java	(working copy)
@@ -2,7 +2,6 @@
 package org.openstreetmap.josm.data;
 
 import java.awt.geom.Rectangle2D;
-import java.awt.geom.RectangularShape;
 
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -70,8 +69,8 @@
 	}
 	
 	/**
-	 * 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() {
 		return new Rectangle2D.Double(min.lon(), min.lat(), max.lon()-min.lon(), max.lat()-min.lat());
Index: src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/SelectionManager.java	(working copy)
@@ -6,9 +6,7 @@
 import java.awt.Graphics;
 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;
 import java.awt.event.MouseMotionListener;
@@ -17,11 +15,6 @@
 import java.util.Collection;
 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;
 import org.openstreetmap.josm.data.osm.Way;
Index: src/org/openstreetmap/josm/gui/SideButton.java
===================================================================
--- src/org/openstreetmap/josm/gui/SideButton.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/SideButton.java	(working copy)
@@ -1,8 +1,6 @@
 package org.openstreetmap.josm.gui;
 
 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;
 import javax.swing.Action;
Index: src/org/openstreetmap/josm/gui/MapScaler.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapScaler.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/MapScaler.java	(working copy)
@@ -14,7 +14,6 @@
 import org.openstreetmap.josm.actions.HelpAction.Helpful;
 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 {
 
@@ -19,11 +18,8 @@
 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: src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(working copy)
@@ -144,7 +144,7 @@
 		Map<String, Action> us = new TreeMap<String, Action>();
 		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())
 			unselected.addElement(us.get(a));
Index: src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(working copy)
@@ -47,7 +47,7 @@
 				boolean isSelected, boolean hasFocus, int row, int column)
 			{
 				JLabel label=new JLabel();
-				String s = defaults.get((String)value);
+				String s = defaults.get(value);
 				if(s != null)
 				{
 					if(s.equals(model.getValueAt(row, 1)))
@@ -59,7 +59,7 @@
 					label.setToolTipText(tr("Default value currently unknown (setting has not been used yet)."));
 				label.setText((String)value);
 				return label;
-			};
+			}
 		};
 		final JTable list = new JTable(model);
 		list.getColumn(tr("Key")).setCellRenderer(renderer);
Index: src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(working copy)
@@ -10,7 +10,7 @@
 	void addGui(PreferenceDialog gui);
 
 	/**
-	 * 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: src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(working copy)
@@ -46,7 +46,7 @@
 public class PluginPreference implements PreferenceSetting {
 
 	/**
-	 * 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
 	 * 
@@ -52,7 +52,7 @@
 	 * 
 	 * @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
 		// with tools.XmlObjectParser, which uses reflection to access them.)
Index: src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(working copy)
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.DefaultListModel;
Index: src/org/openstreetmap/josm/gui/preferences/FilePreferences.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/FilePreferences.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/preferences/FilePreferences.java	(working copy)
@@ -3,7 +3,6 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.Box;
 import javax.swing.JCheckBox;
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
Index: src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(working copy)
@@ -98,7 +98,7 @@
 					}
 				}
 			}
-		};
+		}
 		
 		osmUrl.getDocument().addDocumentListener(new osmUrlRefresher());
 		
Index: src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- src/org/openstreetmap/josm/gui/MainApplication.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/MainApplication.java	(working copy)
@@ -51,7 +51,6 @@
 	/**
 	 * Main application Startup
 	 */
-	@SuppressWarnings("deprecation")
 	public static void main(final String[] argArray) {
 		/////////////////////////////////////////////////////////////////////////
 		//                        TO ALL TRANSLATORS
Index: src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapView.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/MapView.java	(working copy)
@@ -8,7 +8,6 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Point;
-import java.awt.Transparency;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
 import java.awt.event.ComponentAdapter;
@@ -28,7 +27,6 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 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;
 import org.openstreetmap.josm.data.coor.LatLon;
Index: src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/GettingStarted.java	(working copy)
@@ -18,7 +18,6 @@
 import javax.swing.border.EmptyBorder;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.WikiReader;
 import org.openstreetmap.josm.actions.AboutAction;
@@ -25,11 +24,9 @@
 
 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");
             setText(text);
@@ -72,7 +69,6 @@
 
             /* 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);
             matcher.reset();
@@ -118,7 +114,6 @@
                         }
                         if (message.indexOf(emptyIndicator) == -1) {
                             content += message.replace("<html>", "").replace("</html>", "").replace("<div id=\"searchable\">", "").replace("</div>", "");
-                            nothingIncluded = false;
                         }
                     } catch (IOException ioe) {
                         url = matcher.group(1) + matcher.group(2);
@@ -124,7 +119,6 @@
                         url = matcher.group(1) + matcher.group(2);
                         try {
                             content += wr.read(url).replace("<html>", "").replace("</html>", "").replace("<div id=\"searchable\">", "").replace("</div>", "");
-                            nothingIncluded = false;
                         } catch (IOException ioe2) {
                         }            
                     }            
Index: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(working copy)
@@ -30,7 +30,6 @@
 
 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;
 import org.openstreetmap.josm.data.osm.Relation;
Index: src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java	(working copy)
@@ -218,10 +218,10 @@
 						// clicked ok!
 						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());
 						}
 					}
 					setVisible(false);
Index: src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(working copy)
@@ -21,6 +21,7 @@
 
 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;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -113,7 +114,7 @@
 	public void updateList() {
 		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: src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(working copy)
@@ -66,7 +66,6 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 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;
 import org.openstreetmap.josm.tools.ImageProvider;
Index: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(working copy)
@@ -34,7 +34,6 @@
 import org.openstreetmap.josm.actions.SaveAction;
 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;
 import org.openstreetmap.josm.data.osm.DataSet;
Index: src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(working copy)
@@ -38,7 +38,6 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 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: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(working copy)
@@ -48,7 +48,6 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 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;
 import org.openstreetmap.josm.tools.ImageProvider;
Index: src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(working copy)
@@ -36,7 +36,7 @@
 			area.init();
 			icon.init();
 		}
-	};
+	}
 
 	public ElemStyleHandler(String name) {
 		styleName = name;
Index: src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java	(working copy)
@@ -11,7 +11,7 @@
 	public boolean dashed;
 
 	public boolean over;
-	public enum WidthMode { ABSOLUTE, PERCENT, OFFSET };
+	public enum WidthMode { ABSOLUTE, PERCENT, OFFSET }
 	public WidthMode widthMode;
 
 	public Collection<LineElemStyle> overlays;
@@ -56,7 +56,7 @@
 		over = true; // only used for line modifications
 		widthMode = WidthMode.ABSOLUTE;
 		overlays = null;
-	};
+	}
 
 	// get width for overlays
 	public int getWidth(int ref)
Index: src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(working copy)
@@ -1,13 +1,7 @@
 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;
 
@@ -12,7 +6,6 @@
 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;
 import org.openstreetmap.josm.tools.ImageProvider;
Index: src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(working copy)
@@ -7,7 +7,6 @@
 import java.util.Iterator;
 
 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;
 import org.openstreetmap.josm.Main;
Index: src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapStatus.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/MapStatus.java	(working copy)
@@ -67,7 +67,6 @@
 	 */
 	class ImageLabel extends JPanel {
 		private JLabel tf; 
-		private JLabel lbl;
 		private int chars;
 		public ImageLabel(String img, String tooltip, int chars) {
 			super();
@@ -73,7 +72,7 @@
 			super();
 			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);
 			this.chars = chars;