Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (working copy) @@ -4,7 +4,6 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import org.openstreetmap.josm.Main; @@ -9,8 +8,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; import org.openstreetmap.josm.tools.AudioPlayer; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (working copy) @@ -1,8 +1,6 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others package org.openstreetmap.josm.actions.audio; -import static org.openstreetmap.josm.tools.I18n.tr; - import java.awt.event.ActionEvent; import org.openstreetmap.josm.Main; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (working copy) @@ -4,7 +4,6 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import org.openstreetmap.josm.Main; @@ -9,8 +8,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; import org.openstreetmap.josm.tools.AudioPlayer; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (working copy) @@ -4,13 +4,9 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; public class AudioNextAction extends JosmAction { Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (working copy) @@ -4,14 +4,12 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.net.URL; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; import org.openstreetmap.josm.tools.AudioPlayer; -import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; public class AudioPlayPauseAction extends JosmAction { Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (working copy) @@ -4,13 +4,9 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; public class AudioPrevAction extends JosmAction { Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/CombineWayAction.java (working copy) @@ -8,10 +8,10 @@ import java.awt.event.KeyEvent; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import java.util.ArrayList; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -17,7 +17,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.Map.Entry; -import java.util.HashSet; import javax.swing.Box; import javax.swing.JComboBox; @@ -32,14 +31,14 @@ 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; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; +import org.openstreetmap.josm.data.osm.TigerUtils; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.TigerUtils; +import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.Pair; -import org.openstreetmap.josm.tools.GBC; /** * Combines multiple ways into one. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/CopyAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/CopyAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/CopyAction.java (working copy) @@ -7,10 +7,10 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; -import java.util.LinkedList; -import java.util.Collection; import javax.swing.JOptionPane; @@ -17,10 +17,10 @@ import org.openstreetmap.josm.Main; 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; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (working copy) @@ -9,12 +9,12 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.DownloadAction; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.gui.PleaseWaitRunnable; import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask; +import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.layer.GpxLayer; -import org.openstreetmap.josm.data.gpx.GpxData; -import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.io.BoundingBoxDownloader; import org.xml.sax.SAXException; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/GpxExportAction.java (working copy) @@ -27,13 +27,12 @@ import javax.swing.ListSelectionModel; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.io.GpxWriter; -import org.openstreetmap.josm.io.XmlWriter; import org.openstreetmap.josm.tools.GBC; -import org.openstreetmap.josm.data.gpx.GpxData; /** * Exports data to gpx. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (working copy) @@ -3,33 +3,25 @@ import static org.openstreetmap.josm.tools.I18n.tr; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; import java.util.ArrayList; -import java.util.LinkedList; import java.util.Collection; import java.util.Collections; -import java.util.List; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; import java.util.Map; -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.WaySegment; -import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.plugins.Plugin; -import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.command.ChangeCommand; import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.command.AddCommand; -import org.openstreetmap.josm.command.DeleteCommand; -import org.openstreetmap.josm.command.ChangeCommand; import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; - -import javax.swing.AbstractAction; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.WaySegment; public class JoinNodeWayAction extends JosmAction { public JoinNodeWayAction() { Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (working copy) @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -17,15 +17,19 @@ import javax.swing.JOptionPane; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.command.*; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.DeleteCommand; +import org.openstreetmap.josm.command.SequenceCommand; 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.Way; import org.openstreetmap.josm.data.osm.WaySegment; -import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor; import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.tools.*; +import org.openstreetmap.josm.tools.ImageProvider; /** * An action that enables the user to delete nodes and other objects. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (working copy) @@ -7,8 +7,6 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import javax.swing.KeyStroke; -import javax.swing.JComponent; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -15,12 +13,14 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.LinkedList; -import java.util.List; +import javax.swing.JComponent; import javax.swing.JOptionPane; +import javax.swing.KeyStroke; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.AddCommand; @@ -29,7 +29,6 @@ import org.openstreetmap.josm.command.SequenceCommand; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.tools.Pair; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.WaySegment; @@ -35,6 +34,7 @@ import org.openstreetmap.josm.data.osm.WaySegment; import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Pair; /** * Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (working copy) @@ -4,42 +4,13 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Cursor; -import java.awt.Graphics; -import java.awt.Insets; import java.awt.Point; -import java.awt.Rectangle; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionListener; -import java.io.IOException; -import java.net.URL; -import java.util.Collection; -import java.util.Iterator; - -import javax.swing.BorderFactory; -import javax.swing.Icon; -import javax.swing.JOptionPane; -import javax.swing.Timer; -import javax.swing.border.BevelBorder; -import javax.swing.border.Border; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.actions.mapmode.SelectAction.Mode; -import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.tools.AudioPlayer; -import org.openstreetmap.josm.data.gpx.GpxTrack; -import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.data.coor.EastNorth; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker; -import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.gui.layer.GpxLayer; - -import org.openstreetmap.josm.tools.ImageProvider; /** * Singleton marker class to track position of audio. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (working copy) @@ -6,11 +6,10 @@ import java.awt.Cursor; import java.awt.Point; import java.awt.Rectangle; +import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import java.awt.event.ActionEvent; import java.util.Collection; -import java.util.Collections; import java.util.LinkedList; import javax.swing.JOptionPane; @@ -16,7 +15,7 @@ import javax.swing.JOptionPane; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.actions.GroupAction; +import org.openstreetmap.josm.actions.MergeNodesAction; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.command.MoveCommand; import org.openstreetmap.josm.command.RotateCommand; @@ -28,7 +27,6 @@ import org.openstreetmap.josm.gui.SelectionManager; import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.actions.MergeNodesAction; /** * Move is an action that can move all kind of OsmPrimitives (except Keys for now). * Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/MergeNodesAction.java (working copy) @@ -6,12 +6,11 @@ import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; -import java.util.List; -import java.util.ListIterator; -import java.util.ArrayList; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -17,7 +16,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.Map.Entry; -import java.util.HashSet; import javax.swing.Box; import javax.swing.JComboBox; @@ -32,15 +30,15 @@ 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; 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.data.osm.Node; import org.openstreetmap.josm.data.osm.TigerUtils; -import org.openstreetmap.josm.tools.Pair; +import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor; import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Pair; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/OpenAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/OpenAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/OpenAction.java (working copy) @@ -17,11 +17,11 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; +import org.openstreetmap.josm.io.GpxReader; import org.openstreetmap.josm.io.OsmReader; -import org.openstreetmap.josm.io.GpxReader; import org.xml.sax.SAXException; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/PasteAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/PasteAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/PasteAction.java (working copy) @@ -16,13 +16,13 @@ import org.openstreetmap.josm.command.AddCommand; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.Relation; 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.data.coor.EastNorth; public final class PasteAction extends JosmAction { Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/PasteTagsAction.java (working copy) @@ -7,11 +7,10 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.Collection; -import java.util.LinkedList; -import java.util.Iterator; import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; import java.util.Map; -import java.util.Map.Entry; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.ChangePropertyCommand; @@ -18,11 +17,7 @@ import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.command.SequenceCommand; import org.openstreetmap.josm.data.SelectionChangedListener; -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.Way; -import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.OsmPrimitive; public final class PasteTagsAction extends JosmAction implements SelectionChangedListener { Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/ReverseWayAction.java (working copy) @@ -15,9 +15,9 @@ import org.openstreetmap.josm.command.ChangeCommand; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.command.SequenceCommand; -import org.openstreetmap.josm.data.osm.Relation; 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.Way; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SaveAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SaveAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SaveAction.java (working copy) @@ -7,8 +7,8 @@ import java.awt.event.KeyEvent; import java.io.File; +import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SaveActionBase.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SaveActionBase.java (working copy) @@ -5,9 +5,9 @@ import java.awt.event.ActionEvent; import java.io.File; -import java.io.FileOutputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; import javax.swing.JFileChooser; @@ -16,11 +16,11 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.layer.GpxLayer; +import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.layer.GpxLayer; +import org.openstreetmap.josm.io.GpxWriter; import org.openstreetmap.josm.io.OsmWriter; -import org.openstreetmap.josm.io.GpxWriter; public abstract class SaveActionBase extends DiskAccessAction { Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (working copy) @@ -1,18 +1,15 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others package org.openstreetmap.josm.actions.search; -import java.io.IOException; import java.io.PushbackReader; import java.io.StringReader; import java.util.Map.Entry; -import java.util.regex.Pattern; -import java.util.regex.Matcher; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.User; +import org.openstreetmap.josm.data.osm.Way; /** * Implements a google-like search. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/SplitWayAction.java (working copy) @@ -8,8 +8,6 @@ import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -27,9 +25,9 @@ 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.Relation; 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.Way; import org.openstreetmap.josm.data.osm.visitor.NameVisitor; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/UnselectAllAction.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/actions/UnselectAllAction.java (working copy) @@ -5,8 +5,9 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; + +import javax.swing.JComponent; import javax.swing.KeyStroke; -import javax.swing.JComponent; import org.openstreetmap.josm.Main; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/AddCommand.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/AddCommand.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/AddCommand.java (working copy) @@ -11,7 +11,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.visitor.AddVisitor; import org.openstreetmap.josm.data.osm.visitor.DeleteVisitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/Command.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/Command.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/Command.java (working copy) @@ -9,9 +9,9 @@ import javax.swing.tree.MutableTreeNode; -import org.openstreetmap.josm.data.osm.Relation; 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.Way; import org.openstreetmap.josm.data.osm.visitor.Visitor; import org.openstreetmap.josm.gui.layer.Layer; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/command/DeleteCommand.java (working copy) @@ -10,7 +10,6 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.MutableTreeNode; -import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.visitor.NameVisitor; import org.openstreetmap.josm.tools.ImageProvider; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/coor/LatLon.java (working copy) @@ -1,9 +1,10 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others package org.openstreetmap.josm.data.coor; +import java.text.NumberFormat; + import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.projection.Projection; -import java.text.NumberFormat; /** * LatLon are unprojected latitude / longitude coordinates. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/gpx/GpxData.java (working copy) @@ -2,14 +2,12 @@ package org.openstreetmap.josm.data.gpx; +import java.io.File; import java.util.Collection; import java.util.LinkedList; import java.util.Map; -import java.util.HashMap; + import org.openstreetmap.josm.data.Bounds; -import org.openstreetmap.josm.data.coor.LatLon; -import java.lang.Math; -import java.io.File; /** * objects of this class represent a gpx file with tracks, waypoints and routes Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/Node.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/Node.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/Node.java (working copy) @@ -2,8 +2,8 @@ package org.openstreetmap.josm.data.osm; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/Relation.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/Relation.java (working copy) @@ -2,9 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.Map.Entry; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (working copy) @@ -2,8 +2,8 @@ package org.openstreetmap.josm.data.osm.visitor; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (working copy) @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.HashSet; +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.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (working copy) @@ -4,8 +4,8 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (working copy) @@ -5,10 +5,10 @@ import java.util.HashSet; import org.openstreetmap.josm.data.osm.DataSet; +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.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (working copy) @@ -2,8 +2,8 @@ package org.openstreetmap.josm.data.osm.visitor; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (working copy) @@ -9,10 +9,10 @@ import java.util.Map; import org.openstreetmap.josm.data.osm.DataSet; +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.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (working copy) @@ -7,7 +7,6 @@ import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.HashSet; -import java.util.Set; import javax.swing.Icon; import javax.swing.JLabel; @@ -13,9 +12,9 @@ import javax.swing.JLabel; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.osm.Relation; 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.Way; import org.openstreetmap.josm.tools.ImageProvider; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (working copy) @@ -7,13 +7,13 @@ import java.awt.Point; import java.awt.Rectangle; import java.awt.geom.GeneralPath; +import java.util.Iterator; -import java.util.Iterator; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.Relation; 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.Way; import org.openstreetmap.josm.gui.NavigatableComponent; import org.openstreetmap.josm.tools.ColorHelper; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (working copy) @@ -1,8 +1,8 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others package org.openstreetmap.josm.data.osm.visitor; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/projection/Epsg4326.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/projection/Epsg4326.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/projection/Epsg4326.java (working copy) @@ -1,8 +1,8 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others package org.openstreetmap.josm.data.projection; +import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.data.coor.EastNorth; /** * Directly use latitude / longitude values as x/y. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/ServerSidePreferences.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/data/ServerSidePreferences.java (working copy) @@ -11,9 +11,9 @@ import java.io.Reader; import java.io.StringReader; import java.net.HttpURLConnection; -import java.net.URLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.net.URLConnection; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (working copy) @@ -32,10 +32,10 @@ import org.openstreetmap.josm.command.ConflictResolveCommand; 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; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (working copy) @@ -14,7 +14,6 @@ import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; -import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (working copy) @@ -13,7 +13,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Collections; import java.util.Map.Entry; import javax.swing.JButton; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (working copy) @@ -10,10 +10,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.Arrays; -import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import javax.swing.DefaultListModel; import javax.swing.JButton; @@ -18,7 +15,6 @@ import javax.swing.DefaultListModel; import javax.swing.JButton; import javax.swing.JList; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; @@ -25,10 +21,7 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.DeleteCommand; -import org.openstreetmap.josm.data.SelectionChangedListener; -import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.gui.OsmPrimitivRenderer; import org.openstreetmap.josm.gui.layer.DataChangeListener; import org.openstreetmap.josm.gui.layer.Layer; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (working copy) @@ -22,6 +22,7 @@ import javax.swing.ListSelectionModel; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.data.SelectionChangedListener; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -27,7 +28,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.gui.OsmPrimitivRenderer; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.actions.JosmAction; /** * A small tool dialog for displaying the current selection. The selection manager Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (working copy) @@ -7,9 +7,9 @@ import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import javax.swing.DefaultListModel; import javax.swing.JButton; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (working copy) @@ -20,7 +20,6 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.SwingUtilities; -import javax.swing.text.JTextComponent; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.Bounds; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/GettingStarted.java (working copy) @@ -3,7 +3,6 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.Dimension; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -12,7 +11,6 @@ import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JTextField; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (working copy) @@ -17,9 +17,9 @@ import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; @@ -35,6 +35,7 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.Icon; import javax.swing.ImageIcon; +import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JLabel; @@ -46,7 +47,6 @@ import javax.swing.JSeparator; import javax.swing.JTextField; import javax.swing.JToggleButton; -import javax.swing.JButton; import javax.swing.JViewport; import javax.swing.border.BevelBorder; import javax.swing.border.Border; @@ -56,10 +56,9 @@ import org.openstreetmap.josm.actions.RenameLayerAction; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; -import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.data.gpx.GpxTrack; import org.openstreetmap.josm.data.gpx.WayPoint; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.PleaseWaitRunnable; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (working copy) @@ -10,15 +10,12 @@ import java.awt.Graphics; import java.awt.GridBagLayout; import java.awt.Point; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; @@ -23,7 +20,8 @@ import java.net.URL; import java.net.URLConnection; import java.net.UnknownHostException; -import java.util.Iterator; +import java.util.Collection; +import java.util.LinkedList; import javax.swing.AbstractAction; import javax.swing.Box; @@ -29,6 +27,7 @@ import javax.swing.Box; import javax.swing.ButtonGroup; import javax.swing.Icon; +import javax.swing.JCheckBox; import javax.swing.JColorChooser; import javax.swing.JFileChooser; import javax.swing.JLabel; @@ -35,19 +34,18 @@ import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JRadioButton; import javax.swing.JSeparator; -import javax.swing.JRadioButton; import javax.swing.JTextField; -import javax.swing.JCheckBox; import javax.swing.filechooser.FileFilter; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.RenameLayerAction; import org.openstreetmap.josm.actions.SaveAction; import org.openstreetmap.josm.actions.SaveAsAction; -import org.openstreetmap.josm.actions.RenameLayerAction; import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.data.gpx.GpxRoute; import org.openstreetmap.josm.data.gpx.GpxTrack; -import org.openstreetmap.josm.data.gpx.GpxRoute; import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; @@ -53,8 +51,6 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; -import org.openstreetmap.josm.io.MultiPartFormOutputStream; -import org.openstreetmap.josm.io.GpxWriter; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; import org.openstreetmap.josm.gui.dialogs.LayerListPopup; @@ -59,8 +55,9 @@ import org.openstreetmap.josm.gui.dialogs.LayerListDialog; import org.openstreetmap.josm.gui.dialogs.LayerListPopup; import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker; -import org.openstreetmap.josm.gui.layer.markerlayer.Marker; 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; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (working copy) @@ -1,28 +1,12 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others package org.openstreetmap.josm.gui.layer.markerlayer; -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.Graphics; -import java.awt.Point; -import java.awt.Rectangle; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.IOException; import java.net.URL; -import javax.swing.Icon; -import javax.swing.JOptionPane; -import javax.swing.Timer; - import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.tools.AudioPlayer; -import org.openstreetmap.josm.data.gpx.WayPoint; -import org.openstreetmap.josm.data.coor.EastNorth; -import org.openstreetmap.josm.gui.MapView; - -import org.openstreetmap.josm.tools.ImageProvider; /** * Marker class with audio playback capability. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (working copy) @@ -13,7 +13,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.gui.layer.Layer; /** * Marker class with button look-and-feel. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (working copy) @@ -21,7 +21,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.gui.layer.Layer; /** * Marker representing an image. Uses a special icon, and when clicked, Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (working copy) @@ -9,9 +9,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedList; -import java.util.Map; import javax.swing.Icon; @@ -21,7 +19,6 @@ import org.openstreetmap.josm.data.gpx.GpxLink; import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.tools.ImageProvider; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (working copy) @@ -8,7 +8,6 @@ import java.awt.Component; import java.awt.Graphics; import java.awt.Point; -import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -14,14 +13,12 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.File; +import java.net.URL; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; -import java.net.URL; import javax.swing.Icon; import javax.swing.JColorChooser; -import javax.swing.JFileChooser; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JSeparator; @@ -26,15 +23,11 @@ import javax.swing.JOptionPane; import javax.swing.JSeparator; import javax.swing.SwingUtilities; -import javax.swing.Timer; -import javax.swing.filechooser.FileFilter; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.RenameLayerAction; -import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.gpx.GpxData; -import org.openstreetmap.josm.data.gpx.GpxTrack; import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.gui.MapView; @@ -40,13 +33,11 @@ import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; import org.openstreetmap.josm.gui.dialogs.LayerListPopup; +import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.layer.GpxLayer; -import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker; -import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker; +import org.openstreetmap.josm.tools.AudioPlayer; import org.openstreetmap.josm.tools.ColorHelper; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.tools.AudioPlayer; /** * A layer holding markers. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (working copy) @@ -2,11 +2,8 @@ package org.openstreetmap.josm.gui.layer.markerlayer; import java.io.File; -import java.util.Map; -import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.WayPoint; -import org.openstreetmap.josm.gui.layer.Layer; /** * This interface has to be implemented by anyone who wants to create markers. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (working copy) @@ -2,9 +2,7 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.Cursor; import java.awt.Graphics; -import java.awt.Insets; import java.awt.Point; import java.awt.Rectangle; import java.awt.event.ActionEvent; @@ -10,21 +8,12 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionListener; -import java.io.IOException; -import java.net.URL; import java.util.Collection; import java.util.Iterator; -import javax.swing.BorderFactory; -import javax.swing.Icon; import javax.swing.JOptionPane; import javax.swing.Timer; -import javax.swing.border.BevelBorder; -import javax.swing.border.Border; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.mapmode.MapMode; @@ -29,15 +18,13 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.mapmode.MapMode; import org.openstreetmap.josm.actions.mapmode.PlayHeadDragMode; +import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.tools.AudioPlayer; import org.openstreetmap.josm.data.gpx.GpxTrack; import org.openstreetmap.josm.data.gpx.WayPoint; -import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.layer.GpxLayer; - -import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.AudioPlayer; /** * Singleton marker class to track position of audio. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (working copy) @@ -11,7 +11,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.tools.OpenBrowser; -import org.openstreetmap.josm.gui.layer.Layer; /** * Marker class with Web URL activation. Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (working copy) @@ -11,6 +11,7 @@ import java.awt.Point; import java.awt.event.ActionEvent; import java.io.File; +import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; @@ -16,7 +17,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Set; -import java.util.ArrayList; import javax.swing.AbstractAction; import javax.swing.Icon; @@ -33,11 +33,14 @@ import org.openstreetmap.josm.actions.SaveAsAction; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.data.gpx.GpxTrack; +import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.DataSource; -import org.openstreetmap.josm.data.osm.Relation; 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.Way; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.data.osm.visitor.MapPaintVisitor; @@ -44,9 +47,6 @@ import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor; import org.openstreetmap.josm.data.osm.visitor.Visitor; -import org.openstreetmap.josm.data.gpx.GpxData; -import org.openstreetmap.josm.data.gpx.GpxTrack; -import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.ConflictDialog; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MainApplet.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MainApplet.java (working copy) @@ -3,8 +3,8 @@ import static org.openstreetmap.josm.tools.I18n.tr; +import java.applet.AppletContext; import java.applet.AppletStub; -import java.applet.AppletContext; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MainMenu.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MainMenu.java (working copy) @@ -13,7 +13,6 @@ import javax.swing.KeyStroke; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.actions.AboutAction; import org.openstreetmap.josm.actions.AlignInCircleAction; import org.openstreetmap.josm.actions.AlignInLineAction; @@ -26,6 +25,7 @@ import org.openstreetmap.josm.actions.GpxExportAction; import org.openstreetmap.josm.actions.HelpAction; import org.openstreetmap.josm.actions.JoinNodeWayAction; +import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.actions.MergeNodesAction; import org.openstreetmap.josm.actions.NewAction; import org.openstreetmap.josm.actions.OpenAction; @@ -42,6 +42,7 @@ import org.openstreetmap.josm.actions.UnselectAllAction; import org.openstreetmap.josm.actions.UploadAction; import org.openstreetmap.josm.actions.audio.AudioBackAction; +import org.openstreetmap.josm.actions.audio.AudioFasterAction; import org.openstreetmap.josm.actions.audio.AudioFwdAction; import org.openstreetmap.josm.actions.audio.AudioNextAction; import org.openstreetmap.josm.actions.audio.AudioPlayPauseAction; @@ -46,7 +47,6 @@ import org.openstreetmap.josm.actions.audio.AudioNextAction; import org.openstreetmap.josm.actions.audio.AudioPlayPauseAction; import org.openstreetmap.josm.actions.audio.AudioPrevAction; -import org.openstreetmap.josm.actions.audio.AudioFasterAction; import org.openstreetmap.josm.actions.audio.AudioSlowerAction; import org.openstreetmap.josm.actions.search.SearchAction; import org.openstreetmap.josm.data.DataSetChecker; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapFrame.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapFrame.java (working copy) @@ -9,7 +9,6 @@ import javax.swing.Action; import javax.swing.BoxLayout; import javax.swing.ButtonGroup; -import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.JToolBar; @@ -14,18 +13,17 @@ import javax.swing.JToolBar; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.actions.MoveAction; import org.openstreetmap.josm.actions.mapmode.DeleteAction; import org.openstreetmap.josm.actions.mapmode.DrawAction; import org.openstreetmap.josm.actions.mapmode.MapMode; +import org.openstreetmap.josm.actions.mapmode.SelectAction; import org.openstreetmap.josm.actions.mapmode.ZoomAction; -import org.openstreetmap.josm.actions.mapmode.SelectAction; import org.openstreetmap.josm.gui.dialogs.CommandStackDialog; import org.openstreetmap.josm.gui.dialogs.ConflictDialog; -import org.openstreetmap.josm.gui.dialogs.RelationListDialog; import org.openstreetmap.josm.gui.dialogs.HistoryDialog; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; import org.openstreetmap.josm.gui.dialogs.PropertiesDialog; +import org.openstreetmap.josm.gui.dialogs.RelationListDialog; import org.openstreetmap.josm.gui.dialogs.SelectionListDialog; import org.openstreetmap.josm.gui.dialogs.ToggleDialog; import org.openstreetmap.josm.gui.dialogs.UserListDialog; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (working copy) @@ -1,8 +1,8 @@ package org.openstreetmap.josm.gui.mappaint; -import java.io.File; import java.awt.Color; import java.awt.Toolkit; +import java.io.File; import java.net.URL; import javax.swing.ImageIcon; @@ -8,7 +8,6 @@ import javax.swing.ImageIcon; import org.openstreetmap.josm.tools.ColorHelper; -import org.openstreetmap.josm.plugins.Plugin; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (working copy) @@ -2,7 +2,6 @@ import java.io.File; import java.io.FileReader; - import java.net.URL; import java.util.HashMap; import java.util.Iterator; @@ -9,10 +8,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.plugins.Plugin; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapStatus.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapStatus.java (working copy) @@ -13,14 +13,13 @@ import java.awt.Toolkit; import java.awt.event.AWTEventListener; import java.awt.event.InputEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; import java.lang.reflect.InvocationTargetException; import java.text.DecimalFormat; -import java.text.NumberFormat; import java.util.Collection; import java.util.ConcurrentModificationException; import java.util.Map.Entry; @@ -26,7 +25,6 @@ import java.util.Map.Entry; import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapView.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/MapView.java (working copy) @@ -9,8 +9,6 @@ import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.KeyEvent; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/NavigatableComponent.java (working copy) @@ -2,13 +2,13 @@ package org.openstreetmap.josm.gui; import java.awt.Point; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; import java.util.TreeMap; -import java.util.List; -import java.util.ArrayList; -import java.util.LinkedList; import javax.swing.JComponent; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (working copy) @@ -22,7 +22,6 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.Map.Entry; -import java.net.URL; import javax.swing.AbstractAction; import javax.swing.BorderFactory; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (working copy) @@ -23,7 +23,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSeparator; -import javax.swing.border.BevelBorder; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.tagging.TaggingPreset; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (working copy) @@ -9,9 +9,9 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.gpx.GpxData; 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: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/GpxReader.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/GpxReader.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/GpxReader.java (working copy) @@ -9,12 +9,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedList; -import java.util.ArrayList; +import java.util.Map; import java.util.Stack; -import java.util.Map; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; @@ -19,14 +18,12 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.data.gpx.GpxLink; +import org.openstreetmap.josm.data.gpx.GpxRoute; import org.openstreetmap.josm.data.gpx.GpxTrack; import org.openstreetmap.josm.data.gpx.WayPoint; -import org.openstreetmap.josm.data.gpx.GpxRoute; -import org.openstreetmap.josm.gui.layer.markerlayer.MarkerProducers; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/GpxWriter.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/GpxWriter.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/GpxWriter.java (working copy) @@ -1,8 +1,8 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others package org.openstreetmap.josm.io; +import java.io.OutputStream; import java.io.PrintWriter; -import java.io.OutputStream; import java.util.Collection; import java.util.Map; @@ -7,11 +7,10 @@ import java.util.Map; import org.openstreetmap.josm.data.Bounds; - import org.openstreetmap.josm.data.gpx.GpxData; -import org.openstreetmap.josm.data.gpx.GpxTrack; +import org.openstreetmap.josm.data.gpx.GpxLink; import org.openstreetmap.josm.data.gpx.GpxRoute; -import org.openstreetmap.josm.data.gpx.GpxLink; +import org.openstreetmap.josm.data.gpx.GpxTrack; import org.openstreetmap.josm.data.gpx.WayPoint; /** Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmReader.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmReader.java (working copy) @@ -6,11 +6,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; @@ -25,10 +23,10 @@ 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.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.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.visitor.AddVisitor; @@ -34,7 +32,6 @@ import org.openstreetmap.josm.data.osm.visitor.AddVisitor; import org.openstreetmap.josm.data.osm.visitor.Visitor; import org.openstreetmap.josm.gui.PleaseWaitDialog; -import org.openstreetmap.josm.tools.DateParser; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmServerReader.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmServerReader.java (working copy) @@ -5,9 +5,9 @@ import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; +import java.util.zip.GZIPInputStream; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; -import java.util.zip.GZIPInputStream; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.PleaseWaitDialog; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmServerWriter.java (working copy) @@ -10,9 +10,9 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.net.HttpURLConnection; +import java.net.SocketTimeoutException; import java.net.URL; import java.net.UnknownHostException; -import java.net.SocketTimeoutException; import java.util.Collection; import java.util.LinkedList; @@ -17,9 +17,9 @@ import java.util.LinkedList; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.osm.Relation; 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.Way; import org.openstreetmap.josm.data.osm.visitor.NameVisitor; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmWriter.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmWriter.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/io/OsmWriter.java (working copy) @@ -8,10 +8,10 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.DataSource; +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.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.visitor.Visitor; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/plugins/PluginInformation.java (working copy) @@ -7,8 +7,8 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URL; -import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; Index: /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/tools/AudioPlayer.java =================================================================== --- /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 576) +++ /home/bruce/Downloads/svn/JOSM/src/org/openstreetmap/josm/tools/AudioPlayer.java (working copy) @@ -3,7 +3,7 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.lang.Thread; +import java.io.IOException; import java.net.URL; import javax.sound.sampled.AudioFormat; @@ -11,11 +11,9 @@ import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.SourceDataLine; -import java.io.IOException; import javax.swing.JOptionPane; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.Preferences; /** * Creates and controls a separate audio player thread.