Changeset 5926 in josm for trunk/src

Timestamp:

2013-05-05T21:56:58+02:00 (12 years ago)

Author:

bastiK

Message:

clean up imports

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddNodeAction.java (modified) (1 diff)
• actions/HistoryInfoWebAction.java (modified) (1 diff)
• actions/InfoWebAction.java (modified) (1 diff)
• actions/ParameterizedAction.java (modified) (1 diff)
• actions/SessionLoadAction.java (modified) (1 diff)
• actions/UnselectAllAction.java (modified) (1 diff)
• actions/ZoomInAction.java (modified) (1 diff)
• actions/ZoomOutAction.java (modified) (1 diff)
• actions/upload/ValidateUploadHook.java (modified) (2 diffs)
• command/AddPrimitivesCommand.java (modified) (1 diff)
• command/ModifiedConflictResolveCommand.java (modified) (1 diff)
• command/PseudoCommand.java (modified) (1 diff)
• command/SequenceCommand.java (modified) (1 diff)
• data/osm/Filter.java (modified) (1 diff)
• data/projection/datum/GRS80Datum.java (modified) (1 diff)
• data/projection/datum/NTV2GridShiftFileWrapper.java (modified) (1 diff)
• data/projection/datum/WGS84Datum.java (modified) (1 diff)
• data/projection/proj/TransverseMercator.java (modified) (1 diff)
• gui/BookmarkList.java (modified) (1 diff)
• gui/HelpAwareOptionPane.java (modified) (1 diff)
• gui/IconToggleButton.java (modified) (1 diff)
• gui/SideButton.java (modified) (1 diff)
• gui/SplashScreen.java (modified) (2 diffs)
• gui/conflict/ConflictColors.java (modified) (1 diff)
• gui/dialogs/CommandStackDialog.java (modified) (1 diff)
• gui/dialogs/FilterDialog.java (modified) (1 diff)
• gui/dialogs/FilterTableModel.java (modified) (1 diff)
• gui/history/HistoryBrowserModel.java (modified) (1 diff)
• gui/history/HistoryLoadTask.java (modified) (1 diff)
• gui/history/VersionInfoPanel.java (modified) (2 diffs)
• gui/io/UpdatePrimitivesTask.java (modified) (1 diff)
• gui/layer/gpx/DateFilterPanel.java (modified) (3 diffs)
• gui/mappaint/Cascade.java (modified) (1 diff)
• gui/preferences/server/ApiUrlTestTask.java (modified) (1 diff)
• gui/tagging/ac/AutoCompletionManager.java (modified) (1 diff)
• gui/util/RedirectInputMap.java (modified) (1 diff)
• io/MirroredInputStream.java (modified) (1 diff)
• io/OsmExporter.java (modified) (1 diff)
• io/imagery/WMSGrabber.java (modified) (1 diff)
• plugins/ReadRemotePluginInformationTask.java (modified) (1 diff)
• tools/LanguageInfo.java (modified) (1 diff)
• tools/Shortcut.java (modified) (2 diffs)
• tools/WindowGeometry.java (modified) (1 diff)
• tools/XmlObjectParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;

trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.tools.Shortcut;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 public class HistoryInfoWebAction extends AbstractInfoAction {

trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;

trunk/src/org/openstreetmap/josm/actions/ParameterizedAction.java

@@ -6 +6 @@
 import java.util.Map;
 
-import javax.swing.Action;
-
 public interface ParameterizedAction extends AdaptableAction {
 

trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.NavigatableComponent.ViewportData;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;

trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Shortcut;
 

trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;

trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.upload;
 
-import java.awt.Dimension;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
@@ -10 +10 @@
 import java.util.List;
 
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -9 +9 @@
 import java.util.List;
 import javax.swing.Icon;
-
-import javax.swing.JLabel;
 
 import org.openstreetmap.josm.data.osm.DataSet;

trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java

@@ -6 +6 @@
 
 import java.util.Collection;
+
 import javax.swing.Icon;
-
-import javax.swing.JLabel;
 
 import org.openstreetmap.josm.data.conflict.Conflict;

trunk/src/org/openstreetmap/josm/command/PseudoCommand.java

@@ -3 +3 @@
 
 import java.util.Collection;
+
 import javax.swing.Icon;
-import javax.swing.JLabel;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;

trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

@@ -8 +8 @@
 import java.util.HashSet;
 import java.util.List;
+
 import javax.swing.Icon;
 
-import javax.swing.JLabel;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.ImageProvider;

trunk/src/org/openstreetmap/josm/data/osm/Filter.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.Preferences.pref;
 import org.openstreetmap.josm.data.Preferences.writeExplicitly;
-import org.openstreetmap.josm.tools.Utils;
 
 /**

trunk/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Ellipsoid;
 

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

@@ -6 +6 @@
 import java.io.InputStream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.MirroredInputStream;
 

trunk/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Ellipsoid;
 

trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.data.projection.Ellipsoid;
 import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
 

trunk/src/org/openstreetmap/josm/gui/BookmarkList.java

@@ -5 +5 @@
 
 import java.awt.Component;
-import java.io.IOException;
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;

trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

@@ -13 +13 @@
 import java.util.List;
 
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.gui.help.HelpBrowser;

trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java

@@ -7 +7 @@
 import java.beans.PropertyChangeListener;
 
-import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.Icon;

trunk/src/org/openstreetmap/josm/gui/SideButton.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -6 +6 @@
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -12 +11 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-
 import java.util.Arrays;
 import java.util.LinkedList;
+
 import javax.swing.JFrame;
 import javax.swing.JLabel;

trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java

@@ -5 +5 @@
 
 import java.awt.Color;
-import java.util.List;
 
 import org.openstreetmap.josm.Main;

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -14 +14 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import javax.swing.BorderFactory;

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -42 +42 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmServerHistoryReader;
 import org.openstreetmap.josm.io.OsmTransferException;

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.history;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -6 +8 @@
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java

@@ -6 +6 @@
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Collections;
-
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.data.osm.DataSet;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

@@ -1 +1 @@
 // License: GPL. See LICENSE file for details.
 package org.openstreetmap.josm.gui.layer.gpx;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
@@ -6 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import javax.swing.AbstractAction;
-import javax.swing.JButton;
+
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
@@ -16 +16 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.GBC;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.widgets.DateEditorWithSlider;
+import org.openstreetmap.josm.tools.GBC;
 
 public class DateFilterPanel extends JPanel {

trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
-import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
 import org.openstreetmap.josm.tools.Utils;
 

trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

@@ -14 +14 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;

trunk/src/org/openstreetmap/josm/gui/util/RedirectInputMap.java

@@ -6 +6 @@
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
-
-import org.openstreetmap.josm.Main;
 
 /**

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -14 +14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;

trunk/src/org/openstreetmap/josm/io/OsmExporter.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -26 +26 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.tools;
-
-import static org.openstreetmap.josm.tools.I18n.marktr;
-
-import org.openstreetmap.josm.Main;
 
 import java.util.Locale;

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -17 +16 @@
 import javax.swing.AbstractButton;
 import javax.swing.JMenu;
-import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 

trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -30 +30 @@
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;