Index: src/org/openstreetmap/josm/Main.java
===================================================================
--- src/org/openstreetmap/josm/Main.java	(revision 241)
+++ src/org/openstreetmap/josm/Main.java	(revision 242)
@@ -28,5 +28,4 @@
 import javax.swing.UIManager;
 
-import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
Index: src/org/openstreetmap/josm/actions/DownloadAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 241)
+++ src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 242)
@@ -3,44 +3,16 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.GridBagLayout;
-import java.awt.GridLayout;
 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;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.BookmarkList;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
-import org.openstreetmap.josm.gui.download.WorldChooser;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
-import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.tools.GBC;
 
Index: src/org/openstreetmap/josm/actions/ReorderAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/ReorderAction.java	(revision 241)
+++ src/org/openstreetmap/josm/actions/ReorderAction.java	(revision 242)
@@ -155,6 +155,5 @@
 			return new SequenceCommand(tr("Reorder segments for way {0}",v.name), c);
 		}
-		else
-			return null;
+		return null;
     }
 
Index: src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/UploadAction.java	(revision 241)
+++ src/org/openstreetmap/josm/actions/UploadAction.java	(revision 242)
@@ -9,5 +9,4 @@
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.List;
 
 import javax.swing.JLabel;
Index: src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- src/org/openstreetmap/josm/gui/MainMenu.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/MainMenu.java	(revision 242)
@@ -4,5 +4,4 @@
 
 import javax.swing.Action;
-import javax.swing.Box;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
Index: src/org/openstreetmap/josm/gui/MapMover.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapMover.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/MapMover.java	(revision 242)
@@ -16,5 +16,4 @@
 import javax.swing.KeyStroke;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 
Index: src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 242)
@@ -4,5 +4,4 @@
 
 import java.awt.BorderLayout;
-
 import java.awt.event.KeyEvent;
 import java.util.Arrays;
@@ -11,10 +10,7 @@
 import java.util.HashMap;
 
-import javax.swing.DefaultListModel;
-
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-
 import javax.swing.table.DefaultTableModel;
 
@@ -74,5 +70,5 @@
 			int count;
 			UserCount(User user, int count) { this.user=user; this.count=count; }
-		};
+		}
 		
 		if (data == null)
@@ -97,5 +93,5 @@
 			public int compare(UserCount a, UserCount b) { 
 				return (a.count<b.count) ? 1 : (a.count>b.count) ? -1 : 0;
-			};
+			}
 		});
 		
Index: src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
===================================================================
--- src/org/openstreetmap/josm/gui/download/BookmarkSelection.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/download/BookmarkSelection.java	(revision 242)
@@ -7,11 +7,7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -22,5 +18,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.BookmarkList;
 import org.openstreetmap.josm.tools.GBC;
Index: src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 242)
@@ -14,7 +14,5 @@
 import java.awt.event.KeyListener;
 import java.util.HashMap;
-import java.util.StringTokenizer;
-
-import javax.swing.BorderFactory;
+
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -26,8 +24,5 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.GBC;
-
-import com.sun.corba.se.spi.orb.StringPair;
 /**
  * Bounding box selector.
@@ -99,5 +94,5 @@
 					}
 				});
-			};
+			}
 		};
 		
@@ -189,24 +184,23 @@
 			}
 		}
-		if (map.containsKey("bbox")) {
-			String bbox[] = map.get("bbox").split(",");
-			try {
-				return new Bounds(
+
+		Bounds b = null;
+		try {
+			if (map.containsKey("bbox")) {
+				String bbox[] = map.get("bbox").split(",");
+				b = new Bounds(
 					new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
 					new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
-			} catch (Exception x) { // NPE or IAE
-				return null;
-			}
 			
-		} else {
-			try {
+			} else {
 				double size = 180.0 / Math.pow(2, Integer.parseInt(map.get("zoom")));
-				return new Bounds(
-					new LatLon(Double.parseDouble(map.get("lat")) - size/2, Double.parseDouble(map.get("lon")) - size),
-					new LatLon(Double.parseDouble(map.get("lat")) + size/2, Double.parseDouble(map.get("lon")) + size));
-			} catch (Exception x) { // NPE or IAE
-				return null;
-			}
-		}
+				b = new Bounds(
+	            	new LatLon(Double.parseDouble(map.get("lat")) - size/2, Double.parseDouble(map.get("lon")) - size),
+	            	new LatLon(Double.parseDouble(map.get("lat")) + size/2, Double.parseDouble(map.get("lon")) + size));
+			}
+		} catch (NumberFormatException x) {
+		} catch (NullPointerException x) {
+		}
+		return b;
 	}
 }
Index: src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 242)
@@ -3,8 +3,6 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
@@ -18,6 +16,4 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.plugins.PluginProxy;
Index: src/org/openstreetmap/josm/gui/download/DownloadSelection.java
===================================================================
--- src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 242)
@@ -1,6 +1,4 @@
 package org.openstreetmap.josm.gui.download;
 
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 
 public interface DownloadSelection {
Index: src/org/openstreetmap/josm/gui/download/WorldChooser.java
===================================================================
--- src/org/openstreetmap/josm/gui/download/WorldChooser.java	(revision 241)
+++ src/org/openstreetmap/josm/gui/download/WorldChooser.java	(revision 242)
@@ -2,4 +2,5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -8,7 +9,4 @@
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.beans.PropertyChangeListener;
 import java.net.URL;
@@ -17,15 +15,9 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.Main;
-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.projection.Projection;
-import org.openstreetmap.josm.gui.BookmarkList;
 import org.openstreetmap.josm.gui.MapMover;
 import org.openstreetmap.josm.gui.MapScaler;
Index: src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- src/org/openstreetmap/josm/io/OsmReader.java	(revision 241)
+++ src/org/openstreetmap/josm/io/OsmReader.java	(revision 242)
@@ -6,5 +6,4 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.lang.reflect.Array;
 import java.text.ParseException;
 import java.util.Arrays;
@@ -15,5 +14,4 @@
 import java.util.Map;
 import java.util.Map.Entry;
-
 
 import org.openstreetmap.josm.Main;