Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 582) @@ -9,8 +9,8 @@ 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; @@ -18,5 +18,4 @@ import java.util.TreeSet; import java.util.Map.Entry; -import java.util.HashSet; import javax.swing.Box; @@ -33,12 +32,12 @@ 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; /** @@ -112,9 +111,7 @@ tr("Combine ways with different memberships?"), JOptionPane.YES_NO_OPTION); - if (option == JOptionPane.YES_OPTION) { + if (option == JOptionPane.YES_OPTION) break; - } else { - return; - } + return; } } @@ -146,5 +143,5 @@ nodeList = (List) secondTry; } else { - JOptionPane.showMessageDialog(Main.parent, (String) secondTry); + JOptionPane.showMessageDialog(Main.parent, secondTry); return; } Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 582) @@ -28,11 +28,10 @@ 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; /** Index: trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 582) @@ -4,31 +4,23 @@ 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.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +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.Way; 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.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.OsmPrimitive; - -import javax.swing.AbstractAction; public class JoinNodeWayAction extends JosmAction { Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 582) @@ -7,10 +7,9 @@ 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; @@ -18,5 +17,4 @@ import java.util.TreeSet; import java.util.Map.Entry; -import java.util.HashSet; import javax.swing.Box; @@ -33,13 +31,13 @@ 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.Pair; import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor; import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Pair; @@ -149,9 +147,7 @@ tr("Merge nodes with different memberships?"), JOptionPane.YES_NO_OPTION); - if (option == JOptionPane.YES_OPTION) { + if (option == JOptionPane.YES_OPTION) break; - } else { - return null; - } + return null; } } Index: trunk/src/org/openstreetmap/josm/actions/MoveAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 582) @@ -25,5 +25,5 @@ public class MoveAction extends JosmAction { - public enum Direction { UP, LEFT, RIGHT, DOWN }; + public enum Direction { UP, LEFT, RIGHT, DOWN } private Direction myDirection; Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 582) @@ -8,9 +8,8 @@ import java.awt.event.KeyEvent; import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; import java.util.LinkedList; -import java.util.Iterator; -import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; import org.openstreetmap.josm.Main; @@ -19,9 +18,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 582) @@ -9,6 +9,4 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -28,7 +26,7 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 582) @@ -5,11 +5,8 @@ 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; import org.openstreetmap.josm.tools.AudioPlayer; Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 582) @@ -1,6 +1,4 @@ // 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; Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 582) @@ -5,11 +5,8 @@ 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; import org.openstreetmap.josm.tools.AudioPlayer; Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 582) @@ -5,11 +5,7 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 582) @@ -5,12 +5,10 @@ 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: trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 582) @@ -5,11 +5,7 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 582) @@ -23,5 +23,4 @@ private static class Task extends PleaseWaitRunnable { private BoundingBoxDownloader reader; - private DownloadAction action; private GpxData rawData; private final boolean newLayer; @@ -30,5 +29,4 @@ super(tr("Downloading GPS data")); this.reader = reader; - this.action = action; this.newLayer = newLayer; } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 582) @@ -143,9 +143,7 @@ osm.visit(v); v.data.addAll(selection); - if (v.data.isEmpty()) { + if (v.data.isEmpty()) return null; - } else { - return new DeleteCommand(v.data); - } + return new DeleteCommand(v.data); } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (revision 582) @@ -5,40 +5,11 @@ 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; /** Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 582) @@ -7,9 +7,8 @@ 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; @@ -17,5 +16,5 @@ 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; @@ -29,5 +28,4 @@ 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). @@ -79,6 +77,6 @@ putValue("help", "Action/Move/Move"); selectionManager = new SelectionManager(this, false, mapFrame.mapView); - try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","200")); } catch (NumberFormatException x) {}; - try { initialMoveThreshold = Integer.parseInt(Main.pref.get("edit.initial-move-threshold","5")); } catch (NumberFormatException x) {}; + try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","200")); } catch (NumberFormatException x) {} + try { initialMoveThreshold = Integer.parseInt(Main.pref.get("edit.initial-move-threshold","5")); } catch (NumberFormatException x) {} } @@ -91,8 +89,4 @@ return Cursor.getPredefinedCursor(def); } - - private static Cursor getCursor(String name, int def) { - return getCursor(name, null, def); - } private void setCursor(Cursor c) { @@ -215,5 +209,5 @@ return; boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + // boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; Index: trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 582) @@ -85,20 +85,16 @@ public boolean readIfEqual(String tok) { String nextTok = nextToken(); - if (nextTok == null ? tok == null : nextTok.equals(tok)) { + if (nextTok == null ? tok == null : nextTok.equals(tok)) return true; - } else { - pushBack(nextTok); - return false; - } + pushBack(nextTok); + return false; } public String readText() { String nextTok = nextToken(); - if (nextTok != null && nextTok.startsWith(" ")) { + if (nextTok != null && nextTok.startsWith(" ")) return nextTok.substring(1); - } else { - pushBack(nextTok); - return null; - } + pushBack(nextTok); + return null; } Index: trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 581) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 582) @@ -2,16 +2,13 @@ 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; /** Index: trunk/src/org/openstreetmap/josm/command/AddCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/AddCommand.java (revision 581) +++ trunk/src/org/openstreetmap/josm/command/AddCommand.java (revision 582) @@ -12,5 +12,4 @@ 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; Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 581) +++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 582) @@ -11,5 +11,4 @@ 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; Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 581) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 582) @@ -3,12 +3,10 @@ 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; /** Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 581) +++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 582) @@ -3,7 +3,5 @@ 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: trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 581) +++ trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 582) @@ -16,5 +16,5 @@ * Default constructor. Does nothing. */ - public RelationMember() { }; + public RelationMember() { } public RelationMember(String role, OsmPrimitive member) { Index: trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (revision 581) +++ trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (revision 582) @@ -12,4 +12,5 @@ */ public class TigerUtils { + public static boolean isTigerTag(String tag) { @@ -18,4 +19,5 @@ return true; } + public static boolean tagIsInt(String name) { if (name.equals("tiger:tlid")) @@ -23,4 +25,5 @@ return false; } + public static Object tagObj(String name) { if (tagIsInt(name)) @@ -28,6 +31,7 @@ return name; } + public static String combineTags(String name, Set values) { - TreeSet resultSet = new TreeSet(); + TreeSet resultSet = new TreeSet(); for (String value: values) { for (String part: value.split(":")) { @@ -43,4 +47,5 @@ return combined; } + public static String combineTags(String name, String t1, String t2) { Set set = new TreeSet(); Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (revision 581) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (revision 582) @@ -8,5 +8,4 @@ import java.text.NumberFormat; import java.util.HashSet; -import java.util.Set; import javax.swing.Icon; @@ -14,7 +13,7 @@ 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: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 582) @@ -4,5 +4,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.Dimension; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; @@ -13,5 +12,4 @@ import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JTextField; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 582) @@ -10,21 +10,19 @@ import javax.swing.BoxLayout; import javax.swing.ButtonGroup; -import javax.swing.JButton; import javax.swing.JPanel; 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; Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 582) @@ -14,12 +14,11 @@ 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; @@ -27,5 +26,4 @@ import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JLabel; import javax.swing.JPanel; Index: trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 582) @@ -10,6 +10,4 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 582) @@ -250,9 +250,7 @@ public Collection getNearestCollection(Point p) { OsmPrimitive osm = getNearest(p); - if (osm == null) { + if (osm == null) return Collections.emptySet(); - } else { - return Collections.singleton(osm); - } + return Collections.singleton(osm); } Index: trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 582) @@ -65,5 +65,5 @@ private Component renderer(Component def, OsmPrimitive value) { if (def != null && value != null && def instanceof JLabel) { - ((OsmPrimitive)value).visit(visitor); + (value).visit(visitor); ((JLabel)def).setText(visitor.name); ((JLabel)def).setIcon(visitor.icon); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 582) @@ -15,5 +15,4 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (revision 582) @@ -14,5 +14,4 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Collections; import java.util.Map.Entry; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 582) @@ -11,13 +11,9 @@ 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; import javax.swing.JList; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -26,8 +22,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 582) @@ -28,5 +28,4 @@ import org.openstreetmap.josm.gui.OsmPrimitivRenderer; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.actions.JosmAction; /** @@ -76,5 +75,5 @@ })); - buttonPanel.add(createButton("Search", "dialogs/search", "Search for objects.", (JosmAction) Main.main.menu.search)); + buttonPanel.add(createButton("Search", "dialogs/search", "Search for objects.", Main.main.menu.search)); add(buttonPanel, BorderLayout.SOUTH); Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 582) @@ -50,5 +50,5 @@ @Override public void mouseClicked(MouseEvent e) { if (e.getClickCount() == 2) { - int index = bookmarks.locationToIndex(e.getPoint()); + //int index = bookmarks.locationToIndex(e.getPoint()); gui.closeDownloadDialog(true); } Index: trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 582) @@ -21,5 +21,4 @@ import javax.swing.JTextField; import javax.swing.SwingUtilities; -import javax.swing.text.JTextComponent; import org.openstreetmap.josm.Main; Index: trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (revision 582) @@ -18,7 +18,7 @@ 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; @@ -36,4 +36,5 @@ import javax.swing.Icon; import javax.swing.ImageIcon; +import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JFileChooser; @@ -47,5 +48,4 @@ import javax.swing.JTextField; import javax.swing.JToggleButton; -import javax.swing.JButton; import javax.swing.JViewport; import javax.swing.border.BevelBorder; @@ -57,8 +57,7 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 582) @@ -11,20 +11,19 @@ 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; import java.net.UnknownHostException; -import java.util.Iterator; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.LinkedList; import javax.swing.AbstractAction; @@ -32,4 +31,5 @@ import javax.swing.ButtonGroup; import javax.swing.Icon; +import javax.swing.JCheckBox; import javax.swing.JColorChooser; import javax.swing.JFileChooser; @@ -38,18 +38,17 @@ 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.coor.EastNorth; 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; @@ -57,12 +56,11 @@ 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; 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; Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (revision 582) @@ -2,26 +2,10 @@ 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; /** Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 582) @@ -14,5 +14,4 @@ import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.gui.layer.Layer; /** Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 582) @@ -22,5 +22,4 @@ import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.gui.layer.Layer; /** Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 582) @@ -10,7 +10,5 @@ import java.net.URL; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedList; -import java.util.Map; import javax.swing.Icon; @@ -22,5 +20,4 @@ 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; @@ -80,8 +77,4 @@ static { Marker.markerProducers.add(new MarkerProducers() { - public Marker createMarker(WayPoint wpt, File relativePath) { - return createMarker(wpt, relativePath, null, 0.0, 0.0); - } - public Marker createMarker(WayPoint wpt, File relativePath, MarkerLayer parentLayer, double time, double offset) { String uri = null; @@ -93,5 +86,5 @@ break; } - } catch (Exception ex) {}; + } catch (Exception ex) {} // Try a relative file:// url, if the link is not in an URL-compatible form Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 582) @@ -9,5 +9,4 @@ import java.awt.Graphics; import java.awt.Point; -import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -15,25 +14,19 @@ 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; 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; @@ -41,11 +34,9 @@ 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; /** @@ -369,5 +360,4 @@ } Marker previousMarker = null; - Marker targetMarker = null; boolean nextTime = false; if (Main.map == null || Main.map.mapView == null) Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (revision 582) @@ -3,9 +3,6 @@ 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; /** Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 582) @@ -3,7 +3,5 @@ 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; @@ -11,32 +9,21 @@ 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; 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; /** @@ -144,25 +131,27 @@ * @param pixelTolerance : only accept the point if within this number of pixels of en * @return the nearest trackpoint or null if nothing nearby - */ + * + * XXX seems unused, F.R. 2008-03-15 private WayPoint getClosestTrackPoint(Point pNear, double pixelTolerance) { WayPoint cw = null; AudioMarker recentlyPlayedMarker = AudioMarker.recentlyPlayedMarker(); if (recentlyPlayedMarker != null) { - /* Find the track point closest to letting go of the play head */ + // Find the track point closest to letting go of the play head double minDistance = pixelTolerance; GpxLayer trackLayer = recentlyPlayedMarker.parentLayer.fromLayer; - if (trackLayer.data.tracks != null) { - for (GpxTrack track : trackLayer.data.tracks) { - if (track.trackSegs != null) { - for (Collection trackseg : track.trackSegs) { - for (Iterator it = trackseg.iterator(); it.hasNext();) { - WayPoint w = it.next(); - Point p = Main.map.mapView.getPoint(w.eastNorth); - double distance = p.distance(pNear); - if (distance <= minDistance) { - cw = w; - minDistance = distance; - } - } + if (trackLayer.data.tracks == null) + return null; + + for (GpxTrack track : trackLayer.data.tracks) { + if (track.trackSegs == null) + continue; + + for (Collection trackseg : track.trackSegs) { + for (WayPoint w : trackseg) { + Point p = Main.map.mapView.getPoint(w.eastNorth); + double distance = p.distance(pNear); + if (distance <= minDistance) { + cw = w; + minDistance = distance; } } @@ -172,4 +161,5 @@ return cw; } + */ /** Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (revision 582) @@ -12,5 +12,4 @@ import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.tools.OpenBrowser; -import org.openstreetmap.josm.gui.layer.Layer; /** Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (revision 582) @@ -1,7 +1,7 @@ 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; @@ -9,5 +9,4 @@ import org.openstreetmap.josm.tools.ColorHelper; -import org.openstreetmap.josm.plugins.Plugin; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 582) @@ -3,5 +3,4 @@ import java.io.File; import java.io.FileReader; - import java.net.URL; import java.util.HashMap; @@ -10,8 +9,4 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 582) @@ -23,5 +23,4 @@ import java.util.TreeMap; import java.util.Map.Entry; -import java.net.URL; import javax.swing.AbstractAction; Index: trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (revision 581) +++ trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (revision 582) @@ -24,5 +24,4 @@ import javax.swing.JScrollPane; import javax.swing.JSeparator; -import javax.swing.border.BevelBorder; import org.openstreetmap.josm.Main; Index: trunk/src/org/openstreetmap/josm/io/GpxReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 581) +++ trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 582) @@ -10,22 +10,19 @@ 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; -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; Index: trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (revision 581) +++ trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (revision 582) @@ -345,8 +345,6 @@ * Flushes the stream. Actually, this method does nothing, as the only * write methods are highly specialized and automatically flush. - * - * @throws java.io.IOException on input/output errors - */ - public void flush() throws java.io.IOException { + */ + public void flush() { // out.flush(); } Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 581) +++ trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 582) @@ -7,9 +7,7 @@ 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; @@ -26,8 +24,8 @@ 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; @@ -35,5 +33,4 @@ 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; Index: trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 581) +++ trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 582) @@ -4,5 +4,5 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.lang.Thread; +import java.io.IOException; import java.net.URL; @@ -12,9 +12,7 @@ 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; /** @@ -321,5 +319,5 @@ break; case PAUSE: - stateChange = state.PAUSED; + stateChange = State.PAUSED; break; }