Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 1169) @@ -182,5 +182,5 @@ /** - * Remove the specified layer from the map. If it is the last layer, + * Remove the specified layer from the map. If it is the last layer, * remove the map as well. */ @@ -219,5 +219,5 @@ /** - * Load all plugins specified in preferences. If the parameter is + * Load all plugins specified in preferences. If the parameter is * true, all early plugins are loaded (before constructor). */ @@ -281,8 +281,8 @@ Main.pref.put("pluginmanager.lastupdate",Long.toString(tim)); } else if (d > maxTime) { - JOptionPane.showMessageDialog(Main.parent, - "" + + JOptionPane.showMessageDialog(Main.parent, + "" + tr("Last plugin update more than {0} days ago.", d) + - "
" + + "
" + tr("(You can change the number of days after which this warning appears
by setting the config option 'pluginmanager.warntime'.)") + ""); @@ -512,6 +512,6 @@ } else if (os.toLowerCase().startsWith("windows")) { platform = new PlatformHookWindows(); - } else if (os.equals("Linux") || os.equals("Solaris") || - os.equals("SunOS") || os.equals("AIX") || + } else if (os.equals("Linux") || os.equals("Solaris") || + os.equals("SunOS") || os.equals("AIX") || os.equals("FreeBSD") || os.equals("NetBSD") || os.equals("OpenBSD")) { platform = new PlatformHookUnixoid(); Index: trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 1169) @@ -51,8 +51,8 @@ public class AboutAction extends JosmAction { - private static final String version; - - private final static JTextArea revision; - private static String time; + private static final String version; + + private final static JTextArea revision; + private static String time; static { @@ -60,5 +60,5 @@ if(u == null) { try { - u = new URL("jar:" + Main.class.getProtectionDomain().getCodeSource().getLocation().toString() + u = new URL("jar:" + Main.class.getProtectionDomain().getCodeSource().getLocation().toString() + "!/META-INF/MANIFEST.MF"); } catch (MalformedURLException e) { @@ -66,23 +66,23 @@ } } - revision = loadFile(u); - - Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); - Matcher match = versionPattern.matcher(revision.getText()); - version = match.matches() ? match.group(1) : tr("UNKNOWN"); - - Pattern timePattern = Pattern.compile(".*?(?:Last Changed Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); - match = timePattern.matcher(revision.getText()); - time = match.matches() ? match.group(1) : tr("UNKNOWN"); - } - - /** - * Return string describing version. - * Note that the strinc contains the version number plus an optional suffix of " SVN" to indicate an unofficial development build. - * @return version string - */ - static public String getVersionString() { - return version; - } + revision = loadFile(u); + + Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); + Matcher match = versionPattern.matcher(revision.getText()); + version = match.matches() ? match.group(1) : tr("UNKNOWN"); + + Pattern timePattern = Pattern.compile(".*?(?:Last Changed Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); + match = timePattern.matcher(revision.getText()); + time = match.matches() ? match.group(1) : tr("UNKNOWN"); + } + + /** + * Return string describing version. + * Note that the strinc contains the version number plus an optional suffix of " SVN" to indicate an unofficial development build. + * @return version string + */ + static public String getVersionString() { + return version; + } /** @@ -99,5 +99,5 @@ return myVersion; } - + /** * check whether the version is a development build out of SVN. @@ -107,119 +107,119 @@ return version.endsWith(" SVN"); } - - public AboutAction() { - super(tr("About"), "about", tr("Display the about screen."), Shortcut.registerShortcut("system:about", tr("About"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT), true); - } - - public void actionPerformed(ActionEvent e) { - JTabbedPane about = new JTabbedPane(); - - JTextArea readme = loadFile(Main.class.getResource("/README")); - JTextArea contribution = loadFile(Main.class.getResource("/CONTRIBUTION")); - - JPanel info = new JPanel(new GridBagLayout()); - info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eol().fill(GBC.HORIZONTAL)); - info.add(new JLabel(tr("last change at {0}",time)), GBC.eol().fill(GBC.HORIZONTAL)); - info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL)); - info.add(GBC.glue(0,10), GBC.eol()); - info.add(new JLabel(tr("Homepage")), GBC.std().insets(0,0,10,0)); - info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol().fill(GBC.HORIZONTAL)); - info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(0,0,10,0)); - info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol().fill(GBC.HORIZONTAL)); - info.add(new JLabel(tr("News about JOSM")), GBC.std().insets(0,0,10,0)); - info.add(new UrlLabel("http://www.opengeodata.org/?cat=17"), GBC.eol().fill(GBC.HORIZONTAL)); - - about.addTab(tr("Info"), info); - about.addTab(tr("Readme"), createScrollPane(readme)); - about.addTab(tr("Revision"), createScrollPane(revision)); - about.addTab(tr("Contribution"), createScrollPane(contribution)); - - JPanel pluginTab = new JPanel(new GridBagLayout()); - for (final PluginProxy p : Main.plugins) { - String name = p.info.name + (p.info.version != null && !p.info.version.equals("") ? " Version: "+p.info.version : ""); - pluginTab.add(new JLabel(name), GBC.std()); - pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL)); - pluginTab.add(new JButton(new AbstractAction(tr("Information")){ - public void actionPerformed(ActionEvent event) { - StringBuilder b = new StringBuilder(); - for (Entry e : p.info.attr.entrySet()) { - b.append(e.getKey()); - b.append(": "); - b.append(e.getValue()); - b.append("\n"); - } - JTextArea a = new JTextArea(10,40); - a.setEditable(false); - a.setText(b.toString()); - JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a)); - } - }), GBC.eol()); - JLabel label = new JLabel(""+(p.info.description==null?tr("no description available"):p.info.description)+""); - label.setBorder(BorderFactory.createEmptyBorder(0,20,0,0)); - label.setMaximumSize(new Dimension(450,1000)); - pluginTab.add(label, GBC.eop().fill(GBC.HORIZONTAL)); - } - about.addTab(tr("Plugins"), new JScrollPane(pluginTab)); - - about.setPreferredSize(new Dimension(500,300)); - - JOptionPane.showMessageDialog(Main.parent, about, tr("About JOSM..."), - JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo")); - } - - private JScrollPane createScrollPane(JTextArea area) { - area.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); - area.setOpaque(false); - JScrollPane sp = new JScrollPane(area); - sp.setBorder(null); - sp.setOpaque(false); - return sp; - } - - /** - * Retrieve the latest JOSM version from the JOSM homepage. - * @return An string with the latest version or "UNKNOWN" in case - * of problems (e.g. no internet connection). - */ - public static String checkLatestVersion() { - String latest; - try { - InputStream s = new URL("http://josm.openstreetmap.de/current").openStream(); - latest = new BufferedReader(new InputStreamReader(s)).readLine(); - s.close(); - } catch (IOException x) { - x.printStackTrace(); - return tr("UNKNOWN"); - } - return latest; - } - - /** - * Load the specified resource into an TextArea and return it. - * @param resource The resource url to load - * @return An read-only text area with the content of "resource" - */ - private static JTextArea loadFile(URL resource) { - JTextArea area = new JTextArea(tr("File could not be found.")); - area.setEditable(false); - Font font = Font.getFont("monospaced"); - if (font != null) - area.setFont(font); - if (resource == null) - return area; - BufferedReader in; - try { - in = new BufferedReader(new InputStreamReader(resource.openStream())); - StringBuilder sb = new StringBuilder(); - for (String line = in.readLine(); line != null; line = in.readLine()) { - sb.append(line); - sb.append('\n'); - } - area.setText(sb.toString()); - area.setCaretPosition(0); - } catch (IOException e) { - e.printStackTrace(); - } - return area; - } + + public AboutAction() { + super(tr("About"), "about", tr("Display the about screen."), Shortcut.registerShortcut("system:about", tr("About"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT), true); + } + + public void actionPerformed(ActionEvent e) { + JTabbedPane about = new JTabbedPane(); + + JTextArea readme = loadFile(Main.class.getResource("/README")); + JTextArea contribution = loadFile(Main.class.getResource("/CONTRIBUTION")); + + JPanel info = new JPanel(new GridBagLayout()); + info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("last change at {0}",time)), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(GBC.glue(0,10), GBC.eol()); + info.add(new JLabel(tr("Homepage")), GBC.std().insets(0,0,10,0)); + info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(0,0,10,0)); + info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("News about JOSM")), GBC.std().insets(0,0,10,0)); + info.add(new UrlLabel("http://www.opengeodata.org/?cat=17"), GBC.eol().fill(GBC.HORIZONTAL)); + + about.addTab(tr("Info"), info); + about.addTab(tr("Readme"), createScrollPane(readme)); + about.addTab(tr("Revision"), createScrollPane(revision)); + about.addTab(tr("Contribution"), createScrollPane(contribution)); + + JPanel pluginTab = new JPanel(new GridBagLayout()); + for (final PluginProxy p : Main.plugins) { + String name = p.info.name + (p.info.version != null && !p.info.version.equals("") ? " Version: "+p.info.version : ""); + pluginTab.add(new JLabel(name), GBC.std()); + pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL)); + pluginTab.add(new JButton(new AbstractAction(tr("Information")){ + public void actionPerformed(ActionEvent event) { + StringBuilder b = new StringBuilder(); + for (Entry e : p.info.attr.entrySet()) { + b.append(e.getKey()); + b.append(": "); + b.append(e.getValue()); + b.append("\n"); + } + JTextArea a = new JTextArea(10,40); + a.setEditable(false); + a.setText(b.toString()); + JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a)); + } + }), GBC.eol()); + JLabel label = new JLabel(""+(p.info.description==null?tr("no description available"):p.info.description)+""); + label.setBorder(BorderFactory.createEmptyBorder(0,20,0,0)); + label.setMaximumSize(new Dimension(450,1000)); + pluginTab.add(label, GBC.eop().fill(GBC.HORIZONTAL)); + } + about.addTab(tr("Plugins"), new JScrollPane(pluginTab)); + + about.setPreferredSize(new Dimension(500,300)); + + JOptionPane.showMessageDialog(Main.parent, about, tr("About JOSM..."), + JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo")); + } + + private JScrollPane createScrollPane(JTextArea area) { + area.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + area.setOpaque(false); + JScrollPane sp = new JScrollPane(area); + sp.setBorder(null); + sp.setOpaque(false); + return sp; + } + + /** + * Retrieve the latest JOSM version from the JOSM homepage. + * @return An string with the latest version or "UNKNOWN" in case + * of problems (e.g. no internet connection). + */ + public static String checkLatestVersion() { + String latest; + try { + InputStream s = new URL("http://josm.openstreetmap.de/current").openStream(); + latest = new BufferedReader(new InputStreamReader(s)).readLine(); + s.close(); + } catch (IOException x) { + x.printStackTrace(); + return tr("UNKNOWN"); + } + return latest; + } + + /** + * Load the specified resource into an TextArea and return it. + * @param resource The resource url to load + * @return An read-only text area with the content of "resource" + */ + private static JTextArea loadFile(URL resource) { + JTextArea area = new JTextArea(tr("File could not be found.")); + area.setEditable(false); + Font font = Font.getFont("monospaced"); + if (font != null) + area.setFont(font); + if (resource == null) + return area; + BufferedReader in; + try { + in = new BufferedReader(new InputStreamReader(resource.openStream())); + StringBuilder sb = new StringBuilder(); + for (String line = in.readLine(); line != null; line = in.readLine()) { + sb.append(line); + sb.append('\n'); + } + area.setText(sb.toString()); + area.setCaretPosition(0); + } catch (IOException e) { + e.printStackTrace(); + } + return area; + } } Index: trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 1169) @@ -41,5 +41,5 @@ /** - * This action displays a dialog where the user can enter a latitude and longitude, + * This action displays a dialog where the user can enter a latitude and longitude, * and when ok is pressed, a new node is created at the specified position. */ @@ -47,17 +47,17 @@ public AddNodeAction() { - super(tr("Add Node"), "addnode", tr("Add a node by entering latitude and longitude."), - Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node")), KeyEvent.VK_D, Shortcut.GROUP_EDIT, - Shortcut.SHIFT_DEFAULT), true); + super(tr("Add Node"), "addnode", tr("Add a node by entering latitude and longitude."), + Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node")), KeyEvent.VK_D, Shortcut.GROUP_EDIT, + Shortcut.SHIFT_DEFAULT), true); } - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { JPanel p = new JPanel(new GridBagLayout()); p.add(new JLabel(""+ - tr("Enter the coordinates for the new node.") + - "
" + tr("Use decimal degrees.") + - "
" + tr("Negative values denote Western/Southern hemisphere.")), + tr("Enter the coordinates for the new node.") + + "
" + tr("Use decimal degrees.") + + "
" + tr("Negative values denote Western/Southern hemisphere.")), GBC.eol()); - + p.add(new JLabel(tr("Latitude")), GBC.std().insets(0,10,5,0)); final JTextField lat = new JTextField(12); @@ -65,6 +65,6 @@ p.add(new JLabel(tr("Longitude")), GBC.std().insets(0,0,5,10)); final JTextField lon = new JTextField(12); - p.add(lon, GBC.eol().insets(0,0,0,10)); - + p.add(lon, GBC.eol().insets(0,0,0,10)); + Node nnew = null; @@ -79,10 +79,10 @@ } catch (Exception ex) { } } - - /* Now execute the commands to add the dupicated contents of the paste buffer to the map */ - - Main.main.undoRedo.add(new AddCommand(nnew)); - Main.ds.setSelected(nnew); - Main.map.mapView.repaint(); + + /* Now execute the commands to add the dupicated contents of the paste buffer to the map */ + + Main.main.undoRedo.add(new AddCommand(nnew)); + Main.ds.setSelected(nnew); + Main.map.mapView.repaint(); } } Index: trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 1169) @@ -24,5 +24,5 @@ /** * Aligns all selected nodes within a circle. (Useful for roundabouts) - * + * * @author Matthew Newton * @author Petr Dlouhý @@ -31,6 +31,6 @@ public AlignInCircleAction() { - super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."), - Shortcut.registerShortcut("tools:aligncircle", tr("Tool: {0}", tr("Align Nodes in Circle")), + super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."), + Shortcut.registerShortcut("tools:aligncircle", tr("Tool: {0}", tr("Align Nodes in Circle")), KeyEvent.VK_O, Shortcut.GROUP_EDIT), true); } Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 1169) @@ -29,98 +29,98 @@ public final class AlignInLineAction extends JosmAction { - public AlignInLineAction() { - super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes onto a line."), - Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.GROUP_EDIT), true); - } + public AlignInLineAction() { + super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes onto a line."), + Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.GROUP_EDIT), true); + } - /** - * The general algorithm here is to find the two selected nodes - * that are furthest apart, and then to align all other selected - * nodes onto the straight line between these nodes. - */ - public void actionPerformed(ActionEvent e) { - Collection sel = Main.ds.getSelected(); - Collection nodes = new LinkedList(); - Collection itnodes = new LinkedList(); - for (OsmPrimitive osm : sel) - if (osm instanceof Node) { - nodes.add((Node)osm); - itnodes.add((Node)osm); - } - // special case if no single nodes are selected and exactly one way is: - // then use the way's nodes - if ((nodes.size() == 0) && (sel.size() == 1)) - for (OsmPrimitive osm : sel) - if (osm instanceof Way) { - nodes.addAll(((Way)osm).nodes); - itnodes.addAll(((Way)osm).nodes); - } - if (nodes.size() < 3) { - JOptionPane.showMessageDialog(Main.parent, tr("Please select at least three nodes.")); - return; - } + /** + * The general algorithm here is to find the two selected nodes + * that are furthest apart, and then to align all other selected + * nodes onto the straight line between these nodes. + */ + public void actionPerformed(ActionEvent e) { + Collection sel = Main.ds.getSelected(); + Collection nodes = new LinkedList(); + Collection itnodes = new LinkedList(); + for (OsmPrimitive osm : sel) + if (osm instanceof Node) { + nodes.add((Node)osm); + itnodes.add((Node)osm); + } + // special case if no single nodes are selected and exactly one way is: + // then use the way's nodes + if ((nodes.size() == 0) && (sel.size() == 1)) + for (OsmPrimitive osm : sel) + if (osm instanceof Way) { + nodes.addAll(((Way)osm).nodes); + itnodes.addAll(((Way)osm).nodes); + } + if (nodes.size() < 3) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least three nodes.")); + return; + } - // Find from the selected nodes two that are the furthest apart. - // Let's call them A and B. - double distance = 0; + // Find from the selected nodes two that are the furthest apart. + // Let's call them A and B. + double distance = 0; - Node nodea = null; - Node nodeb = null; + Node nodea = null; + Node nodeb = null; - for (Node n : nodes) { - itnodes.remove(n); - for (Node m : itnodes) { - double dist = Math.sqrt(n.eastNorth.distance(m.eastNorth)); - if (dist > distance) { - nodea = n; - nodeb = m; - distance = dist; - } - } - } + for (Node n : nodes) { + itnodes.remove(n); + for (Node m : itnodes) { + double dist = Math.sqrt(n.eastNorth.distance(m.eastNorth)); + if (dist > distance) { + nodea = n; + nodeb = m; + distance = dist; + } + } + } - // Remove the nodes A and B from the list of nodes to move - nodes.remove(nodea); - nodes.remove(nodeb); + // Remove the nodes A and B from the list of nodes to move + nodes.remove(nodea); + nodes.remove(nodeb); - // Find out co-ords of A and B - double ax = nodea.eastNorth.east(); - double ay = nodea.eastNorth.north(); - double bx = nodeb.eastNorth.east(); - double by = nodeb.eastNorth.north(); + // Find out co-ords of A and B + double ax = nodea.eastNorth.east(); + double ay = nodea.eastNorth.north(); + double bx = nodeb.eastNorth.east(); + double by = nodeb.eastNorth.north(); - // A list of commands to do - Collection cmds = new LinkedList(); + // A list of commands to do + Collection cmds = new LinkedList(); - // OK, for each node to move, work out where to move it! - for (Node n : nodes) { - // Get existing co-ords of node to move - double nx = n.eastNorth.east(); - double ny = n.eastNorth.north(); + // OK, for each node to move, work out where to move it! + for (Node n : nodes) { + // Get existing co-ords of node to move + double nx = n.eastNorth.east(); + double ny = n.eastNorth.north(); - if (ax == bx) { - // Special case if AB is vertical... - nx = ax; - } else if (ay == by) { - // ...or horizontal - ny = ay; - } else { - // Otherwise calculate position by solving y=mx+c - double m1 = (by - ay) / (bx - ax); - double c1 = ay - (ax * m1); - double m2 = (-1) / m1; - double c2 = n.eastNorth.north() - (n.eastNorth.east() * m2); + if (ax == bx) { + // Special case if AB is vertical... + nx = ax; + } else if (ay == by) { + // ...or horizontal + ny = ay; + } else { + // Otherwise calculate position by solving y=mx+c + double m1 = (by - ay) / (bx - ax); + double c1 = ay - (ax * m1); + double m2 = (-1) / m1; + double c2 = n.eastNorth.north() - (n.eastNorth.east() * m2); - nx = (c2 - c1) / (m1 - m2); - ny = (m1 * nx) + c1; - } + nx = (c2 - c1) / (m1 - m2); + ny = (m1 * nx) + c1; + } - // Add the command to move the node to its new position. - cmds.add(new MoveCommand(n, nx - n.eastNorth.east(), ny - n.eastNorth.north() )); - } + // Add the command to move the node to its new position. + cmds.add(new MoveCommand(n, nx - n.eastNorth.east(), ny - n.eastNorth.north() )); + } - // Do it! - Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Line"), cmds)); - Main.map.repaint(); - } + // Do it! + Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Line"), cmds)); + Main.map.repaint(); + } } Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 1169) @@ -47,5 +47,5 @@ public AutoScaleAction(String mode) { super(tr("Zoom to {0}", tr(mode)), "dialogs/autoscale/" + mode, tr("Zoom the view to {0}.", tr(mode)), - Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.GROUP_EDIT), true); + Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.GROUP_EDIT), true); String modeHelp = Character.toUpperCase(mode.charAt(0)) + mode.substring(1); putValue("help", "Action/AutoScale/" + modeHelp); Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 1169) @@ -49,254 +49,254 @@ public class CombineWayAction extends JosmAction implements SelectionChangedListener { - public CombineWayAction() { - super(tr("Combine Way"), "combineway", tr("Combine several ways into one."), - Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.GROUP_EDIT), true); - DataSet.selListeners.add(this); - } - - public void actionPerformed(ActionEvent event) { - Collection selection = Main.ds.getSelected(); - LinkedList selectedWays = new LinkedList(); - - for (OsmPrimitive osm : selection) - if (osm instanceof Way) - selectedWays.add((Way)osm); - - if (selectedWays.size() < 2) { - JOptionPane.showMessageDialog(Main.parent, tr("Please select at least two ways to combine.")); - return; - } - - // Check whether all ways have identical relationship membership. More - // specifically: If one of the selected ways is a member of relation X - // in role Y, then all selected ways must be members of X in role Y. - - // FIXME: In a later revision, we should display some sort of conflict - // dialog like we do for tags, to let the user choose which relations - // should be kept. - - // Step 1, iterate over all relations and figure out which of our - // selected ways are members of a relation. - HashMap, HashSet> backlinks = - new HashMap, HashSet>(); - HashSet relationsUsingWays = new HashSet(); - for (Relation r : Main.ds.relations) { - if (r.deleted || r.incomplete) continue; - for (RelationMember rm : r.members) { - if (rm.member instanceof Way) { - for(Way w : selectedWays) { - if (rm.member == w) { - Pair pair = new Pair(r, rm.role); - HashSet waylinks = new HashSet(); - if (backlinks.containsKey(pair)) { - waylinks = backlinks.get(pair); - } else { - waylinks = new HashSet(); - backlinks.put(pair, waylinks); - } - waylinks.add(w); - - // this is just a cache for later use - relationsUsingWays.add(r); - } - } - } - } - } - - // Complain to the user if the ways don't have equal memberships. - for (HashSet waylinks : backlinks.values()) { - if (!waylinks.containsAll(selectedWays)) { - int option = JOptionPane.showConfirmDialog(Main.parent, - tr("The selected ways have differing relation memberships. " - + "Do you still want to combine them?"), - tr("Combine ways with different memberships?"), - JOptionPane.YES_NO_OPTION); - if (option == JOptionPane.YES_OPTION) - break; - return; - } - } - - // collect properties for later conflict resolving - Map> props = new TreeMap>(); - for (Way w : selectedWays) { - for (Entry e : w.entrySet()) { - if (!props.containsKey(e.getKey())) - props.put(e.getKey(), new TreeSet()); - props.get(e.getKey()).add(e.getValue()); - } - } - - List nodeList = null; - Object firstTry = actuallyCombineWays(selectedWays, false); - if (firstTry instanceof List) { - nodeList = (List) firstTry; - } else { - Object secondTry = actuallyCombineWays(selectedWays, true); - if (secondTry instanceof List) { - int option = JOptionPane.showConfirmDialog(Main.parent, - tr("The ways can not be combined in their current directions. " - + "Do you want to reverse some of them?"), tr("Change directions?"), - JOptionPane.YES_NO_OPTION); - if (option != JOptionPane.YES_OPTION) { - return; - } - nodeList = (List) secondTry; - } else { - JOptionPane.showMessageDialog(Main.parent, secondTry); - return; - } - } - - // Find the most appropriate way to modify. - - // Eventually this might want to be the way with the longest - // history or the longest selected way but for now just attempt - // to reuse an existing id. - Way modifyWay = selectedWays.peek(); - for (Way w : selectedWays) { - modifyWay = w; - if (w.id != 0) break; - } - Way newWay = new Way(modifyWay); - - newWay.nodes.clear(); - newWay.nodes.addAll(nodeList); - - // display conflict dialog - Map components = new HashMap(); - JPanel p = new JPanel(new GridBagLayout()); - for (Entry> e : props.entrySet()) { - if (TigerUtils.isTigerTag(e.getKey())) { - String combined = TigerUtils.combineTags(e.getKey(), e.getValue()); - newWay.put(e.getKey(), combined); - } else if (e.getValue().size() > 1) { - if("created_by".equals(e.getKey())) - { - newWay.put("created_by", "JOSM"); - } - else - { - JComboBox c = new JComboBox(e.getValue().toArray()); - c.setEditable(true); - p.add(new JLabel(e.getKey()), GBC.std()); - p.add(Box.createHorizontalStrut(10), GBC.std()); - p.add(c, GBC.eol()); - components.put(e.getKey(), c); - } - } else - newWay.put(e.getKey(), e.getValue().iterator().next()); - } - - if (!components.isEmpty()) { - int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter values for all conflicts."), JOptionPane.OK_CANCEL_OPTION); - if (answer != JOptionPane.OK_OPTION) - return; - for (Entry e : components.entrySet()) - newWay.put(e.getKey(), e.getValue().getEditor().getItem().toString()); - } - - LinkedList cmds = new LinkedList(); - LinkedList deletedWays = new LinkedList(selectedWays); - deletedWays.remove(modifyWay); - cmds.add(new DeleteCommand(deletedWays)); - cmds.add(new ChangeCommand(modifyWay, newWay)); - - // modify all relations containing the now-deleted ways - for (Relation r : relationsUsingWays) { - Relation newRel = new Relation(r); - newRel.members.clear(); - HashSet rolesToReAdd = new HashSet(); - for (RelationMember rm : r.members) { - // Don't copy the member if it to one of our ways, just keep a - // note to re-add it later on. - if (selectedWays.contains(rm.member)) { - rolesToReAdd.add(rm.role); - } else { - newRel.members.add(rm); - } - } - for (String role : rolesToReAdd) { - newRel.members.add(new RelationMember(role, modifyWay)); - } - cmds.add(new ChangeCommand(r, newRel)); - } - Main.main.undoRedo.add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds)); - Main.ds.setSelected(modifyWay); - } - - /** - * @return a message if combining failed, else a list of nodes. - */ - private Object actuallyCombineWays(List ways, boolean ignoreDirection) { - // Battle plan: - // 1. Split the ways into small chunks of 2 nodes and weed out - // duplicates. - // 2. Take a chunk and see if others could be appended or prepended, - // if so, do it and remove it from the list of remaining chunks. - // Rather, rinse, repeat. - // 3. If this algorithm does not produce a single way, - // complain to the user. - // 4. Profit! - - HashSet> chunkSet = new HashSet>(); - for (Way w : ways) - chunkSet.addAll(w.getNodePairs(ignoreDirection)); - - LinkedList> chunks = new LinkedList>(chunkSet); - - if (chunks.isEmpty()) { - return tr("All the ways were empty"); - } - - List nodeList = Pair.toArrayList(chunks.poll()); - while (!chunks.isEmpty()) { - ListIterator> it = chunks.listIterator(); - boolean foundChunk = false; - while (it.hasNext()) { - Pair curChunk = it.next(); - if (curChunk.a == nodeList.get(nodeList.size() - 1)) { // append - nodeList.add(curChunk.b); - } else if (curChunk.b == nodeList.get(0)) { // prepend - nodeList.add(0, curChunk.a); - } else if (ignoreDirection && curChunk.b == nodeList.get(nodeList.size() - 1)) { // append - nodeList.add(curChunk.a); - } else if (ignoreDirection && curChunk.a == nodeList.get(0)) { // prepend - nodeList.add(0, curChunk.b); - } else { - continue; - } - - foundChunk = true; - it.remove(); - break; - } - if (!foundChunk) break; - } - - if (!chunks.isEmpty()) { - return tr("Could not combine ways " - + "(They could not be merged into a single string of nodes)"); - } - - return nodeList; - } - - /** - * Enable the "Combine way" menu option if more then one way is selected - */ - public void selectionChanged(Collection newSelection) { - boolean first = false; - for (OsmPrimitive osm : newSelection) { - if (osm instanceof Way) { - if (first) { - setEnabled(true); - return; - } - first = true; - } - } - setEnabled(false); - } + public CombineWayAction() { + super(tr("Combine Way"), "combineway", tr("Combine several ways into one."), + Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.GROUP_EDIT), true); + DataSet.selListeners.add(this); + } + + public void actionPerformed(ActionEvent event) { + Collection selection = Main.ds.getSelected(); + LinkedList selectedWays = new LinkedList(); + + for (OsmPrimitive osm : selection) + if (osm instanceof Way) + selectedWays.add((Way)osm); + + if (selectedWays.size() < 2) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least two ways to combine.")); + return; + } + + // Check whether all ways have identical relationship membership. More + // specifically: If one of the selected ways is a member of relation X + // in role Y, then all selected ways must be members of X in role Y. + + // FIXME: In a later revision, we should display some sort of conflict + // dialog like we do for tags, to let the user choose which relations + // should be kept. + + // Step 1, iterate over all relations and figure out which of our + // selected ways are members of a relation. + HashMap, HashSet> backlinks = + new HashMap, HashSet>(); + HashSet relationsUsingWays = new HashSet(); + for (Relation r : Main.ds.relations) { + if (r.deleted || r.incomplete) continue; + for (RelationMember rm : r.members) { + if (rm.member instanceof Way) { + for(Way w : selectedWays) { + if (rm.member == w) { + Pair pair = new Pair(r, rm.role); + HashSet waylinks = new HashSet(); + if (backlinks.containsKey(pair)) { + waylinks = backlinks.get(pair); + } else { + waylinks = new HashSet(); + backlinks.put(pair, waylinks); + } + waylinks.add(w); + + // this is just a cache for later use + relationsUsingWays.add(r); + } + } + } + } + } + + // Complain to the user if the ways don't have equal memberships. + for (HashSet waylinks : backlinks.values()) { + if (!waylinks.containsAll(selectedWays)) { + int option = JOptionPane.showConfirmDialog(Main.parent, + tr("The selected ways have differing relation memberships. " + + "Do you still want to combine them?"), + tr("Combine ways with different memberships?"), + JOptionPane.YES_NO_OPTION); + if (option == JOptionPane.YES_OPTION) + break; + return; + } + } + + // collect properties for later conflict resolving + Map> props = new TreeMap>(); + for (Way w : selectedWays) { + for (Entry e : w.entrySet()) { + if (!props.containsKey(e.getKey())) + props.put(e.getKey(), new TreeSet()); + props.get(e.getKey()).add(e.getValue()); + } + } + + List nodeList = null; + Object firstTry = actuallyCombineWays(selectedWays, false); + if (firstTry instanceof List) { + nodeList = (List) firstTry; + } else { + Object secondTry = actuallyCombineWays(selectedWays, true); + if (secondTry instanceof List) { + int option = JOptionPane.showConfirmDialog(Main.parent, + tr("The ways can not be combined in their current directions. " + + "Do you want to reverse some of them?"), tr("Change directions?"), + JOptionPane.YES_NO_OPTION); + if (option != JOptionPane.YES_OPTION) { + return; + } + nodeList = (List) secondTry; + } else { + JOptionPane.showMessageDialog(Main.parent, secondTry); + return; + } + } + + // Find the most appropriate way to modify. + + // Eventually this might want to be the way with the longest + // history or the longest selected way but for now just attempt + // to reuse an existing id. + Way modifyWay = selectedWays.peek(); + for (Way w : selectedWays) { + modifyWay = w; + if (w.id != 0) break; + } + Way newWay = new Way(modifyWay); + + newWay.nodes.clear(); + newWay.nodes.addAll(nodeList); + + // display conflict dialog + Map components = new HashMap(); + JPanel p = new JPanel(new GridBagLayout()); + for (Entry> e : props.entrySet()) { + if (TigerUtils.isTigerTag(e.getKey())) { + String combined = TigerUtils.combineTags(e.getKey(), e.getValue()); + newWay.put(e.getKey(), combined); + } else if (e.getValue().size() > 1) { + if("created_by".equals(e.getKey())) + { + newWay.put("created_by", "JOSM"); + } + else + { + JComboBox c = new JComboBox(e.getValue().toArray()); + c.setEditable(true); + p.add(new JLabel(e.getKey()), GBC.std()); + p.add(Box.createHorizontalStrut(10), GBC.std()); + p.add(c, GBC.eol()); + components.put(e.getKey(), c); + } + } else + newWay.put(e.getKey(), e.getValue().iterator().next()); + } + + if (!components.isEmpty()) { + int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter values for all conflicts."), JOptionPane.OK_CANCEL_OPTION); + if (answer != JOptionPane.OK_OPTION) + return; + for (Entry e : components.entrySet()) + newWay.put(e.getKey(), e.getValue().getEditor().getItem().toString()); + } + + LinkedList cmds = new LinkedList(); + LinkedList deletedWays = new LinkedList(selectedWays); + deletedWays.remove(modifyWay); + cmds.add(new DeleteCommand(deletedWays)); + cmds.add(new ChangeCommand(modifyWay, newWay)); + + // modify all relations containing the now-deleted ways + for (Relation r : relationsUsingWays) { + Relation newRel = new Relation(r); + newRel.members.clear(); + HashSet rolesToReAdd = new HashSet(); + for (RelationMember rm : r.members) { + // Don't copy the member if it to one of our ways, just keep a + // note to re-add it later on. + if (selectedWays.contains(rm.member)) { + rolesToReAdd.add(rm.role); + } else { + newRel.members.add(rm); + } + } + for (String role : rolesToReAdd) { + newRel.members.add(new RelationMember(role, modifyWay)); + } + cmds.add(new ChangeCommand(r, newRel)); + } + Main.main.undoRedo.add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds)); + Main.ds.setSelected(modifyWay); + } + + /** + * @return a message if combining failed, else a list of nodes. + */ + private Object actuallyCombineWays(List ways, boolean ignoreDirection) { + // Battle plan: + // 1. Split the ways into small chunks of 2 nodes and weed out + // duplicates. + // 2. Take a chunk and see if others could be appended or prepended, + // if so, do it and remove it from the list of remaining chunks. + // Rather, rinse, repeat. + // 3. If this algorithm does not produce a single way, + // complain to the user. + // 4. Profit! + + HashSet> chunkSet = new HashSet>(); + for (Way w : ways) + chunkSet.addAll(w.getNodePairs(ignoreDirection)); + + LinkedList> chunks = new LinkedList>(chunkSet); + + if (chunks.isEmpty()) { + return tr("All the ways were empty"); + } + + List nodeList = Pair.toArrayList(chunks.poll()); + while (!chunks.isEmpty()) { + ListIterator> it = chunks.listIterator(); + boolean foundChunk = false; + while (it.hasNext()) { + Pair curChunk = it.next(); + if (curChunk.a == nodeList.get(nodeList.size() - 1)) { // append + nodeList.add(curChunk.b); + } else if (curChunk.b == nodeList.get(0)) { // prepend + nodeList.add(0, curChunk.a); + } else if (ignoreDirection && curChunk.b == nodeList.get(nodeList.size() - 1)) { // append + nodeList.add(curChunk.a); + } else if (ignoreDirection && curChunk.a == nodeList.get(0)) { // prepend + nodeList.add(0, curChunk.b); + } else { + continue; + } + + foundChunk = true; + it.remove(); + break; + } + if (!foundChunk) break; + } + + if (!chunks.isEmpty()) { + return tr("Could not combine ways " + + "(They could not be merged into a single string of nodes)"); + } + + return nodeList; + } + + /** + * Enable the "Combine way" menu option if more then one way is selected + */ + public void selectionChanged(Collection newSelection) { + boolean first = false; + for (OsmPrimitive osm : newSelection) { + if (osm instanceof Way) { + if (first) { + setEnabled(true); + return; + } + first = true; + } + } + setEnabled(false); + } } Index: trunk/src/org/openstreetmap/josm/actions/CopyAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CopyAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/CopyAction.java (revision 1169) @@ -28,92 +28,92 @@ public final class CopyAction extends JosmAction implements SelectionChangedListener { - private LinkedList listeners; + private LinkedList listeners; - public CopyAction() { - super(tr("Copy"), "copy", - tr("Copy selected objects to paste buffer."), - Shortcut.registerShortcut("system:copy", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_C, Shortcut.GROUP_MENU), true); - setEnabled(false); - DataSet.selListeners.add(this); - listeners = new LinkedList(); - } + public CopyAction() { + super(tr("Copy"), "copy", + tr("Copy selected objects to paste buffer."), + Shortcut.registerShortcut("system:copy", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_C, Shortcut.GROUP_MENU), true); + setEnabled(false); + DataSet.selListeners.add(this); + listeners = new LinkedList(); + } - @Override public void addListener(JosmAction a) { - listeners.add(a); - } + @Override public void addListener(JosmAction a) { + listeners.add(a); + } - public void actionPerformed(ActionEvent e) { - Collection sel = Main.ds.getSelected(); - if (sel.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, - tr("Please select something to copy.")); - return; - } + public void actionPerformed(ActionEvent e) { + Collection sel = Main.ds.getSelected(); + if (sel.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + tr("Please select something to copy.")); + return; + } - /* New pasteBuffer - will be assigned to the global one at the end */ - final DataSet pasteBuffer = new DataSet(); - final HashMap map = new HashMap(); - /* temporarily maps old nodes to new so we can do a true deep copy */ + /* New pasteBuffer - will be assigned to the global one at the end */ + final DataSet pasteBuffer = new DataSet(); + final HashMap map = new HashMap(); + /* temporarily maps old nodes to new so we can do a true deep copy */ - /* scan the selected objects, mapping them to copies; when copying a way or relation, - * the copy references the copies of their child objects */ - new Visitor(){ - public void visit(Node n) { - /* check if already in pasteBuffer - e.g. two ways are selected which share a node; - * or a way and a node in that way is selected, we'll see it twice, once via the - * way and once directly; and so on. */ - if (map.containsKey(n)) { return; } - Node nnew = new Node(n); - map.put(n, nnew); - pasteBuffer.addPrimitive(nnew); - } - public void visit(Way w) { - /* check if already in pasteBuffer - could have come from a relation, and directly etc. */ - if (map.containsKey(w)) { return; } - Way wnew = new Way(); - wnew.cloneFrom(w); - wnew.nodes.clear(); - List nodes = new ArrayList(); - for (Node n : w.nodes) { - if (! map.containsKey(n)) { - n.visit(this); - } - nodes.add((Node)map.get(n)); - } - wnew.nodes.clear(); - wnew.nodes.addAll(nodes); - pasteBuffer.addPrimitive(wnew); - } - public void visit(Relation e) { - if (map.containsKey(e)) { return; } - Relation enew = new Relation(e); - List members = new ArrayList(); - for (RelationMember m : e.members) { - if (! map.containsKey(m.member)) { - m.member.visit(this); - } - RelationMember mnew = new RelationMember(m); - mnew.member = map.get(m.member); - members.add(mnew); - } - enew.members.addAll(members); - pasteBuffer.addPrimitive(enew); - } - public void visitAll() { - for (OsmPrimitive osm : Main.ds.getSelected()) - osm.visit(this); - } - }.visitAll(); + /* scan the selected objects, mapping them to copies; when copying a way or relation, + * the copy references the copies of their child objects */ + new Visitor(){ + public void visit(Node n) { + /* check if already in pasteBuffer - e.g. two ways are selected which share a node; + * or a way and a node in that way is selected, we'll see it twice, once via the + * way and once directly; and so on. */ + if (map.containsKey(n)) { return; } + Node nnew = new Node(n); + map.put(n, nnew); + pasteBuffer.addPrimitive(nnew); + } + public void visit(Way w) { + /* check if already in pasteBuffer - could have come from a relation, and directly etc. */ + if (map.containsKey(w)) { return; } + Way wnew = new Way(); + wnew.cloneFrom(w); + wnew.nodes.clear(); + List nodes = new ArrayList(); + for (Node n : w.nodes) { + if (! map.containsKey(n)) { + n.visit(this); + } + nodes.add((Node)map.get(n)); + } + wnew.nodes.clear(); + wnew.nodes.addAll(nodes); + pasteBuffer.addPrimitive(wnew); + } + public void visit(Relation e) { + if (map.containsKey(e)) { return; } + Relation enew = new Relation(e); + List members = new ArrayList(); + for (RelationMember m : e.members) { + if (! map.containsKey(m.member)) { + m.member.visit(this); + } + RelationMember mnew = new RelationMember(m); + mnew.member = map.get(m.member); + members.add(mnew); + } + enew.members.addAll(members); + pasteBuffer.addPrimitive(enew); + } + public void visitAll() { + for (OsmPrimitive osm : Main.ds.getSelected()) + osm.visit(this); + } + }.visitAll(); - Main.pasteBuffer = pasteBuffer; - Main.main.menu.paste.setEnabled(true); /* now we have a paste buffer we can make paste available */ + Main.pasteBuffer = pasteBuffer; + Main.main.menu.paste.setEnabled(true); /* now we have a paste buffer we can make paste available */ - for(JosmAction a : listeners) { - a.pasteBufferChanged(Main.pasteBuffer); - } - } + for(JosmAction a : listeners) { + a.pasteBufferChanged(Main.pasteBuffer); + } + } - public void selectionChanged(Collection newSelection) { - setEnabled(! newSelection.isEmpty()); - } + public void selectionChanged(Collection newSelection) { + setEnabled(! newSelection.isEmpty()); + } } Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 1169) @@ -34,152 +34,152 @@ public final class CreateCircleAction extends JosmAction { - public CreateCircleAction() { - super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."), - Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")), KeyEvent.VK_O, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true); - } + public CreateCircleAction() { + super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."), + Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")), KeyEvent.VK_O, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true); + } - private double calcang(double xc, double yc, double x, double y) { - // calculate the angle from xc|yc to x|y - if (xc == x && yc == y) { - return 0; // actually invalid, but we won't have this case in this context - } - double yd = Math.abs(y - yc); - if (yd == 0 && xc < x) { - return 0; - } - if (yd == 0 && xc > x) { - return Math.PI; - } - double xd = Math.abs(x - xc); - double a = Math.atan2(xd, yd); - if (y > yc) { - a = Math.PI - a; - } - if (x < xc) { - a = -a; - } - a = 1.5*Math.PI + a; - if (a < 0) { - a += 2*Math.PI; - } - if (a >= 2*Math.PI) { - a -= 2*Math.PI; - } - return a; - } + private double calcang(double xc, double yc, double x, double y) { + // calculate the angle from xc|yc to x|y + if (xc == x && yc == y) { + return 0; // actually invalid, but we won't have this case in this context + } + double yd = Math.abs(y - yc); + if (yd == 0 && xc < x) { + return 0; + } + if (yd == 0 && xc > x) { + return Math.PI; + } + double xd = Math.abs(x - xc); + double a = Math.atan2(xd, yd); + if (y > yc) { + a = Math.PI - a; + } + if (x < xc) { + a = -a; + } + a = 1.5*Math.PI + a; + if (a < 0) { + a += 2*Math.PI; + } + if (a >= 2*Math.PI) { + a -= 2*Math.PI; + } + return a; + } - public void actionPerformed(ActionEvent e) { - int numberOfNodesInCircle = Integer.parseInt(Main.pref.get("createcircle.nodecount", "8")); - if (numberOfNodesInCircle < 1) { - numberOfNodesInCircle = 1; - } else if (numberOfNodesInCircle > 100) { - numberOfNodesInCircle = 100; - } + public void actionPerformed(ActionEvent e) { + int numberOfNodesInCircle = Integer.parseInt(Main.pref.get("createcircle.nodecount", "8")); + if (numberOfNodesInCircle < 1) { + numberOfNodesInCircle = 1; + } else if (numberOfNodesInCircle > 100) { + numberOfNodesInCircle = 100; + } - Collection sel = Main.ds.getSelected(); - Collection nodes = new LinkedList(); - Way existingWay = null; + Collection sel = Main.ds.getSelected(); + Collection nodes = new LinkedList(); + Way existingWay = null; - for (OsmPrimitive osm : sel) - if (osm instanceof Node) - nodes.add((Node)osm); + for (OsmPrimitive osm : sel) + if (osm instanceof Node) + nodes.add((Node)osm); - // special case if no single nodes are selected and exactly one way is: - // then use the way's nodes - if ((nodes.size() == 0) && (sel.size() == 1)) - for (OsmPrimitive osm : sel) - if (osm instanceof Way) { - existingWay = ((Way)osm); - for (Node n : ((Way)osm).nodes) - { - if(!nodes.contains(n)) - nodes.add(n); - } - } + // special case if no single nodes are selected and exactly one way is: + // then use the way's nodes + if ((nodes.size() == 0) && (sel.size() == 1)) + for (OsmPrimitive osm : sel) + if (osm instanceof Way) { + existingWay = ((Way)osm); + for (Node n : ((Way)osm).nodes) + { + if(!nodes.contains(n)) + nodes.add(n); + } + } - if (nodes.size() != 3) { - JOptionPane.showMessageDialog(Main.parent, tr("Please select exactly three nodes or one way with exactly three nodes.")); - return; - } + if (nodes.size() != 3) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select exactly three nodes or one way with exactly three nodes.")); + return; + } - // let's get some shorter names - Node n1 = ((Node)nodes.toArray()[0]); - double x1 = n1.eastNorth.east(); - double y1 = n1.eastNorth.north(); - Node n2 = ((Node)nodes.toArray()[1]); - double x2 = n2.eastNorth.east(); - double y2 = n2.eastNorth.north(); - Node n3 = ((Node)nodes.toArray()[2]); - double x3 = n3.eastNorth.east(); - double y3 = n3.eastNorth.north(); + // let's get some shorter names + Node n1 = ((Node)nodes.toArray()[0]); + double x1 = n1.eastNorth.east(); + double y1 = n1.eastNorth.north(); + Node n2 = ((Node)nodes.toArray()[1]); + double x2 = n2.eastNorth.east(); + double y2 = n2.eastNorth.north(); + Node n3 = ((Node)nodes.toArray()[2]); + double x3 = n3.eastNorth.east(); + double y3 = n3.eastNorth.north(); - // calculate the center (xc/yc) - double s = 0.5*((x2 - x3)*(x1 - x3) - (y2 - y3)*(y3 - y1)); - double sUnder = (x1 - x2)*(y3 - y1) - (y2 - y1)*(x1 - x3); + // calculate the center (xc/yc) + double s = 0.5*((x2 - x3)*(x1 - x3) - (y2 - y3)*(y3 - y1)); + double sUnder = (x1 - x2)*(y3 - y1) - (y2 - y1)*(x1 - x3); - if (sUnder == 0) { - JOptionPane.showMessageDialog(Main.parent, tr("Those nodes are not in a circle.")); - return; - } + if (sUnder == 0) { + JOptionPane.showMessageDialog(Main.parent, tr("Those nodes are not in a circle.")); + return; + } - s /= sUnder; + s /= sUnder; - double xc = 0.5*(x1 + x2) + s*(y2 - y1); - double yc = 0.5*(y1 + y2) + s*(x1 - x2); + double xc = 0.5*(x1 + x2) + s*(y2 - y1); + double yc = 0.5*(y1 + y2) + s*(x1 - x2); - // calculate the radius (r) - double r = Math.sqrt(Math.pow(xc-x1,2) + Math.pow(yc-y1,2)); + // calculate the radius (r) + double r = Math.sqrt(Math.pow(xc-x1,2) + Math.pow(yc-y1,2)); - // find where to put the existing nodes - double a1 = calcang(xc, yc, x1, y1); - double a2 = calcang(xc, yc, x2, y2); - double a3 = calcang(xc, yc, x3, y3); - if (a1 < a2) { double at = a1; Node nt = n1; a1 = a2; n1 = n2; a2 = at; n2 = nt; } - if (a2 < a3) { double at = a2; Node nt = n2; a2 = a3; n2 = n3; a3 = at; n3 = nt; } - if (a1 < a2) { double at = a1; Node nt = n1; a1 = a2; n1 = n2; a2 = at; n2 = nt; } + // find where to put the existing nodes + double a1 = calcang(xc, yc, x1, y1); + double a2 = calcang(xc, yc, x2, y2); + double a3 = calcang(xc, yc, x3, y3); + if (a1 < a2) { double at = a1; Node nt = n1; a1 = a2; n1 = n2; a2 = at; n2 = nt; } + if (a2 < a3) { double at = a2; Node nt = n2; a2 = a3; n2 = n3; a3 = at; n3 = nt; } + if (a1 < a2) { double at = a1; Node nt = n1; a1 = a2; n1 = n2; a2 = at; n2 = nt; } - // now we can start doing thigs to OSM data - Collection cmds = new LinkedList(); + // now we can start doing thigs to OSM data + Collection cmds = new LinkedList(); - // build a way for the circle - Way wayToAdd; - if (existingWay == null) { - wayToAdd = new Way(); - } else { - // re-use existing way if it was selected - wayToAdd = new Way(existingWay); - wayToAdd.nodes.clear(); - } - for (int i = 1; i <= numberOfNodesInCircle; i++) { - double a = 2*Math.PI*(1.0 - i/(double)numberOfNodesInCircle); // "1-" to get it clock-wise - // insert existing nodes if they fit before this new node (999 means "already added this node") - if (a1 < 999 && a1 > a) { - wayToAdd.nodes.add(n1); - a1 = 999; - } - if (a2 < 999 && a2 > a) { - wayToAdd.nodes.add(n2); - a2 = 999; - } - if (a3 < 999 && a3 > a) { - wayToAdd.nodes.add(n3); - a3 = 999; - } - // get the position of the new node and insert it - double x = xc + r*Math.cos(a); - double y = yc + r*Math.sin(a); - Node n = new Node(Main.proj.eastNorth2latlon(new EastNorth(x,y))); - wayToAdd.nodes.add(n); - cmds.add(new AddCommand(n)); - } - wayToAdd.nodes.add(wayToAdd.nodes.get(0)); // close the circle - if (existingWay == null) { - cmds.add(new AddCommand(wayToAdd)); - } else { - cmds.add(new ChangeCommand(existingWay, wayToAdd)); - } + // build a way for the circle + Way wayToAdd; + if (existingWay == null) { + wayToAdd = new Way(); + } else { + // re-use existing way if it was selected + wayToAdd = new Way(existingWay); + wayToAdd.nodes.clear(); + } + for (int i = 1; i <= numberOfNodesInCircle; i++) { + double a = 2*Math.PI*(1.0 - i/(double)numberOfNodesInCircle); // "1-" to get it clock-wise + // insert existing nodes if they fit before this new node (999 means "already added this node") + if (a1 < 999 && a1 > a) { + wayToAdd.nodes.add(n1); + a1 = 999; + } + if (a2 < 999 && a2 > a) { + wayToAdd.nodes.add(n2); + a2 = 999; + } + if (a3 < 999 && a3 > a) { + wayToAdd.nodes.add(n3); + a3 = 999; + } + // get the position of the new node and insert it + double x = xc + r*Math.cos(a); + double y = yc + r*Math.sin(a); + Node n = new Node(Main.proj.eastNorth2latlon(new EastNorth(x,y))); + wayToAdd.nodes.add(n); + cmds.add(new AddCommand(n)); + } + wayToAdd.nodes.add(wayToAdd.nodes.get(0)); // close the circle + if (existingWay == null) { + cmds.add(new AddCommand(wayToAdd)); + } else { + cmds.add(new ChangeCommand(existingWay, wayToAdd)); + } - Main.main.undoRedo.add(new SequenceCommand(tr("Create Circle"), cmds)); - Main.map.repaint(); - } + Main.main.undoRedo.add(new SequenceCommand(tr("Create Circle"), cmds)); + Main.map.repaint(); + } } Index: trunk/src/org/openstreetmap/josm/actions/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (revision 1169) @@ -17,15 +17,15 @@ public final class DeleteAction extends JosmAction implements SelectionChangedListener { - public DeleteAction() { - super(tr("Delete"), "dialogs/delete", tr("Delete selected objects."), - Shortcut.registerShortcut("system:delete", tr("Edit: {0}", tr("Delete")), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT), true); + public DeleteAction() { + super(tr("Delete"), "dialogs/delete", tr("Delete selected objects."), + Shortcut.registerShortcut("system:delete", tr("Edit: {0}", tr("Delete")), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT), true); DataSet.selListeners.add(this); - setEnabled(false); - } + setEnabled(false); + } - public void actionPerformed(ActionEvent e) { - new org.openstreetmap.josm.actions.mapmode.DeleteAction(Main.map) - .doActionPerformed(e); - } + public void actionPerformed(ActionEvent e) { + new org.openstreetmap.josm.actions.mapmode.DeleteAction(Main.map) + .doActionPerformed(e); + } public void selectionChanged(Collection newSelection) { setEnabled(! newSelection.isEmpty()); Index: trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 1169) @@ -17,41 +17,41 @@ abstract public class DiskAccessAction extends JosmAction { - public DiskAccessAction(String name, String iconName, String tooltip, Shortcut shortcut) { - super(name, iconName, tooltip, shortcut, true); - } + public DiskAccessAction(String name, String iconName, String tooltip, Shortcut shortcut) { + super(name, iconName, tooltip, shortcut, true); + } - @Deprecated - public DiskAccessAction(String name, String iconName, String tooltip, int shortcut, int modifiers) { - super(name, iconName, tooltip, shortcut, modifiers, true); - } + @Deprecated + public DiskAccessAction(String name, String iconName, String tooltip, int shortcut, int modifiers) { + super(name, iconName, tooltip, shortcut, modifiers, true); + } - protected static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title) { - String curDir = Main.pref.get("lastDirectory"); - if (curDir.equals("")) - curDir = "."; - JFileChooser fc = new JFileChooser(new File(curDir)); - if(title != null) - fc.setDialogTitle(title); + protected static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title) { + String curDir = Main.pref.get("lastDirectory"); + if (curDir.equals("")) + curDir = "."; + JFileChooser fc = new JFileChooser(new File(curDir)); + if(title != null) + fc.setDialogTitle(title); - fc.setMultiSelectionEnabled(multiple); - for (int i = 0; i < ExtensionFileFilter.filters.length; ++i) - fc.addChoosableFileFilter(ExtensionFileFilter.filters[i]); - fc.setAcceptAllFileFilterUsed(true); + fc.setMultiSelectionEnabled(multiple); + for (int i = 0; i < ExtensionFileFilter.filters.length; ++i) + fc.addChoosableFileFilter(ExtensionFileFilter.filters[i]); + fc.setAcceptAllFileFilterUsed(true); - int answer = open ? fc.showOpenDialog(Main.parent) : fc.showSaveDialog(Main.parent); - if (answer != JFileChooser.APPROVE_OPTION) - return null; + int answer = open ? fc.showOpenDialog(Main.parent) : fc.showSaveDialog(Main.parent); + if (answer != JFileChooser.APPROVE_OPTION) + return null; - if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) - Main.pref.put("lastDirectory", fc.getCurrentDirectory().getAbsolutePath()); + if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) + Main.pref.put("lastDirectory", fc.getCurrentDirectory().getAbsolutePath()); - if (!open) { - File file = fc.getSelectedFile(); - if (file == null || (file.exists() && JOptionPane.YES_OPTION != - JOptionPane.showConfirmDialog(Main.parent, tr("File exists. Overwrite?"), tr("Overwrite"), JOptionPane.YES_NO_OPTION))) - return null; - } + if (!open) { + File file = fc.getSelectedFile(); + if (file == null || (file.exists() && JOptionPane.YES_OPTION != + JOptionPane.showConfirmDialog(Main.parent, tr("File exists. Overwrite?"), tr("Overwrite"), JOptionPane.YES_NO_OPTION))) + return null; + } - return fc; - } + return fc; + } } Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 1169) @@ -28,48 +28,48 @@ public class DownloadAction extends JosmAction { - public DownloadDialog dialog; + public DownloadDialog dialog; - public DownloadAction() { - super(tr("Download from OSM ..."), "download", tr("Download map data from the OSM server."), - Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM ...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); - } + public DownloadAction() { + super(tr("Download from OSM ..."), "download", tr("Download map data from the OSM server."), + Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM ...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); + } - public void actionPerformed(ActionEvent e) { - dialog = new DownloadDialog(); + public void actionPerformed(ActionEvent e) { + dialog = new DownloadDialog(); - JPanel downPanel = new JPanel(new GridBagLayout()); - downPanel.add(dialog, GBC.eol().fill(GBC.BOTH)); + JPanel downPanel = new JPanel(new GridBagLayout()); + downPanel.add(dialog, GBC.eol().fill(GBC.BOTH)); - JOptionPane pane = new JOptionPane(downPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); - JDialog dlg = pane.createDialog(Main.parent, tr("Download")); - dlg.setResizable(true); - dialog.setOptionPane(pane); + JOptionPane pane = new JOptionPane(downPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); + JDialog dlg = pane.createDialog(Main.parent, tr("Download")); + dlg.setResizable(true); + dialog.setOptionPane(pane); - if (dlg.getWidth() > 1000) - dlg.setSize(1000, dlg.getHeight()); - if (dlg.getHeight() > 600) - dlg.setSize(dlg.getWidth(),600); + if (dlg.getWidth() > 1000) + dlg.setSize(1000, dlg.getHeight()); + if (dlg.getHeight() > 600) + dlg.setSize(dlg.getWidth(),600); - boolean finish = false; + boolean finish = false; while (!finish) { dlg.setVisible(true); Main.pref.put("download.newlayer", dialog.newLayer.isSelected()); - if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION) { - Main.pref.put("download.tab", Integer.toString(dialog.getSelectedTab())); - for (DownloadTask task : dialog.downloadTasks) { - Main.pref.put("download."+task.getPreferencesSuffix(), task.getCheckBox().isSelected()); - if (task.getCheckBox().isSelected()) { - task.download(this, dialog.minlat, dialog.minlon, dialog.maxlat, dialog.maxlon); - finish = true; - } - } - } else - finish = true; - if (!finish) - JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one task to download")); + if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION) { + Main.pref.put("download.tab", Integer.toString(dialog.getSelectedTab())); + for (DownloadTask task : dialog.downloadTasks) { + Main.pref.put("download."+task.getPreferencesSuffix(), task.getCheckBox().isSelected()); + if (task.getCheckBox().isSelected()) { + task.download(this, dialog.minlat, dialog.minlon, dialog.maxlat, dialog.maxlon); + finish = true; + } + } + } else + finish = true; + if (!finish) + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one task to download")); } dialog = null; - dlg.dispose(); - } + dlg.dispose(); + } } Index: trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (revision 1169) @@ -18,18 +18,18 @@ public DuplicateAction() { - super(tr("Duplicate"), "duplicate", - tr("Duplicate selection by copy and immediate paste."), - Shortcut.registerShortcut("system:duplicate", tr("Edit: {0}", tr("Duplicate")), KeyEvent.VK_D, Shortcut.GROUP_MENU), true); - setEnabled(false); - DataSet.selListeners.add(this); + super(tr("Duplicate"), "duplicate", + tr("Duplicate selection by copy and immediate paste."), + Shortcut.registerShortcut("system:duplicate", tr("Edit: {0}", tr("Duplicate")), KeyEvent.VK_D, Shortcut.GROUP_MENU), true); + setEnabled(false); + DataSet.selListeners.add(this); } - public void actionPerformed(ActionEvent e) { - Main.main.menu.copy.actionPerformed(e); - Main.main.menu.paste.actionPerformed(e); + public void actionPerformed(ActionEvent e) { + Main.main.menu.copy.actionPerformed(e); + Main.main.menu.paste.actionPerformed(e); } - public void selectionChanged(Collection newSelection) { - setEnabled(! newSelection.isEmpty()); - } + public void selectionChanged(Collection newSelection) { + setEnabled(! newSelection.isEmpty()); + } } Index: trunk/src/org/openstreetmap/josm/actions/ExitAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 1169) @@ -16,15 +16,15 @@ */ public class ExitAction extends JosmAction { - /** - * Construct the action with "Exit" as label - */ - public ExitAction() { - super(tr("Exit"), "exit", tr("Exit the application."), - Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.GROUP_MENU), true); - } + /** + * Construct the action with "Exit" as label + */ + public ExitAction() { + super(tr("Exit"), "exit", tr("Exit the application."), + Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.GROUP_MENU), true); + } - public void actionPerformed(ActionEvent e) { - if (!Main.breakBecauseUnsavedChanges()) - System.exit(0); - } + public void actionPerformed(ActionEvent e) { + if (!Main.breakBecauseUnsavedChanges()) + System.exit(0); + } } Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 1169) @@ -9,50 +9,50 @@ /** - * A file filter that filters after the extension. Also includes a list of file + * A file filter that filters after the extension. Also includes a list of file * filters used in JOSM. - * + * * @author imi */ public class ExtensionFileFilter extends FileFilter { - private final String extension; - private final String description; - public final String defaultExtension; + private final String extension; + private final String description; + public final String defaultExtension; - public static final int OSM = 0; - public static final int GPX = 1; - public static final int NMEA = 2; - - public static ExtensionFileFilter[] filters = { - new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (*.osm *.xml)")), - new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files (*.gpx *.gpx.gz)")), - new ExtensionFileFilter("nmea,txt", "nmea", tr("NMEA-0183 Files (*.nmea *.txt)")), - }; + public static final int OSM = 0; + public static final int GPX = 1; + public static final int NMEA = 2; - /** - * Construct an extension file filter by giving the extension to check after. - * - */ - public ExtensionFileFilter(String extension, String defExt, String description) { - this.extension = extension; - defaultExtension = defExt; - this.description = description; - } + public static ExtensionFileFilter[] filters = { + new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (*.osm *.xml)")), + new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files (*.gpx *.gpx.gz)")), + new ExtensionFileFilter("nmea,txt", "nmea", tr("NMEA-0183 Files (*.nmea *.txt)")), + }; - public boolean acceptName(String filename) { - String name = filename.toLowerCase(); - for (String ext : extension.split(",")) - if (name.endsWith("."+ext)) - return true; - return false; - } + /** + * Construct an extension file filter by giving the extension to check after. + * + */ + public ExtensionFileFilter(String extension, String defExt, String description) { + this.extension = extension; + defaultExtension = defExt; + this.description = description; + } - @Override public boolean accept(File pathname) { - if (pathname.isDirectory()) - return true; - return acceptName(pathname.getName()); - } + public boolean acceptName(String filename) { + String name = filename.toLowerCase(); + for (String ext : extension.split(",")) + if (name.endsWith("."+ext)) + return true; + return false; + } - @Override public String getDescription() { - return description; - } + @Override public boolean accept(File pathname) { + if (pathname.isDirectory()) + return true; + return acceptName(pathname.getName()); + } + + @Override public String getDescription() { + return description; + } } Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 1169) @@ -40,197 +40,197 @@ public class GpxExportAction extends DiskAccessAction { - private final static String warningGpl = ""+tr("Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks.")+""; - - private final Layer layer; - - public GpxExportAction(Layer layer) { - super(tr("Export to GPX ..."), "exportgpx", tr("Export the data to GPX file."), - Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX ..."), KeyEvent.VK_E, Shortcut.GROUP_MENU)); - this.layer = layer; - } - - public void actionPerformed(ActionEvent e) { - if (layer == null && Main.map == null) { - JOptionPane.showMessageDialog(Main.parent, tr("Nothing to export. Get some data first.")); - return; - } - - JFileChooser fc = createAndOpenFileChooser(false, false, null); - if (fc == null) - return; - File file = fc.getSelectedFile(); - if (file == null) - return; - - exportGpx(file, this.layer == null ? Main.main.editLayer() : this.layer); - } - - public static void exportGpx(File file, Layer layer) { - String fn = file.getPath(); - if (fn.indexOf('.') == -1) { - fn += ".gpx"; - file = new File(fn); - } - - // open the dialog asking for options - JPanel p = new JPanel(new GridBagLayout()); - - p.add(new JLabel(tr("gps track description")), GBC.eol()); - JTextArea desc = new JTextArea(3,40); - desc.setWrapStyleWord(true); - desc.setLineWrap(true); - p.add(new JScrollPane(desc), GBC.eop().fill(GBC.BOTH)); - - JCheckBox author = new JCheckBox(tr("Add author information"), Main.pref.getBoolean("lastAddAuthor", true)); - author.setSelected(true); - p.add(author, GBC.eol()); - JLabel nameLabel = new JLabel(tr("Real name")); - p.add(nameLabel, GBC.std().insets(10,0,5,0)); - JTextField authorName = new JTextField(Main.pref.get("lastAuthorName")); - p.add(authorName, GBC.eol().fill(GBC.HORIZONTAL)); - JLabel emailLabel = new JLabel(tr("Email")); - p.add(emailLabel, GBC.std().insets(10,0,5,0)); - JTextField email = new JTextField(Main.pref.get("osm-server.username")); - p.add(email, GBC.eol().fill(GBC.HORIZONTAL)); - JLabel copyrightLabel = new JLabel(tr("Copyright (URL)")); - p.add(copyrightLabel, GBC.std().insets(10,0,5,0)); - JTextField copyright = new JTextField(); - p.add(copyright, GBC.std().fill(GBC.HORIZONTAL)); - JButton predefined = new JButton(tr("Predefined")); - p.add(predefined, GBC.eol().insets(5,0,0,0)); - JLabel copyrightYearLabel = new JLabel(tr("Copyright year")); - p.add(copyrightYearLabel, GBC.std().insets(10,0,5,5)); - JTextField copyrightYear = new JTextField(""); - p.add(copyrightYear, GBC.eol().fill(GBC.HORIZONTAL)); - JLabel warning = new JLabel("  "; + + private final Layer layer; + + public GpxExportAction(Layer layer) { + super(tr("Export to GPX ..."), "exportgpx", tr("Export the data to GPX file."), + Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX ..."), KeyEvent.VK_E, Shortcut.GROUP_MENU)); + this.layer = layer; + } + + public void actionPerformed(ActionEvent e) { + if (layer == null && Main.map == null) { + JOptionPane.showMessageDialog(Main.parent, tr("Nothing to export. Get some data first.")); + return; + } + + JFileChooser fc = createAndOpenFileChooser(false, false, null); + if (fc == null) + return; + File file = fc.getSelectedFile(); + if (file == null) + return; + + exportGpx(file, this.layer == null ? Main.main.editLayer() : this.layer); + } + + public static void exportGpx(File file, Layer layer) { + String fn = file.getPath(); + if (fn.indexOf('.') == -1) { + fn += ".gpx"; + file = new File(fn); + } + + // open the dialog asking for options + JPanel p = new JPanel(new GridBagLayout()); + + p.add(new JLabel(tr("gps track description")), GBC.eol()); + JTextArea desc = new JTextArea(3,40); + desc.setWrapStyleWord(true); + desc.setLineWrap(true); + p.add(new JScrollPane(desc), GBC.eop().fill(GBC.BOTH)); + + JCheckBox author = new JCheckBox(tr("Add author information"), Main.pref.getBoolean("lastAddAuthor", true)); + author.setSelected(true); + p.add(author, GBC.eol()); + JLabel nameLabel = new JLabel(tr("Real name")); + p.add(nameLabel, GBC.std().insets(10,0,5,0)); + JTextField authorName = new JTextField(Main.pref.get("lastAuthorName")); + p.add(authorName, GBC.eol().fill(GBC.HORIZONTAL)); + JLabel emailLabel = new JLabel(tr("Email")); + p.add(emailLabel, GBC.std().insets(10,0,5,0)); + JTextField email = new JTextField(Main.pref.get("osm-server.username")); + p.add(email, GBC.eol().fill(GBC.HORIZONTAL)); + JLabel copyrightLabel = new JLabel(tr("Copyright (URL)")); + p.add(copyrightLabel, GBC.std().insets(10,0,5,0)); + JTextField copyright = new JTextField(); + p.add(copyright, GBC.std().fill(GBC.HORIZONTAL)); + JButton predefined = new JButton(tr("Predefined")); + p.add(predefined, GBC.eol().insets(5,0,0,0)); + JLabel copyrightYearLabel = new JLabel(tr("Copyright year")); + p.add(copyrightYearLabel, GBC.std().insets(10,0,5,5)); + JTextField copyrightYear = new JTextField(""); + p.add(copyrightYear, GBC.eol().fill(GBC.HORIZONTAL)); + JLabel warning = new JLabel("  404 not found"); - else if (e.getURL().toString().startsWith(WikiReader.JOSM_EXTERN)) - OpenBrowser.displayUrl("http://"+e.getURL().toString().substring(WikiReader.JOSM_EXTERN.length())+"?action=edit"); - else - setHelpUrl(e.getURL().toString()); - } - }); - help.setContentType("text/html"); - - JPanel p = new JPanel(new BorderLayout()); - helpBrowser.setContentPane(p); - - p.add(new JScrollPane(help), BorderLayout.CENTER); - String[] bounds = Main.pref.get("help.window.bounds", "0,0,800,600").split(","); - helpBrowser.setBounds( - Integer.parseInt(bounds[0]), - Integer.parseInt(bounds[1]), - Integer.parseInt(bounds[2]), - Integer.parseInt(bounds[3])); - - JPanel buttons = new JPanel(); - p.add(buttons, BorderLayout.SOUTH); - createButton(buttons, tr("Open in Browser")); - createButton(buttons, tr("Edit")); - createButton(buttons, tr("Reload")); - - helpBrowser.addWindowListener(new WindowAdapter(){ - @Override public void windowClosing(WindowEvent e) { - closeHelp(); - } - }); + private JFrame helpBrowser = new JFrame(tr("JOSM Online Help")); + private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); + private JEditorPane help = new JEditorPane(); + private WikiReader reader = new WikiReader(baseurl); + private String url; + + public HelpAction() { + super(tr("Help"), ImageProvider.get("help")); + help.setEditable(false); + help.addHyperlinkListener(new HyperlinkListener(){ + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) + return; + if (e.getURL() == null) + help.setText("404 not found"); + else if (e.getURL().toString().startsWith(WikiReader.JOSM_EXTERN)) + OpenBrowser.displayUrl("http://"+e.getURL().toString().substring(WikiReader.JOSM_EXTERN.length())+"?action=edit"); + else + setHelpUrl(e.getURL().toString()); + } + }); + help.setContentType("text/html"); + + JPanel p = new JPanel(new BorderLayout()); + helpBrowser.setContentPane(p); + + p.add(new JScrollPane(help), BorderLayout.CENTER); + String[] bounds = Main.pref.get("help.window.bounds", "0,0,800,600").split(","); + helpBrowser.setBounds( + Integer.parseInt(bounds[0]), + Integer.parseInt(bounds[1]), + Integer.parseInt(bounds[2]), + Integer.parseInt(bounds[3])); + + JPanel buttons = new JPanel(); + p.add(buttons, BorderLayout.SOUTH); + createButton(buttons, tr("Open in Browser")); + createButton(buttons, tr("Edit")); + createButton(buttons, tr("Reload")); + + helpBrowser.addWindowListener(new WindowAdapter(){ + @Override public void windowClosing(WindowEvent e) { + closeHelp(); + } + }); help.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Close"); help.getActionMap().put("Close", new AbstractAction(){ - public void actionPerformed(ActionEvent e) { - closeHelp(); + public void actionPerformed(ActionEvent e) { + closeHelp(); } }); - } - - public void actionPerformed(ActionEvent e) { - if (tr("Open in Browser").equals(e.getActionCommand())) { - OpenBrowser.displayUrl(url); - } else if (tr("Edit").equals(e.getActionCommand())) { - if (!url.startsWith(baseurl)) { - JOptionPane.showMessageDialog(Main.parent, tr("Can only edit help pages from JOSM Online Help")); - return; - } - OpenBrowser.displayUrl(url+"?action=edit"); - } else if (tr("Reload").equals(e.getActionCommand())) { - setHelpUrl(url); - } else if (e.getActionCommand() == null) { - String topic = null; - Point mouse = Main.parent.getMousePosition(); - if (mouse != null) - topic = contextSensitiveHelp(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y)); - if (topic == null) { - helpBrowser.setVisible(false); - setHelpUrl(baseurl+"/wiki/Help"); - } else - help(topic); - } else { - helpBrowser.setVisible(false); - setHelpUrl(baseurl+"/wiki/Help"); - } - } - - /** - * @return The topic of the help. null for "don't know" - */ - private String contextSensitiveHelp(Object c) { - if (c instanceof Helpful) - return ((Helpful)c).helpTopic(); - if (c instanceof JMenu) - return "Menu/"+((JMenu)c).getText(); - if (c instanceof AbstractButton) { - AbstractButton b = (AbstractButton)c; - if (b.getClientProperty("help") != null) - return (String)b.getClientProperty("help"); - return contextSensitiveHelp(((AbstractButton)c).getAction()); - } - if (c instanceof Action) - return (String)((Action)c).getValue("help"); - if (c instanceof Component) - return contextSensitiveHelp(((Component)c).getParent()); - return null; - } - - /** - * Displays the help (or browse on the already open help) on the online page - * with the given help topic. Use this for larger help descriptions. - */ - public void help(String topic) { - helpBrowser.setVisible(false); - setHelpUrl(baseurl+"/wiki/Help/"+topic); - } - - /** - * Set the content of the help window to a specific text (in html format) - * @param url The url this content is the representation of - */ - public void setHelpUrl(String url) { - int i = url.lastIndexOf("/")+1; - String title = url.substring(i); - if(!title.startsWith(languageCode)) - title = languageCode + title; - String langurl = url.substring(0, i) + title; - if(langurl.equals(this.url) || langurl.equals(url)) - { - this.url = url; - try { - help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument()); - } catch (IOException ex) { - help.setText(tr("Error while loading page {0}",url)); - } - } - else - { - try { - help.read(new StringReader(reader.read(langurl)), help.getEditorKit().createDefaultDocument()); - String message = help.getText(); - String le = "http://josm-extern." + langurl.substring(7); - if(message.indexOf("Describe "") >= 0 && message.indexOf(le) >= 0) - throw new IOException(); - this.url = langurl; - } catch (IOException e) { - this.url = url; - try { - help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument()); - } catch (IOException ex) { - help.setText(tr("Error while loading page {0}",url)); - } - } - } - helpBrowser.setVisible(true); - } - - /** - * Closes the help window - */ - public void closeHelp() { - String bounds = helpBrowser.getX()+","+helpBrowser.getY()+","+helpBrowser.getWidth()+","+helpBrowser.getHeight(); - Main.pref.put("help.window.bounds", bounds); - helpBrowser.setVisible(false); - } - - private void createButton(JPanel buttons, String name) { - JButton b = new JButton(tr(name)); - b.setActionCommand(name); - b.addActionListener(this); - buttons.add(b); - } + } + + public void actionPerformed(ActionEvent e) { + if (tr("Open in Browser").equals(e.getActionCommand())) { + OpenBrowser.displayUrl(url); + } else if (tr("Edit").equals(e.getActionCommand())) { + if (!url.startsWith(baseurl)) { + JOptionPane.showMessageDialog(Main.parent, tr("Can only edit help pages from JOSM Online Help")); + return; + } + OpenBrowser.displayUrl(url+"?action=edit"); + } else if (tr("Reload").equals(e.getActionCommand())) { + setHelpUrl(url); + } else if (e.getActionCommand() == null) { + String topic = null; + Point mouse = Main.parent.getMousePosition(); + if (mouse != null) + topic = contextSensitiveHelp(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y)); + if (topic == null) { + helpBrowser.setVisible(false); + setHelpUrl(baseurl+"/wiki/Help"); + } else + help(topic); + } else { + helpBrowser.setVisible(false); + setHelpUrl(baseurl+"/wiki/Help"); + } + } + + /** + * @return The topic of the help. null for "don't know" + */ + private String contextSensitiveHelp(Object c) { + if (c instanceof Helpful) + return ((Helpful)c).helpTopic(); + if (c instanceof JMenu) + return "Menu/"+((JMenu)c).getText(); + if (c instanceof AbstractButton) { + AbstractButton b = (AbstractButton)c; + if (b.getClientProperty("help") != null) + return (String)b.getClientProperty("help"); + return contextSensitiveHelp(((AbstractButton)c).getAction()); + } + if (c instanceof Action) + return (String)((Action)c).getValue("help"); + if (c instanceof Component) + return contextSensitiveHelp(((Component)c).getParent()); + return null; + } + + /** + * Displays the help (or browse on the already open help) on the online page + * with the given help topic. Use this for larger help descriptions. + */ + public void help(String topic) { + helpBrowser.setVisible(false); + setHelpUrl(baseurl+"/wiki/Help/"+topic); + } + + /** + * Set the content of the help window to a specific text (in html format) + * @param url The url this content is the representation of + */ + public void setHelpUrl(String url) { + int i = url.lastIndexOf("/")+1; + String title = url.substring(i); + if(!title.startsWith(languageCode)) + title = languageCode + title; + String langurl = url.substring(0, i) + title; + if(langurl.equals(this.url) || langurl.equals(url)) + { + this.url = url; + try { + help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument()); + } catch (IOException ex) { + help.setText(tr("Error while loading page {0}",url)); + } + } + else + { + try { + help.read(new StringReader(reader.read(langurl)), help.getEditorKit().createDefaultDocument()); + String message = help.getText(); + String le = "http://josm-extern." + langurl.substring(7); + if(message.indexOf("Describe "") >= 0 && message.indexOf(le) >= 0) + throw new IOException(); + this.url = langurl; + } catch (IOException e) { + this.url = url; + try { + help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument()); + } catch (IOException ex) { + help.setText(tr("Error while loading page {0}",url)); + } + } + } + helpBrowser.setVisible(true); + } + + /** + * Closes the help window + */ + public void closeHelp() { + String bounds = helpBrowser.getX()+","+helpBrowser.getY()+","+helpBrowser.getWidth()+","+helpBrowser.getHeight(); + Main.pref.put("help.window.bounds", bounds); + helpBrowser.setVisible(false); + } + + private void createButton(JPanel buttons, String name) { + JButton b = new JButton(tr(name)); + b.setActionCommand(name); + b.addActionListener(this); + buttons.add(b); + } } Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 1169) @@ -18,14 +18,14 @@ public class HistoryInfoAction extends JosmAction { - public HistoryInfoAction() { - super(tr("OSM History Information"), "about",tr("Display history information about OSM ways or nodes."), - Shortcut.registerShortcut("core:history", tr("OSM History Information"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true); - } + public HistoryInfoAction() { + super(tr("OSM History Information"), "about",tr("Display history information about OSM ways or nodes."), + Shortcut.registerShortcut("core:history", tr("OSM History Information"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true); + } - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { new Visitor() { public void visit(Node n) { - OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/node/" + n.id + "/history"); - } + OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/node/" + n.id + "/history"); + } public void visit(Way w) { @@ -43,5 +43,5 @@ }.visitAll(); - } + } } Index: trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 1169) @@ -26,59 +26,59 @@ public class JoinNodeWayAction extends JosmAction { - public JoinNodeWayAction() { - super(tr("Join node to way"), "joinnodeway", tr("Join a node into the nearest way segments"), - Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join node to way")), KeyEvent.VK_J, Shortcut.GROUP_EDIT), true); - } + public JoinNodeWayAction() { + super(tr("Join node to way"), "joinnodeway", tr("Join a node into the nearest way segments"), + Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join node to way")), KeyEvent.VK_J, Shortcut.GROUP_EDIT), true); + } - public void actionPerformed(ActionEvent e) { - Collection sel = Main.ds.getSelected(); - if (sel.size() != 1 || !(sel.iterator().next() instanceof Node)) return; - Node node = (Node) sel.iterator().next(); + public void actionPerformed(ActionEvent e) { + Collection sel = Main.ds.getSelected(); + if (sel.size() != 1 || !(sel.iterator().next() instanceof Node)) return; + Node node = (Node) sel.iterator().next(); - List wss = Main.map.mapView.getNearestWaySegments( - Main.map.mapView.getPoint(node.eastNorth)); - HashMap> insertPoints = new HashMap>(); - for (WaySegment ws : wss) { - List is; - if (insertPoints.containsKey(ws.way)) { - is = insertPoints.get(ws.way); - } else { - is = new ArrayList(); - insertPoints.put(ws.way, is); - } + List wss = Main.map.mapView.getNearestWaySegments( + Main.map.mapView.getPoint(node.eastNorth)); + HashMap> insertPoints = new HashMap>(); + for (WaySegment ws : wss) { + List is; + if (insertPoints.containsKey(ws.way)) { + is = insertPoints.get(ws.way); + } else { + is = new ArrayList(); + insertPoints.put(ws.way, is); + } - if (ws.way.nodes.get(ws.lowerIndex) != node - && ws.way.nodes.get(ws.lowerIndex+1) != node) { - is.add(ws.lowerIndex); - } - } + if (ws.way.nodes.get(ws.lowerIndex) != node + && ws.way.nodes.get(ws.lowerIndex+1) != node) { + is.add(ws.lowerIndex); + } + } - Collection cmds = new LinkedList(); - for (Map.Entry> insertPoint : insertPoints.entrySet()) { - Way w = insertPoint.getKey(); - Way wnew = new Way(w); - List is = insertPoint.getValue(); - pruneSuccsAndReverse(is); - for (int i : is) wnew.nodes.add(i+1, node); - cmds.add(new ChangeCommand(w, wnew)); - } + Collection cmds = new LinkedList(); + for (Map.Entry> insertPoint : insertPoints.entrySet()) { + Way w = insertPoint.getKey(); + Way wnew = new Way(w); + List is = insertPoint.getValue(); + pruneSuccsAndReverse(is); + for (int i : is) wnew.nodes.add(i+1, node); + cmds.add(new ChangeCommand(w, wnew)); + } - Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds)); - Main.map.repaint(); - } + Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds)); + Main.map.repaint(); + } - private static void pruneSuccsAndReverse(List is) { - //if (is.size() < 2) return; + private static void pruneSuccsAndReverse(List is) { + //if (is.size() < 2) return; - HashSet is2 = new HashSet(); - for (int i : is) { - if (!is2.contains(i - 1) && !is2.contains(i + 1)) { - is2.add(i); - } - } - is.clear(); - is.addAll(is2); - Collections.sort(is); - Collections.reverse(is); - } + HashSet is2 = new HashSet(); + for (int i : is) { + if (!is2.contains(i - 1) && !is2.contains(i + 1)) { + is2.add(i); + } + } + is.clear(); + is.addAll(is2); + Collections.sort(is); + Collections.reverse(is); + } } Index: trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 1169) @@ -25,99 +25,99 @@ abstract public class JosmAction extends AbstractAction implements Destroyable { - @Deprecated - public KeyStroke shortcut; - protected Shortcut sc; + @Deprecated + public KeyStroke shortcut; + protected Shortcut sc; - public Shortcut getShortcut() { - if (sc == null) { - sc = Shortcut.registerShortcut("core:none", "No Shortcut", 0, Shortcut.GROUP_NONE); - sc.setAutomatic(); // as this shortcut is shared by all action that don't want to have a shortcut, - // we shouldn't allow the user to change it... - } - return sc; - } + public Shortcut getShortcut() { + if (sc == null) { + sc = Shortcut.registerShortcut("core:none", "No Shortcut", 0, Shortcut.GROUP_NONE); + sc.setAutomatic(); // as this shortcut is shared by all action that don't want to have a shortcut, + // we shouldn't allow the user to change it... + } + return sc; + } - @Deprecated - public JosmAction(String name, String iconName, String tooltip, int shortcut, int modifier, boolean register) { - super(name, iconName == null ? null : ImageProvider.get(iconName)); - setHelpId(); - if (shortcut != 0) { - int group = Shortcut.GROUP_LAYER; //GROUP_NONE; - if (((modifier & InputEvent.CTRL_MASK) != 0) || ((modifier & InputEvent.CTRL_DOWN_MASK) != 0)) { - group = Shortcut.GROUP_MENU; - } else if (modifier == 0) { - group = Shortcut.GROUP_EDIT; - } - sc = Shortcut.registerShortcut("auto:"+name, name, shortcut, group); - this.shortcut = sc.getKeyStroke(); - Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name); - Main.contentPane.getActionMap().put(name, this); - } - putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc)); - putValue("toolbar", iconName); + @Deprecated + public JosmAction(String name, String iconName, String tooltip, int shortcut, int modifier, boolean register) { + super(name, iconName == null ? null : ImageProvider.get(iconName)); + setHelpId(); + if (shortcut != 0) { + int group = Shortcut.GROUP_LAYER; //GROUP_NONE; + if (((modifier & InputEvent.CTRL_MASK) != 0) || ((modifier & InputEvent.CTRL_DOWN_MASK) != 0)) { + group = Shortcut.GROUP_MENU; + } else if (modifier == 0) { + group = Shortcut.GROUP_EDIT; + } + sc = Shortcut.registerShortcut("auto:"+name, name, shortcut, group); + this.shortcut = sc.getKeyStroke(); + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name); + Main.contentPane.getActionMap().put(name, this); + } + putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc)); + putValue("toolbar", iconName); if (register) - Main.toolbar.register(this); - } + Main.toolbar.register(this); + } - /** - * The new super for all actions. - * - * Use this super constructor to setup your action. It takes 5 parameters: - * - * name - the action's text as displayed on the menu (if it is added to a menu) - * iconName - the filename of the icon to use - * tooltip - a longer description of the action that will be displayed in the tooltip. Please note - * that html is not supported for menu action on some platforms - * shortcut - a ready-created shortcut object or null if you don't want a shortcut. But you always - * do want a shortcut, remember you can alway register it with group=none, so you - * won't be assigned a shurtcut unless the user configures one. If you pass null here, - * the user CANNOT configure a shortcut for your action. - * register - register this action for the toolbar preferences? - */ - public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) { - super(name, iconName == null ? null : ImageProvider.get(iconName)); - setHelpId(); - sc = shortcut; - if (sc != null) { - this.shortcut = sc.getKeyStroke(); - Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name); - Main.contentPane.getActionMap().put(name, this); - } - putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc)); - putValue("toolbar", iconName); + /** + * The new super for all actions. + * + * Use this super constructor to setup your action. It takes 5 parameters: + * + * name - the action's text as displayed on the menu (if it is added to a menu) + * iconName - the filename of the icon to use + * tooltip - a longer description of the action that will be displayed in the tooltip. Please note + * that html is not supported for menu action on some platforms + * shortcut - a ready-created shortcut object or null if you don't want a shortcut. But you always + * do want a shortcut, remember you can alway register it with group=none, so you + * won't be assigned a shurtcut unless the user configures one. If you pass null here, + * the user CANNOT configure a shortcut for your action. + * register - register this action for the toolbar preferences? + */ + public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) { + super(name, iconName == null ? null : ImageProvider.get(iconName)); + setHelpId(); + sc = shortcut; + if (sc != null) { + this.shortcut = sc.getKeyStroke(); + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name); + Main.contentPane.getActionMap().put(name, this); + } + putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc)); + putValue("toolbar", iconName); if (register) - Main.toolbar.register(this); - } + Main.toolbar.register(this); + } - public void destroy() { - if (shortcut != null) { - Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(sc.getKeyStroke()); - Main.contentPane.getActionMap().remove(sc.getKeyStroke()); - } - } + public void destroy() { + if (shortcut != null) { + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(sc.getKeyStroke()); + Main.contentPane.getActionMap().remove(sc.getKeyStroke()); + } + } - public JosmAction() { - setHelpId(); - } + public JosmAction() { + setHelpId(); + } - /** - * needs to be overridden to be useful - */ - public void pasteBufferChanged(DataSet newPasteBuffer) { - return; - } + /** + * needs to be overridden to be useful + */ + public void pasteBufferChanged(DataSet newPasteBuffer) { + return; + } - /** - * needs to be overridden to be useful - */ - public void addListener(JosmAction a) { - return; - } + /** + * needs to be overridden to be useful + */ + public void addListener(JosmAction a) { + return; + } - private void setHelpId() { - String helpId = "Action/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1); - if (helpId.endsWith("Action")) - helpId = helpId.substring(0, helpId.length()-6); - putValue("help", helpId); - } + private void setHelpId() { + String helpId = "Action/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1); + if (helpId.endsWith("Action")) + helpId = helpId.substring(0, helpId.length()-6); + putValue("help", helpId); + } } Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 1169) @@ -52,245 +52,245 @@ public class MergeNodesAction extends JosmAction implements SelectionChangedListener { - public MergeNodesAction() { - super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."), - Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true); - DataSet.selListeners.add(this); - } - - public void actionPerformed(ActionEvent event) { - Collection selection = Main.ds.getSelected(); - LinkedList selectedNodes = new LinkedList(); - - // the selection check should stop this procedure starting if - // nothing but node are selected - otherwise we don't care - // anyway as long as we have at least two nodes - for (OsmPrimitive osm : selection) - if (osm instanceof Node) - selectedNodes.add((Node)osm); - - if (selectedNodes.size() < 2) { - JOptionPane.showMessageDialog(Main.parent, tr("Please select at least two nodes to merge.")); - return; - } - - // Find which node to merge into (i.e. which one will be left) - // - this should be combined from two things: - // 1. It will be the first node in the list that has a - // positive ID number, OR the first node. - // 2. It will be at the position of the first node in the - // list. - // - // *However* - there is the problem that the selection list is - // _not_ in the order that the nodes were clicked on, meaning - // that the user doesn't know which node will be chosen (so - // (2) is not implemented yet.) :-( - Node useNode = null; - for (Node n: selectedNodes) { - if (n.id > 0) { - useNode = n; - break; - } - } - if (useNode == null) - useNode = selectedNodes.iterator().next(); - - mergeNodes(selectedNodes, useNode); - } - - /** - * really do the merging - returns the node that is left - */ - public static Node mergeNodes(LinkedList allNodes, Node dest) { - Node newNode = new Node(dest); - - // Check whether all ways have identical relationship membership. More - // specifically: If one of the selected ways is a member of relation X - // in role Y, then all selected ways must be members of X in role Y. - - // FIXME: In a later revision, we should display some sort of conflict - // dialog like we do for tags, to let the user choose which relations - // should be kept. - - // Step 1, iterate over all relations and figure out which of our - // selected ways are members of a relation. - HashMap, HashSet> backlinks = - new HashMap, HashSet>(); - HashSet relationsUsingNodes = new HashSet(); - for (Relation r : Main.ds.relations) { - if (r.deleted || r.incomplete) continue; - for (RelationMember rm : r.members) { - if (rm.member instanceof Node) { - for (Node n : allNodes) { - if (rm.member == n) { - Pair pair = new Pair(r, rm.role); - HashSet nodelinks = new HashSet(); - if (backlinks.containsKey(pair)) { - nodelinks = backlinks.get(pair); - } else { - nodelinks = new HashSet(); - backlinks.put(pair, nodelinks); - } - nodelinks.add(n); - - // this is just a cache for later use - relationsUsingNodes.add(r); - } - } - } - } - } - - // Complain to the user if the ways don't have equal memberships. - for (HashSet nodelinks : backlinks.values()) { - if (!nodelinks.containsAll(allNodes)) { - int option = JOptionPane.showConfirmDialog(Main.parent, - tr("The selected nodes have differing relation memberships. " - + "Do you still want to merge them?"), - tr("Merge nodes with different memberships?"), - JOptionPane.YES_NO_OPTION); - if (option == JOptionPane.YES_OPTION) - break; - return null; - } - } - - // collect properties for later conflict resolving - Map> props = new TreeMap>(); - for (Node n : allNodes) { - for (Entry e : n.entrySet()) { - if (!props.containsKey(e.getKey())) - props.put(e.getKey(), new TreeSet()); - props.get(e.getKey()).add(e.getValue()); - } - } - - // display conflict dialog - Map components = new HashMap(); - JPanel p = new JPanel(new GridBagLayout()); - for (Entry> e : props.entrySet()) { - if (TigerUtils.isTigerTag(e.getKey())) { - String combined = TigerUtils.combineTags(e.getKey(), e.getValue()); - newNode.put(e.getKey(), combined); - } else if (e.getValue().size() > 1) { - if("created_by".equals(e.getKey())) - { - newNode.put("created_by", "JOSM"); - } - else - { - JComboBox c = new JComboBox(e.getValue().toArray()); - c.setEditable(true); - p.add(new JLabel(e.getKey()), GBC.std()); - p.add(Box.createHorizontalStrut(10), GBC.std()); - p.add(c, GBC.eol()); - components.put(e.getKey(), c); - } - } else - newNode.put(e.getKey(), e.getValue().iterator().next()); - } - - if (!components.isEmpty()) { - int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter values for all conflicts."), JOptionPane.OK_CANCEL_OPTION); - if (answer != JOptionPane.OK_OPTION) - return null; - for (Entry e : components.entrySet()) - newNode.put(e.getKey(), e.getValue().getEditor().getItem().toString()); - } - - LinkedList cmds = new LinkedList(); - cmds.add(new ChangeCommand(dest, newNode)); - - Collection del = new HashSet(); - - for (Way w : Main.ds.ways) { - if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; - boolean modify = false; - for (Node sn : allNodes) { - if (sn == dest) continue; - if (w.nodes.contains(sn)) { - modify = true; - } - } - if (!modify) continue; - // OK - this way contains one or more nodes to change - ArrayList nn = new ArrayList(); - Node lastNode = null; - for (int i = 0; i < w.nodes.size(); i++) { - Node pushNode = w.nodes.get(i); - if (allNodes.contains(pushNode)) { - pushNode = dest; - } - if (pushNode != lastNode) { - nn.add(pushNode); - } - lastNode = pushNode; - } - if (nn.size() < 2) { - CollectBackReferencesVisitor backRefs = - new CollectBackReferencesVisitor(Main.ds, false); - w.visit(backRefs); - if (!backRefs.data.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, - tr("Cannot merge nodes: " + - "Would have to delete a way that is still used.")); - return null; - } - del.add(w); - } else { - Way newWay = new Way(w); - newWay.nodes.clear(); - newWay.nodes.addAll(nn); - cmds.add(new ChangeCommand(w, newWay)); - } - } - - // delete any merged nodes - del.addAll(allNodes); - del.remove(dest); - if (!del.isEmpty()) cmds.add(new DeleteCommand(del)); - - // modify all relations containing the now-deleted nodes - for (Relation r : relationsUsingNodes) { - Relation newRel = new Relation(r); - newRel.members.clear(); - HashSet rolesToReAdd = new HashSet(); - for (RelationMember rm : r.members) { - // Don't copy the member if it points to one of our nodes, - // just keep a note to re-add it later on. - if (allNodes.contains(rm.member)) { - rolesToReAdd.add(rm.role); - } else { - newRel.members.add(rm); - } - } - for (String role : rolesToReAdd) { - newRel.members.add(new RelationMember(role, dest)); - } - cmds.add(new ChangeCommand(r, newRel)); - } - - Main.main.undoRedo.add(new SequenceCommand(tr("Merge {0} nodes", allNodes.size()), cmds)); - Main.ds.setSelected(dest); - - return dest; - } - - - /** - * Enable the "Merge Nodes" menu option if more then one node is selected - */ - public void selectionChanged(Collection newSelection) { - boolean ok = true; - if (newSelection.size() < 2) { - setEnabled(false); - return; - } - for (OsmPrimitive osm : newSelection) { - if (!(osm instanceof Node)) { - ok = false; - break; - } - } - setEnabled(ok); - } + public MergeNodesAction() { + super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."), + Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true); + DataSet.selListeners.add(this); + } + + public void actionPerformed(ActionEvent event) { + Collection selection = Main.ds.getSelected(); + LinkedList selectedNodes = new LinkedList(); + + // the selection check should stop this procedure starting if + // nothing but node are selected - otherwise we don't care + // anyway as long as we have at least two nodes + for (OsmPrimitive osm : selection) + if (osm instanceof Node) + selectedNodes.add((Node)osm); + + if (selectedNodes.size() < 2) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least two nodes to merge.")); + return; + } + + // Find which node to merge into (i.e. which one will be left) + // - this should be combined from two things: + // 1. It will be the first node in the list that has a + // positive ID number, OR the first node. + // 2. It will be at the position of the first node in the + // list. + // + // *However* - there is the problem that the selection list is + // _not_ in the order that the nodes were clicked on, meaning + // that the user doesn't know which node will be chosen (so + // (2) is not implemented yet.) :-( + Node useNode = null; + for (Node n: selectedNodes) { + if (n.id > 0) { + useNode = n; + break; + } + } + if (useNode == null) + useNode = selectedNodes.iterator().next(); + + mergeNodes(selectedNodes, useNode); + } + + /** + * really do the merging - returns the node that is left + */ + public static Node mergeNodes(LinkedList allNodes, Node dest) { + Node newNode = new Node(dest); + + // Check whether all ways have identical relationship membership. More + // specifically: If one of the selected ways is a member of relation X + // in role Y, then all selected ways must be members of X in role Y. + + // FIXME: In a later revision, we should display some sort of conflict + // dialog like we do for tags, to let the user choose which relations + // should be kept. + + // Step 1, iterate over all relations and figure out which of our + // selected ways are members of a relation. + HashMap, HashSet> backlinks = + new HashMap, HashSet>(); + HashSet relationsUsingNodes = new HashSet(); + for (Relation r : Main.ds.relations) { + if (r.deleted || r.incomplete) continue; + for (RelationMember rm : r.members) { + if (rm.member instanceof Node) { + for (Node n : allNodes) { + if (rm.member == n) { + Pair pair = new Pair(r, rm.role); + HashSet nodelinks = new HashSet(); + if (backlinks.containsKey(pair)) { + nodelinks = backlinks.get(pair); + } else { + nodelinks = new HashSet(); + backlinks.put(pair, nodelinks); + } + nodelinks.add(n); + + // this is just a cache for later use + relationsUsingNodes.add(r); + } + } + } + } + } + + // Complain to the user if the ways don't have equal memberships. + for (HashSet nodelinks : backlinks.values()) { + if (!nodelinks.containsAll(allNodes)) { + int option = JOptionPane.showConfirmDialog(Main.parent, + tr("The selected nodes have differing relation memberships. " + + "Do you still want to merge them?"), + tr("Merge nodes with different memberships?"), + JOptionPane.YES_NO_OPTION); + if (option == JOptionPane.YES_OPTION) + break; + return null; + } + } + + // collect properties for later conflict resolving + Map> props = new TreeMap>(); + for (Node n : allNodes) { + for (Entry e : n.entrySet()) { + if (!props.containsKey(e.getKey())) + props.put(e.getKey(), new TreeSet()); + props.get(e.getKey()).add(e.getValue()); + } + } + + // display conflict dialog + Map components = new HashMap(); + JPanel p = new JPanel(new GridBagLayout()); + for (Entry> e : props.entrySet()) { + if (TigerUtils.isTigerTag(e.getKey())) { + String combined = TigerUtils.combineTags(e.getKey(), e.getValue()); + newNode.put(e.getKey(), combined); + } else if (e.getValue().size() > 1) { + if("created_by".equals(e.getKey())) + { + newNode.put("created_by", "JOSM"); + } + else + { + JComboBox c = new JComboBox(e.getValue().toArray()); + c.setEditable(true); + p.add(new JLabel(e.getKey()), GBC.std()); + p.add(Box.createHorizontalStrut(10), GBC.std()); + p.add(c, GBC.eol()); + components.put(e.getKey(), c); + } + } else + newNode.put(e.getKey(), e.getValue().iterator().next()); + } + + if (!components.isEmpty()) { + int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter values for all conflicts."), JOptionPane.OK_CANCEL_OPTION); + if (answer != JOptionPane.OK_OPTION) + return null; + for (Entry e : components.entrySet()) + newNode.put(e.getKey(), e.getValue().getEditor().getItem().toString()); + } + + LinkedList cmds = new LinkedList(); + cmds.add(new ChangeCommand(dest, newNode)); + + Collection del = new HashSet(); + + for (Way w : Main.ds.ways) { + if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; + boolean modify = false; + for (Node sn : allNodes) { + if (sn == dest) continue; + if (w.nodes.contains(sn)) { + modify = true; + } + } + if (!modify) continue; + // OK - this way contains one or more nodes to change + ArrayList nn = new ArrayList(); + Node lastNode = null; + for (int i = 0; i < w.nodes.size(); i++) { + Node pushNode = w.nodes.get(i); + if (allNodes.contains(pushNode)) { + pushNode = dest; + } + if (pushNode != lastNode) { + nn.add(pushNode); + } + lastNode = pushNode; + } + if (nn.size() < 2) { + CollectBackReferencesVisitor backRefs = + new CollectBackReferencesVisitor(Main.ds, false); + w.visit(backRefs); + if (!backRefs.data.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + tr("Cannot merge nodes: " + + "Would have to delete a way that is still used.")); + return null; + } + del.add(w); + } else { + Way newWay = new Way(w); + newWay.nodes.clear(); + newWay.nodes.addAll(nn); + cmds.add(new ChangeCommand(w, newWay)); + } + } + + // delete any merged nodes + del.addAll(allNodes); + del.remove(dest); + if (!del.isEmpty()) cmds.add(new DeleteCommand(del)); + + // modify all relations containing the now-deleted nodes + for (Relation r : relationsUsingNodes) { + Relation newRel = new Relation(r); + newRel.members.clear(); + HashSet rolesToReAdd = new HashSet(); + for (RelationMember rm : r.members) { + // Don't copy the member if it points to one of our nodes, + // just keep a note to re-add it later on. + if (allNodes.contains(rm.member)) { + rolesToReAdd.add(rm.role); + } else { + newRel.members.add(rm); + } + } + for (String role : rolesToReAdd) { + newRel.members.add(new RelationMember(role, dest)); + } + cmds.add(new ChangeCommand(r, newRel)); + } + + Main.main.undoRedo.add(new SequenceCommand(tr("Merge {0} nodes", allNodes.size()), cmds)); + Main.ds.setSelected(dest); + + return dest; + } + + + /** + * Enable the "Merge Nodes" menu option if more then one node is selected + */ + public void selectionChanged(Collection newSelection) { + boolean ok = true; + if (newSelection.size() < 2) { + setEnabled(false); + return; + } + for (OsmPrimitive osm : newSelection) { + if (!(osm instanceof Node)) { + ok = false; + break; + } + } + setEnabled(ok); + } } Index: trunk/src/org/openstreetmap/josm/actions/MoveAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 1169) @@ -26,87 +26,87 @@ public class MoveAction extends JosmAction { - public enum Direction { UP, LEFT, RIGHT, DOWN } - private Direction myDirection; + public enum Direction { UP, LEFT, RIGHT, DOWN } + private Direction myDirection; - // any better idea? - private static Object calltosupermustbefirststatementinconstructor(Direction dir, boolean text) { - Shortcut sc; - String directiontext; - if (dir == Direction.UP) { - directiontext = tr("up"); - sc = Shortcut.registerShortcut("core:moveup", tr("Move objects {0}", directiontext), KeyEvent.VK_UP, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); - } else if (dir == Direction.DOWN) { - directiontext = tr("down"); - sc = Shortcut.registerShortcut("core:movedown", tr("Move objects {0}", directiontext), KeyEvent.VK_DOWN, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); - } else if (dir == Direction.LEFT) { - directiontext = tr("left"); - sc = Shortcut.registerShortcut("core:moveleft", tr("Move objects {0}", directiontext), KeyEvent.VK_LEFT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); - } else { //dir == Direction.RIGHT) { - directiontext = tr("right"); - sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", directiontext), KeyEvent.VK_RIGHT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); - } - if (text) { - return directiontext; - } else { - return sc; - } - } + // any better idea? + private static Object calltosupermustbefirststatementinconstructor(Direction dir, boolean text) { + Shortcut sc; + String directiontext; + if (dir == Direction.UP) { + directiontext = tr("up"); + sc = Shortcut.registerShortcut("core:moveup", tr("Move objects {0}", directiontext), KeyEvent.VK_UP, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); + } else if (dir == Direction.DOWN) { + directiontext = tr("down"); + sc = Shortcut.registerShortcut("core:movedown", tr("Move objects {0}", directiontext), KeyEvent.VK_DOWN, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); + } else if (dir == Direction.LEFT) { + directiontext = tr("left"); + sc = Shortcut.registerShortcut("core:moveleft", tr("Move objects {0}", directiontext), KeyEvent.VK_LEFT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); + } else { //dir == Direction.RIGHT) { + directiontext = tr("right"); + sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", directiontext), KeyEvent.VK_RIGHT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT); + } + if (text) { + return directiontext; + } else { + return sc; + } + } - public MoveAction(Direction dir) { - super(tr("Move {0}", calltosupermustbefirststatementinconstructor(dir, true)), null, - tr("Moves Objects {0}", calltosupermustbefirststatementinconstructor(dir, true)), - (Shortcut)calltosupermustbefirststatementinconstructor(dir, false), true); - myDirection = dir; - } + public MoveAction(Direction dir) { + super(tr("Move {0}", calltosupermustbefirststatementinconstructor(dir, true)), null, + tr("Moves Objects {0}", calltosupermustbefirststatementinconstructor(dir, true)), + (Shortcut)calltosupermustbefirststatementinconstructor(dir, false), true); + myDirection = dir; + } - public void actionPerformed(ActionEvent event) { + public void actionPerformed(ActionEvent event) { - // find out how many "real" units the objects have to be moved in order to - // achive an 1-pixel movement + // find out how many "real" units the objects have to be moved in order to + // achive an 1-pixel movement - EastNorth en1 = Main.map.mapView.getEastNorth(100, 100); - EastNorth en2 = Main.map.mapView.getEastNorth(101, 101); + EastNorth en1 = Main.map.mapView.getEastNorth(100, 100); + EastNorth en2 = Main.map.mapView.getEastNorth(101, 101); - double distx = en2.east() - en1.east(); - double disty = en2.north() - en1.north(); + double distx = en2.east() - en1.east(); + double disty = en2.north() - en1.north(); - switch (myDirection) { - case UP: - distx = 0; - disty = -disty; - break; - case DOWN: - distx = 0; - break; - case LEFT: - disty = 0; - distx = -distx; - default: - disty = 0; - } + switch (myDirection) { + case UP: + distx = 0; + disty = -disty; + break; + case DOWN: + distx = 0; + break; + case LEFT: + disty = 0; + distx = -distx; + default: + disty = 0; + } - Collection selection = Main.ds.getSelected(); - Collection affectedNodes = AllNodesVisitor.getAllNodes(selection); + Collection selection = Main.ds.getSelected(); + Collection affectedNodes = AllNodesVisitor.getAllNodes(selection); - Command c = !Main.main.undoRedo.commands.isEmpty() - ? Main.main.undoRedo.commands.getLast() : null; + Command c = !Main.main.undoRedo.commands.isEmpty() + ? Main.main.undoRedo.commands.getLast() : null; - if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects)) - ((MoveCommand)c).moveAgain(distx, disty); - else - Main.main.undoRedo.add( - c = new MoveCommand(selection, distx, disty)); + if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects)) + ((MoveCommand)c).moveAgain(distx, disty); + else + Main.main.undoRedo.add( + c = new MoveCommand(selection, distx, disty)); - for (Node n : affectedNodes) { - if (n.coor.isOutSideWorld()) { - // Revert move - ((MoveCommand) c).moveAgain(-distx, -disty); - JOptionPane.showMessageDialog(Main.parent, - tr("Cannot move objects outside of the world.")); - return; - } - } + for (Node n : affectedNodes) { + if (n.coor.isOutSideWorld()) { + // Revert move + ((MoveCommand) c).moveAgain(-distx, -disty); + JOptionPane.showMessageDialog(Main.parent, + tr("Cannot move objects outside of the world.")); + return; + } + } - Main.map.mapView.repaint(); - } + Main.map.mapView.repaint(); + } } Index: trunk/src/org/openstreetmap/josm/actions/NewAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/NewAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/NewAction.java (revision 1169) @@ -14,11 +14,11 @@ public class NewAction extends JosmAction { - public NewAction() { - super(tr("New"), "new", tr("Create a new map."), - Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New")), KeyEvent.VK_N, Shortcut.GROUP_MENU), true); - } + public NewAction() { + super(tr("New"), "new", tr("Create a new map."), + Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New")), KeyEvent.VK_N, Shortcut.GROUP_MENU), true); + } - public void actionPerformed(ActionEvent e) { - Main.main.addLayer(new OsmDataLayer(new DataSet(), tr("unnamed"), null)); - } + public void actionPerformed(ActionEvent e) { + Main.main.addLayer(new OsmDataLayer(new DataSet(), tr("unnamed"), null)); + } } Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 1169) @@ -35,135 +35,135 @@ public class OpenFileAction extends DiskAccessAction { - /** - * Create an open action. The name is "Open a file". - */ - public OpenFileAction() { - super(tr("Open ..."), "open", tr("Open a file."), - Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open ...")), KeyEvent.VK_O, Shortcut.GROUP_MENU)); - } - - public void actionPerformed(ActionEvent e) { - JFileChooser fc = createAndOpenFileChooser(true, true, null); - if (fc == null) - return; - File[] files = fc.getSelectedFiles(); - for (int i = files.length; i > 0; --i) - openFile(files[i-1]); - } - - /** - * Open the given file. - */ - public void openFile(File file) { - try { - if (asGpxData(file.getName())) - openFileAsGpx(file); - else if (asNmeaData(file.getName())) - openFileAsNmea(file); - else - openAsData(file); - } catch (SAXException x) { - x.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing {0}",file.getName())+": "+x.getMessage()); - } catch (IOException x) { - x.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("Could not read \"{0}\"",file.getName())+"\n"+x.getMessage()); - } - } - - private void openAsData(File file) throws SAXException, IOException, FileNotFoundException { - String fn = file.getName(); - if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) { - DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), null, Main.pleaseWaitDlg); - OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file); - Main.main.addLayer(layer); - layer.fireDataChange(); - } - else - JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(file.getName().lastIndexOf('.')+1))); - } - - private void openFileAsGpx(File file) throws SAXException, IOException, FileNotFoundException { - String fn = file.getName(); - if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) { - GpxReader r = null; - InputStream is; - if (file.getName().endsWith(".gpx.gz")) { - is = new GZIPInputStream(new FileInputStream(file)); - } else { - is = new FileInputStream(file); - } - // Workaround for SAX BOM bug - // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6206835 - if(!((is.read()==0xef)&&(is.read()==0xbb)&&(is.read()==0xbf))) { - is.close(); - if (file.getName().endsWith(".gpx.gz")) { - is = new GZIPInputStream(new FileInputStream(file)); - } else { - is = new FileInputStream(file); - } - } - r = new GpxReader(is,file.getAbsoluteFile().getParentFile()); - r.data.storageFile = file; - GpxLayer gpxLayer = new GpxLayer(r.data, fn); - Main.main.addLayer(gpxLayer); - if (Main.pref.getBoolean("marker.makeautomarkers", true)) { - MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer); - if (ml.data.size() > 0) { - Main.main.addLayer(ml); - } - } - - } else { - throw new IllegalStateException(); - } - } - - private void showNmeaInfobox(boolean success, NmeaReader r) { - String msg = tr("Coordinates imported: ") + r.getNumberOfCoordinates() + "\n" + - tr("Malformed sentences: ") + r.getParserMalformed() + "\n" + - tr("Checksum errors: ") + r.getParserChecksumErrors() + "\n"; - if(!success) // don't scare the user unneccessarily - msg += tr("Unknown sentences: ") + r.getParserUnknown() + "\n"; - msg += tr("Zero coordinates: ") + r.getParserZeroCoordinates(); - if(success) { - JOptionPane.showMessageDialog( - Main.parent, msg, - tr("NMEA import success"),JOptionPane.INFORMATION_MESSAGE); - } else { - JOptionPane.showMessageDialog( - Main.parent, msg, - tr("NMEA import faliure!"),JOptionPane.ERROR_MESSAGE); - } - } - - private void openFileAsNmea(File file) throws IOException, FileNotFoundException { - String fn = file.getName(); - if (ExtensionFileFilter.filters[ExtensionFileFilter.NMEA].acceptName(fn)) { - NmeaReader r = new NmeaReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile()); - if(r.getNumberOfCoordinates()>0) { - r.data.storageFile = file; - GpxLayer gpxLayer = new GpxLayer(r.data, fn); - Main.main.addLayer(gpxLayer); - if (Main.pref.getBoolean("marker.makeautomarkers", true)) { - MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer); - if (ml.data.size() > 0) { - Main.main.addLayer(ml); - } - } - } - showNmeaInfobox(r.getNumberOfCoordinates()>0, r); - } else { - throw new IllegalStateException(); - } + /** + * Create an open action. The name is "Open a file". + */ + public OpenFileAction() { + super(tr("Open ..."), "open", tr("Open a file."), + Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open ...")), KeyEvent.VK_O, Shortcut.GROUP_MENU)); } - private boolean asGpxData(String fn) { - return ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn); - } + public void actionPerformed(ActionEvent e) { + JFileChooser fc = createAndOpenFileChooser(true, true, null); + if (fc == null) + return; + File[] files = fc.getSelectedFiles(); + for (int i = files.length; i > 0; --i) + openFile(files[i-1]); + } - private boolean asNmeaData(String fn) { - return ExtensionFileFilter.filters[ExtensionFileFilter.NMEA].acceptName(fn); - } + /** + * Open the given file. + */ + public void openFile(File file) { + try { + if (asGpxData(file.getName())) + openFileAsGpx(file); + else if (asNmeaData(file.getName())) + openFileAsNmea(file); + else + openAsData(file); + } catch (SAXException x) { + x.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing {0}",file.getName())+": "+x.getMessage()); + } catch (IOException x) { + x.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not read \"{0}\"",file.getName())+"\n"+x.getMessage()); + } + } + + private void openAsData(File file) throws SAXException, IOException, FileNotFoundException { + String fn = file.getName(); + if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) { + DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), null, Main.pleaseWaitDlg); + OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file); + Main.main.addLayer(layer); + layer.fireDataChange(); + } + else + JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(file.getName().lastIndexOf('.')+1))); + } + + private void openFileAsGpx(File file) throws SAXException, IOException, FileNotFoundException { + String fn = file.getName(); + if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) { + GpxReader r = null; + InputStream is; + if (file.getName().endsWith(".gpx.gz")) { + is = new GZIPInputStream(new FileInputStream(file)); + } else { + is = new FileInputStream(file); + } + // Workaround for SAX BOM bug + // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6206835 + if(!((is.read()==0xef)&&(is.read()==0xbb)&&(is.read()==0xbf))) { + is.close(); + if (file.getName().endsWith(".gpx.gz")) { + is = new GZIPInputStream(new FileInputStream(file)); + } else { + is = new FileInputStream(file); + } + } + r = new GpxReader(is,file.getAbsoluteFile().getParentFile()); + r.data.storageFile = file; + GpxLayer gpxLayer = new GpxLayer(r.data, fn); + Main.main.addLayer(gpxLayer); + if (Main.pref.getBoolean("marker.makeautomarkers", true)) { + MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer); + if (ml.data.size() > 0) { + Main.main.addLayer(ml); + } + } + + } else { + throw new IllegalStateException(); + } + } + + private void showNmeaInfobox(boolean success, NmeaReader r) { + String msg = tr("Coordinates imported: ") + r.getNumberOfCoordinates() + "\n" + + tr("Malformed sentences: ") + r.getParserMalformed() + "\n" + + tr("Checksum errors: ") + r.getParserChecksumErrors() + "\n"; + if(!success) // don't scare the user unneccessarily + msg += tr("Unknown sentences: ") + r.getParserUnknown() + "\n"; + msg += tr("Zero coordinates: ") + r.getParserZeroCoordinates(); + if(success) { + JOptionPane.showMessageDialog( + Main.parent, msg, + tr("NMEA import success"),JOptionPane.INFORMATION_MESSAGE); + } else { + JOptionPane.showMessageDialog( + Main.parent, msg, + tr("NMEA import faliure!"),JOptionPane.ERROR_MESSAGE); + } + } + + private void openFileAsNmea(File file) throws IOException, FileNotFoundException { + String fn = file.getName(); + if (ExtensionFileFilter.filters[ExtensionFileFilter.NMEA].acceptName(fn)) { + NmeaReader r = new NmeaReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile()); + if(r.getNumberOfCoordinates()>0) { + r.data.storageFile = file; + GpxLayer gpxLayer = new GpxLayer(r.data, fn); + Main.main.addLayer(gpxLayer); + if (Main.pref.getBoolean("marker.makeautomarkers", true)) { + MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer); + if (ml.data.size() > 0) { + Main.main.addLayer(ml); + } + } + } + showNmeaInfobox(r.getNumberOfCoordinates()>0, r); + } else { + throw new IllegalStateException(); + } + } + + private boolean asGpxData(String fn) { + return ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn); + } + + private boolean asNmeaData(String fn) { + return ExtensionFileFilter.filters[ExtensionFileFilter.NMEA].acceptName(fn); + } Index: trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 1169) @@ -42,33 +42,33 @@ public class OpenLocationAction extends JosmAction { - /** - * Create an open action. The name is "Open a file". - */ - public OpenLocationAction() { - super(tr("Open Location..."), "openlocation", tr("Open a URL."), - Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")), KeyEvent.VK_L, Shortcut.GROUP_MENU), true); - } + /** + * Create an open action. The name is "Open a file". + */ + public OpenLocationAction() { + super(tr("Open Location..."), "openlocation", tr("Open a URL."), + Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")), KeyEvent.VK_L, Shortcut.GROUP_MENU), true); + } - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { - JCheckBox layer = new JCheckBox(tr("Separate Layer")); - layer.setSelected(Main.pref.getBoolean("download.newlayer")); - JPanel all = new JPanel(new GridBagLayout()); - all.add(new JLabel("Enter URL to download:"), GBC.eol()); - JTextField urltext = new JTextField(40); - all.add(urltext, GBC.eol()); - all.add(layer, GBC.eol()); - int answer = JOptionPane.showConfirmDialog(Main.parent, all, tr("Download Location"), JOptionPane.OK_CANCEL_OPTION); - if (answer != JOptionPane.OK_OPTION) - return; - openUrl(layer.isSelected(), urltext.getText()); - } + JCheckBox layer = new JCheckBox(tr("Separate Layer")); + layer.setSelected(Main.pref.getBoolean("download.newlayer")); + JPanel all = new JPanel(new GridBagLayout()); + all.add(new JLabel("Enter URL to download:"), GBC.eol()); + JTextField urltext = new JTextField(40); + all.add(urltext, GBC.eol()); + all.add(layer, GBC.eol()); + int answer = JOptionPane.showConfirmDialog(Main.parent, all, tr("Download Location"), JOptionPane.OK_CANCEL_OPTION); + if (answer != JOptionPane.OK_OPTION) + return; + openUrl(layer.isSelected(), urltext.getText()); + } - /** - * Open the given file. - */ - public void openUrl(boolean new_layer, String url) { - new DownloadOsmTask().loadUrl(new_layer, url); - } + /** + * Open the given file. + */ + public void openUrl(boolean new_layer, String url) { + new DownloadOsmTask().loadUrl(new_layer, url); + } } Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 1169) @@ -28,6 +28,6 @@ /** - * Align edges of a way so all angles are right angles. - * + * Align edges of a way so all angles are right angles. + * * 1. Find orientation of all edges * 2. Compute main orientation, weighted by length of edge, normalized to angles between 0 and pi/2 @@ -38,12 +38,12 @@ public final class OrthogonalizeAction extends JosmAction { - public OrthogonalizeAction() { - super(tr("Orthogonalize shape"), - "ortho", + public OrthogonalizeAction() { + super(tr("Orthogonalize shape"), + "ortho", tr("Move nodes so all angles are 90 or 270deg"), - Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize")), - KeyEvent.VK_Q, + Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize")), + KeyEvent.VK_Q, Shortcut.GROUP_EDIT), true); - } + } public void actionPerformed(ActionEvent e) { @@ -60,5 +60,5 @@ JOptionPane.showMessageDialog(Main.parent, tr("Only two nodes allowed")); return; - } + } dirnodes.add((Node) osm); continue; @@ -68,5 +68,5 @@ JOptionPane.showMessageDialog(Main.parent, tr("Selection must consist only of ways.")); return; - } + } // Check if every way is made of at least four segments and closed @@ -78,5 +78,5 @@ // Check if every edge in the way is a definite edge of at least 45 degrees of direction change - // Otherwise, two segments could be turned into same direction and intersection would fail. + // Otherwise, two segments could be turned into same direction and intersection would fail. // Or changes of shape would be too serious. for (int i1=0; i1 < way.nodes.size()-1; i1++) { @@ -116,6 +116,6 @@ boolean use_dirnodes = false; - if (dirnodes.size() == 2) { - // When selection contains two nodes, use the nodes to compute a direction + if (dirnodes.size() == 2) { + // When selection contains two nodes, use the nodes to compute a direction // to align all ways to align_to_heading = normalize_angle(dirnodes.get(0).eastNorth.heading(dirnodes.get(1).eastNorth)); @@ -124,5 +124,5 @@ for (OsmPrimitive osm : sel) { - if(!(osm instanceof Way)) + if(!(osm instanceof Way)) continue; @@ -164,7 +164,7 @@ if (angle_diff_max > Math.PI/3) { - // rearrange headings: everything < 0 gets PI/2-rotated + // rearrange headings: everything < 0 gets PI/2-rotated for (int i=0; i < sides; i++) { - if (headings[i] < 0) + if (headings[i] < 0) headings[i] += Math.PI/2; } @@ -183,11 +183,11 @@ sum_weights += weights[i]; } - align_to_heading = normalize_angle(sum_weighted_headings/sum_weights); + align_to_heading = normalize_angle(sum_weighted_headings/sum_weights); } for (int i=0; i < sides; i++) { - // Compute handy indices of three nodes to be used in one loop iteration. - // We use segments (i1,i2) and (i2,i3), align them and compute the new + // Compute handy indices of three nodes to be used in one loop iteration. + // We use segments (i1,i2) and (i2,i3), align them and compute the new // position of the i2-node as the intersection of the realigned (i1,i2), (i2,i3) segments // Not the most efficient algorithm, but we don't handle millions of nodes... @@ -212,9 +212,9 @@ // compute intersection of segments - double u=det(B.east() - A.east(), B.north() - A.north(), + double u=det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north()); // Check for parallel segments and do nothing if they are - // In practice this will probably only happen when a way has + // In practice this will probably only happen when a way has // been duplicated @@ -225,5 +225,5 @@ // if the segment is scaled to length 1 - double q = det(B.north() - C.north(), B.east() - C.east(), + double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u; EastNorth intersection = new EastNorth( @@ -239,5 +239,5 @@ cmds.add(new MoveCommand(n, dx, dy)); } - } + } } Index: trunk/src/org/openstreetmap/josm/actions/PasteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 1169) @@ -29,82 +29,82 @@ public PasteAction() { - super(tr("Paste"), "paste", tr("Paste contents of paste buffer."), - Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true); - setEnabled(false); + super(tr("Paste"), "paste", tr("Paste contents of paste buffer."), + Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true); + setEnabled(false); } - public void actionPerformed(ActionEvent e) { - DataSet pasteBuffer = Main.pasteBuffer; + public void actionPerformed(ActionEvent e) { + DataSet pasteBuffer = Main.pasteBuffer; - /* Find the middle of the pasteBuffer area */ - double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100; - for (Node n : pasteBuffer.nodes) { - double east = n.eastNorth.east(); - double north = n.eastNorth.north(); - if (east > maxEast) { maxEast = east; } - if (east < minEast) { minEast = east; } - if (north > maxNorth) { maxNorth = north; } - if (north < minNorth) { minNorth = north; } - } + /* Find the middle of the pasteBuffer area */ + double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100; + for (Node n : pasteBuffer.nodes) { + double east = n.eastNorth.east(); + double north = n.eastNorth.north(); + if (east > maxEast) { maxEast = east; } + if (east < minEast) { minEast = east; } + if (north > maxNorth) { maxNorth = north; } + if (north < minNorth) { minNorth = north; } + } - EastNorth mPosition; - if((e.getModifiers() & ActionEvent.CTRL_MASK) ==0){ - mPosition = Main.map.mapView.getCenter(); - } else { - mPosition = Main.map.mapView.getEastNorth(Main.map.mapView.lastMEvent.getX(), Main.map.mapView.lastMEvent.getY()); - } + EastNorth mPosition; + if((e.getModifiers() & ActionEvent.CTRL_MASK) ==0){ + mPosition = Main.map.mapView.getCenter(); + } else { + mPosition = Main.map.mapView.getEastNorth(Main.map.mapView.lastMEvent.getX(), Main.map.mapView.lastMEvent.getY()); + } - double offsetEast = mPosition.east() - (maxEast + minEast)/2.0; - double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0; + double offsetEast = mPosition.east() - (maxEast + minEast)/2.0; + double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0; - HashMap map = new HashMap(); - /* temporarily maps old nodes to new so we can do a true deep copy */ + HashMap map = new HashMap(); + /* temporarily maps old nodes to new so we can do a true deep copy */ - /* do the deep copy of the paste buffer contents, leaving the pasteBuffer unchanged */ - for (Node n : pasteBuffer.nodes) { - Node nnew = new Node(n); - nnew.id = 0; - /* adjust the coordinates to the middle of the visible map area */ - nnew.eastNorth = new EastNorth(nnew.eastNorth.east() + offsetEast, nnew.eastNorth.north() + offsetNorth); - nnew.coor = Main.proj.eastNorth2latlon(nnew.eastNorth); - map.put(n, nnew); - } - for (Way w : pasteBuffer.ways) { - Way wnew = new Way(); - wnew.cloneFrom(w); - wnew.id = 0; - /* make sure we reference the new nodes corresponding to the old ones */ - List nodes = new ArrayList(); - for (Node n : w.nodes) { - nodes.add((Node)map.get(n)); - } - wnew.nodes.clear(); - wnew.nodes.addAll(nodes); - map.put(w, wnew); - } - for (Relation r : pasteBuffer.relations) { - Relation rnew = new Relation(r); - rnew.id = 0; - List members = new ArrayList(); - for (RelationMember m : r.members) { - RelationMember mnew = new RelationMember(m); - mnew.member = map.get(m.member); - members.add(mnew); - } - rnew.members.clear(); - rnew.members.addAll(members); - map.put(r, rnew); - } + /* do the deep copy of the paste buffer contents, leaving the pasteBuffer unchanged */ + for (Node n : pasteBuffer.nodes) { + Node nnew = new Node(n); + nnew.id = 0; + /* adjust the coordinates to the middle of the visible map area */ + nnew.eastNorth = new EastNorth(nnew.eastNorth.east() + offsetEast, nnew.eastNorth.north() + offsetNorth); + nnew.coor = Main.proj.eastNorth2latlon(nnew.eastNorth); + map.put(n, nnew); + } + for (Way w : pasteBuffer.ways) { + Way wnew = new Way(); + wnew.cloneFrom(w); + wnew.id = 0; + /* make sure we reference the new nodes corresponding to the old ones */ + List nodes = new ArrayList(); + for (Node n : w.nodes) { + nodes.add((Node)map.get(n)); + } + wnew.nodes.clear(); + wnew.nodes.addAll(nodes); + map.put(w, wnew); + } + for (Relation r : pasteBuffer.relations) { + Relation rnew = new Relation(r); + rnew.id = 0; + List members = new ArrayList(); + for (RelationMember m : r.members) { + RelationMember mnew = new RelationMember(m); + mnew.member = map.get(m.member); + members.add(mnew); + } + rnew.members.clear(); + rnew.members.addAll(members); + map.put(r, rnew); + } - /* Now execute the commands to add the dupicated contents of the paste buffer to the map */ - Collection osms = map.values(); - Collection clist = new LinkedList(); - for (OsmPrimitive osm : osms) { - clist.add(new AddCommand(osm)); - } + /* Now execute the commands to add the dupicated contents of the paste buffer to the map */ + Collection osms = map.values(); + Collection clist = new LinkedList(); + for (OsmPrimitive osm : osms) { + clist.add(new AddCommand(osm)); + } - Main.main.undoRedo.add(new SequenceCommand(tr("Paste"), clist)); - Main.ds.setSelected(osms); - Main.map.mapView.repaint(); + Main.main.undoRedo.add(new SequenceCommand(tr("Paste"), clist)); + Main.ds.setSelected(osms); + Main.map.mapView.repaint(); } } Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 1169) @@ -24,85 +24,85 @@ public final class PasteTagsAction extends JosmAction implements SelectionChangedListener { - public PasteTagsAction(JosmAction copyAction) { - super(tr("Paste Tags"), "pastetags", - tr("Apply tags of contents of paste buffer to all selected items."), - Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true); - DataSet.selListeners.add(this); - copyAction.addListener(this); - setEnabled(false); - } + public PasteTagsAction(JosmAction copyAction) { + super(tr("Paste Tags"), "pastetags", + tr("Apply tags of contents of paste buffer to all selected items."), + Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true); + DataSet.selListeners.add(this); + copyAction.addListener(this); + setEnabled(false); + } - private void pasteKeys(Collection clist, Collection pasteBufferSubset, Collection selectionSubset) { - /* scan the paste buffer, and add tags to each of the selected objects. - * If a tag already exists, it is overwritten */ - if (selectionSubset != null && ! selectionSubset.isEmpty()) { - for (Iterator it = pasteBufferSubset.iterator(); it.hasNext();) { - OsmPrimitive osm = it.next(); - Map m = osm.keys; - if(m != null) - { - for (String key : m.keySet()) { - if (! key.equals("created_by")) - clist.add(new ChangePropertyCommand(selectionSubset, key, osm.keys.get(key))); - } - } - } - } - } + private void pasteKeys(Collection clist, Collection pasteBufferSubset, Collection selectionSubset) { + /* scan the paste buffer, and add tags to each of the selected objects. + * If a tag already exists, it is overwritten */ + if (selectionSubset != null && ! selectionSubset.isEmpty()) { + for (Iterator it = pasteBufferSubset.iterator(); it.hasNext();) { + OsmPrimitive osm = it.next(); + Map m = osm.keys; + if(m != null) + { + for (String key : m.keySet()) { + if (! key.equals("created_by")) + clist.add(new ChangePropertyCommand(selectionSubset, key, osm.keys.get(key))); + } + } + } + } + } - public void actionPerformed(ActionEvent e) { - Collection clist = new LinkedList(); - pasteKeys(clist, Main.pasteBuffer.nodes, Main.ds.getSelectedNodes()); - pasteKeys(clist, Main.pasteBuffer.ways, Main.ds.getSelectedWays()); - pasteKeys(clist, Main.pasteBuffer.relations, Main.ds.getSelectedRelations()); - Main.main.undoRedo.add(new SequenceCommand(tr("Paste Tags"), clist)); - Main.ds.setSelected(Main.ds.getSelected()); // to force selection listeners, in particular the tag panel, to update - Main.map.mapView.repaint(); - } + public void actionPerformed(ActionEvent e) { + Collection clist = new LinkedList(); + pasteKeys(clist, Main.pasteBuffer.nodes, Main.ds.getSelectedNodes()); + pasteKeys(clist, Main.pasteBuffer.ways, Main.ds.getSelectedWays()); + pasteKeys(clist, Main.pasteBuffer.relations, Main.ds.getSelectedRelations()); + Main.main.undoRedo.add(new SequenceCommand(tr("Paste Tags"), clist)); + Main.ds.setSelected(Main.ds.getSelected()); // to force selection listeners, in particular the tag panel, to update + Main.map.mapView.repaint(); + } - private boolean containsSameKeysWithDifferentValues(Collection osms) { - Map kvSeen = new HashMap(); - for (Iterator it = osms.iterator(); it.hasNext();) { - OsmPrimitive osm = it.next(); - if (osm.keys == null || osm.keys.isEmpty()) - continue; - for (String key : osm.keys.keySet()) { - if (key.equals("created_by")) // we ignore created_by - continue; - String value = osm.keys.get(key); - if (! kvSeen.containsKey(key)) - kvSeen.put(key, value); - else if (! kvSeen.get(key).equals(value)) - return true; - } - } - return false; - } + private boolean containsSameKeysWithDifferentValues(Collection osms) { + Map kvSeen = new HashMap(); + for (Iterator it = osms.iterator(); it.hasNext();) { + OsmPrimitive osm = it.next(); + if (osm.keys == null || osm.keys.isEmpty()) + continue; + for (String key : osm.keys.keySet()) { + if (key.equals("created_by")) // we ignore created_by + continue; + String value = osm.keys.get(key); + if (! kvSeen.containsKey(key)) + kvSeen.put(key, value); + else if (! kvSeen.get(key).equals(value)) + return true; + } + } + return false; + } - /** - * Determines whether to enable the widget depending on the contents of the paste - * buffer and current selection - * @param pasteBuffer - */ - private void possiblyEnable(Collection selection, DataSet pasteBuffer) { - /* only enable if there is something selected to paste into and - if we don't have conflicting keys in the pastebuffer */ - setEnabled(selection != null && - ! selection.isEmpty() && - ! pasteBuffer.allPrimitives().isEmpty() && - (Main.ds.getSelectedNodes().isEmpty() || - ! containsSameKeysWithDifferentValues(pasteBuffer.nodes)) && - (Main.ds.getSelectedWays().isEmpty() || - ! containsSameKeysWithDifferentValues(pasteBuffer.ways)) && - (Main.ds.getSelectedRelations().isEmpty() || - ! containsSameKeysWithDifferentValues(pasteBuffer.relations))); - } + /** + * Determines whether to enable the widget depending on the contents of the paste + * buffer and current selection + * @param pasteBuffer + */ + private void possiblyEnable(Collection selection, DataSet pasteBuffer) { + /* only enable if there is something selected to paste into and + if we don't have conflicting keys in the pastebuffer */ + setEnabled(selection != null && + ! selection.isEmpty() && + ! pasteBuffer.allPrimitives().isEmpty() && + (Main.ds.getSelectedNodes().isEmpty() || + ! containsSameKeysWithDifferentValues(pasteBuffer.nodes)) && + (Main.ds.getSelectedWays().isEmpty() || + ! containsSameKeysWithDifferentValues(pasteBuffer.ways)) && + (Main.ds.getSelectedRelations().isEmpty() || + ! containsSameKeysWithDifferentValues(pasteBuffer.relations))); + } - @Override public void pasteBufferChanged(DataSet newPasteBuffer) { - possiblyEnable(Main.ds.getSelected(), newPasteBuffer); - } + @Override public void pasteBufferChanged(DataSet newPasteBuffer) { + possiblyEnable(Main.ds.getSelected(), newPasteBuffer); + } - public void selectionChanged(Collection newSelection) { - possiblyEnable(newSelection, Main.pasteBuffer); - } + public void selectionChanged(Collection newSelection) { + possiblyEnable(newSelection, Main.pasteBuffer); + } } Index: trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 1169) @@ -25,53 +25,53 @@ public class PreferencesAction extends JosmAction { - /** - * Create the preference action with "&Preferences" as label. - */ - public PreferencesAction() { - super(tr("Preferences ..."), "preference", tr("Open a preferences page for global settings."), - Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.GROUP_DIRECT), true); - } + /** + * Create the preference action with "&Preferences" as label. + */ + public PreferencesAction() { + super(tr("Preferences ..."), "preference", tr("Open a preferences page for global settings."), + Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.GROUP_DIRECT), true); + } - /** - * Launch the preferences dialog. - */ - public void actionPerformed(ActionEvent e) { - PreferenceDialog prefDlg = new PreferenceDialog(); - prefDlg.setMinimumSize(new Dimension(400,300)); - JPanel prefPanel = new JPanel(new GridBagLayout()); - prefPanel.add(prefDlg, GBC.eol().fill(GBC.BOTH)); + /** + * Launch the preferences dialog. + */ + public void actionPerformed(ActionEvent e) { + PreferenceDialog prefDlg = new PreferenceDialog(); + prefDlg.setMinimumSize(new Dimension(400,300)); + JPanel prefPanel = new JPanel(new GridBagLayout()); + prefPanel.add(prefDlg, GBC.eol().fill(GBC.BOTH)); - JOptionPane pane = new JOptionPane(prefPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); - JDialog dlg = pane.createDialog(Main.parent, tr("Preferences")); - dlg.setResizable(true); - dlg.setMinimumSize(new Dimension(500,400)); + JOptionPane pane = new JOptionPane(prefPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); + JDialog dlg = pane.createDialog(Main.parent, tr("Preferences")); + dlg.setResizable(true); + dlg.setMinimumSize(new Dimension(500,400)); -// if (dlg.getWidth() > 600) -// dlg.setSize(600, dlg.getHeight()); -// if (dlg.getHeight() > 600) -// dlg.setSize(dlg.getWidth(),600); +// if (dlg.getWidth() > 600) +// dlg.setSize(600, dlg.getHeight()); +// if (dlg.getHeight() > 600) +// dlg.setSize(dlg.getWidth(),600); - int JOSMWidth = Main.parent.getWidth(); - int JOSMHeight = Main.parent.getHeight(); + int JOSMWidth = Main.parent.getWidth(); + int JOSMHeight = Main.parent.getHeight(); - if (JOSMWidth > 2000 && JOSMWidth > JOSMHeight * 2) - // don't center on horizontal span monitor configurations (yes, can be selfish sometimes) - JOSMWidth /= 2; + if (JOSMWidth > 2000 && JOSMWidth > JOSMHeight * 2) + // don't center on horizontal span monitor configurations (yes, can be selfish sometimes) + JOSMWidth /= 2; - int targetWidth = JOSMWidth / 2; - if (targetWidth < 600) targetWidth = 600; - if (targetWidth > 1200) targetWidth = 1200; - int targetHeight = (JOSMHeight * 3) / 4; - if (targetHeight < 600) targetHeight = 600; - if (targetHeight > 1200) targetHeight = 1200; + int targetWidth = JOSMWidth / 2; + if (targetWidth < 600) targetWidth = 600; + if (targetWidth > 1200) targetWidth = 1200; + int targetHeight = (JOSMHeight * 3) / 4; + if (targetHeight < 600) targetHeight = 600; + if (targetHeight > 1200) targetHeight = 1200; - int targetX = Main.parent.getX() + JOSMWidth / 2 - targetWidth / 2; - int targetY = Main.parent.getY() + JOSMHeight / 2 - targetHeight / 2; + int targetX = Main.parent.getX() + JOSMWidth / 2 - targetWidth / 2; + int targetY = Main.parent.getY() + JOSMHeight / 2 - targetHeight / 2; - dlg.setBounds(targetX, targetY, targetWidth, targetHeight); + dlg.setBounds(targetX, targetY, targetWidth, targetHeight); - dlg.setVisible(true); - if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION) - prefDlg.ok(); - } + dlg.setVisible(true); + if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION) + prefDlg.ok(); + } } Index: trunk/src/org/openstreetmap/josm/actions/RedoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/RedoAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/RedoAction.java (revision 1169) @@ -17,18 +17,18 @@ public class RedoAction extends JosmAction { - /** - * Construct the action with "Redo" as label. - */ - public RedoAction() { - super(tr("Redo"), "redo", tr("Redo the last undone action."), - Shortcut.registerShortcut("system:redo", tr("Edit: {0}", tr("Redo")), KeyEvent.VK_Y, Shortcut.GROUP_MENU), true); - setEnabled(false); - } + /** + * Construct the action with "Redo" as label. + */ + public RedoAction() { + super(tr("Redo"), "redo", tr("Redo the last undone action."), + Shortcut.registerShortcut("system:redo", tr("Edit: {0}", tr("Redo")), KeyEvent.VK_Y, Shortcut.GROUP_MENU), true); + setEnabled(false); + } - public void actionPerformed(ActionEvent e) { - if (Main.map == null) - return; - Main.map.repaint(); - Main.main.undoRedo.redo(); - } + public void actionPerformed(ActionEvent e) { + if (Main.map == null) + return; + Main.map.repaint(); + Main.main.undoRedo.redo(); + } } Index: trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 1169) @@ -21,75 +21,75 @@ * Action to rename an specific layer. Provides the option to rename the * file, this layer was loaded from as well (if it was loaded from a file). - * + * * @author Imi */ public class RenameLayerAction extends AbstractAction { - private File file; - private Layer layer; + private File file; + private Layer layer; - /** - * @param file The file of the original location of this layer. - * If null, no possibility to "rename the file as well" is provided. - */ - public RenameLayerAction(File file, Layer layer) { - super(tr("Rename layer"), ImageProvider.get("dialogs", "edit")); - this.file = file; - this.layer = layer; - this.putValue("help", "Action/LayerRename"); - } + /** + * @param file The file of the original location of this layer. + * If null, no possibility to "rename the file as well" is provided. + */ + public RenameLayerAction(File file, Layer layer) { + super(tr("Rename layer"), ImageProvider.get("dialogs", "edit")); + this.file = file; + this.layer = layer; + this.putValue("help", "Action/LayerRename"); + } - public void actionPerformed(ActionEvent e) { - Box panel = Box.createVerticalBox(); - final JTextField name = new JTextField(layer.name); - panel.add(name); - JCheckBox filerename = new JCheckBox(tr("Also rename the file")); - if (Main.applet) { - filerename.setEnabled(false); - filerename.setSelected(false); - } else { - panel.add(filerename); - filerename.setEnabled(file != null); - } - if (filerename.isEnabled()) - filerename.setSelected(Main.pref.getBoolean("layer.rename-file", true)); + public void actionPerformed(ActionEvent e) { + Box panel = Box.createVerticalBox(); + final JTextField name = new JTextField(layer.name); + panel.add(name); + JCheckBox filerename = new JCheckBox(tr("Also rename the file")); + if (Main.applet) { + filerename.setEnabled(false); + filerename.setSelected(false); + } else { + panel.add(filerename); + filerename.setEnabled(file != null); + } + if (filerename.isEnabled()) + filerename.setSelected(Main.pref.getBoolean("layer.rename-file", true)); - final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ - @Override public void selectInitialValue() { - name.requestFocusInWindow(); - name.selectAll(); - } - }; - final JDialog dlg = optionPane.createDialog(Main.parent, tr("Rename layer")); - dlg.setVisible(true); + final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ + @Override public void selectInitialValue() { + name.requestFocusInWindow(); + name.selectAll(); + } + }; + final JDialog dlg = optionPane.createDialog(Main.parent, tr("Rename layer")); + dlg.setVisible(true); - Object answer = optionPane.getValue(); - if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE || - (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) { - return; - } + Object answer = optionPane.getValue(); + if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE || + (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) { + return; + } - String nameText = name.getText(); - if (filerename.isEnabled()) { - Main.pref.put("layer.rename-file", filerename.isSelected()); - if (filerename.isSelected()) { - String newname = nameText; - if (newname.indexOf("/") == -1 && newname.indexOf("\\") == -1) - newname = file.getParent() + File.separator + newname; - String oldname = file.getName(); - if (name.getText().indexOf('.') == -1 && oldname.indexOf('.') >= 0) - newname += oldname.substring(oldname.lastIndexOf('.')); - File newFile = new File(newname); - if (file.renameTo(newFile)) { - layer.associatedFile = newFile; - nameText = newFile.getName(); - } else { - JOptionPane.showMessageDialog(Main.parent, tr("Could not rename the file \"{0}\".", file.getPath())); - return; - } - } - } - layer.name = nameText; - Main.parent.repaint(); - } + String nameText = name.getText(); + if (filerename.isEnabled()) { + Main.pref.put("layer.rename-file", filerename.isSelected()); + if (filerename.isSelected()) { + String newname = nameText; + if (newname.indexOf("/") == -1 && newname.indexOf("\\") == -1) + newname = file.getParent() + File.separator + newname; + String oldname = file.getName(); + if (name.getText().indexOf('.') == -1 && oldname.indexOf('.') >= 0) + newname += oldname.substring(oldname.lastIndexOf('.')); + File newFile = new File(newname); + if (file.renameTo(newFile)) { + layer.associatedFile = newFile; + nameText = newFile.getName(); + } else { + JOptionPane.showMessageDialog(Main.parent, tr("Could not rename the file \"{0}\".", file.getPath())); + return; + } + } + } + layer.name = nameText; + Main.parent.repaint(); + } } Index: trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 1169) @@ -28,59 +28,59 @@ public final class ReverseWayAction extends JosmAction { - public ReverseWayAction() { - super(tr("Reverse ways"), "wayflip", tr("Reverse the direction of all selected ways."), - Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse ways")), KeyEvent.VK_R, Shortcut.GROUP_EDIT), true); - } + public ReverseWayAction() { + super(tr("Reverse ways"), "wayflip", tr("Reverse the direction of all selected ways."), + Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse ways")), KeyEvent.VK_R, Shortcut.GROUP_EDIT), true); + } - public void actionPerformed(ActionEvent e) { - final Collection sel = new LinkedList(); - new Visitor() { - public void visit(Node n) { - } + public void actionPerformed(ActionEvent e) { + final Collection sel = new LinkedList(); + new Visitor() { + public void visit(Node n) { + } - public void visit(Way w) { - sel.add(w); - } + public void visit(Way w) { + sel.add(w); + } - public void visit(Relation e) { - } + public void visit(Relation e) { + } - public void visitAll() { - for (OsmPrimitive osm : Main.ds.getSelected()) - osm.visit(this); - } - }.visitAll(); + public void visitAll() { + for (OsmPrimitive osm : Main.ds.getSelected()) + osm.visit(this); + } + }.visitAll(); - if (sel.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, - tr("Please select at least one way.")); - return; - } + if (sel.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + tr("Please select at least one way.")); + return; + } - boolean propertiesUpdated = false; - ReverseWayTagCorrector reverseWayTagCorrector = new ReverseWayTagCorrector(); - Collection c = new LinkedList(); - for (Way w : sel) { - Way wnew = new Way(w); - Collections.reverse(wnew.nodes); - if (Main.pref.getBoolean("tag-correction.reverse-way", true)) { - try - { - final Collection changePropertyCommands = reverseWayTagCorrector.execute(wnew); - propertiesUpdated = propertiesUpdated - || (changePropertyCommands != null && !changePropertyCommands.isEmpty()); - c.addAll(changePropertyCommands); - } - catch(UserCancelException ex) - { - return; - } - } - c.add(new ChangeCommand(w, wnew)); - } - Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c)); - if (propertiesUpdated) - DataSet.fireSelectionChanged(Main.ds.getSelected()); - Main.map.repaint(); - } + boolean propertiesUpdated = false; + ReverseWayTagCorrector reverseWayTagCorrector = new ReverseWayTagCorrector(); + Collection c = new LinkedList(); + for (Way w : sel) { + Way wnew = new Way(w); + Collections.reverse(wnew.nodes); + if (Main.pref.getBoolean("tag-correction.reverse-way", true)) { + try + { + final Collection changePropertyCommands = reverseWayTagCorrector.execute(wnew); + propertiesUpdated = propertiesUpdated + || (changePropertyCommands != null && !changePropertyCommands.isEmpty()); + c.addAll(changePropertyCommands); + } + catch(UserCancelException ex) + { + return; + } + } + c.add(new ChangeCommand(w, wnew)); + } + Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c)); + if (propertiesUpdated) + DataSet.fireSelectionChanged(Main.ds.getSelected()); + Main.map.repaint(); + } } Index: trunk/src/org/openstreetmap/josm/actions/SaveAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 1169) @@ -19,27 +19,27 @@ public class SaveAction extends SaveActionBase { - /** - * Construct the action with "Save" as label. - * @param layer Save this layer. - */ - public SaveAction(Layer layer) { - super(tr("Save"), "save", tr("Save the current data."), - Shortcut.registerShortcut("system:save", tr("File: {0}", tr("Save")), KeyEvent.VK_S, Shortcut.GROUP_MENU), layer); - } + /** + * Construct the action with "Save" as label. + * @param layer Save this layer. + */ + public SaveAction(Layer layer) { + super(tr("Save"), "save", tr("Save the current data."), + Shortcut.registerShortcut("system:save", tr("File: {0}", tr("Save")), KeyEvent.VK_S, Shortcut.GROUP_MENU), layer); + } - @Override public File getFile(Layer layer) { - if (layer instanceof OsmDataLayer) { - File f = ((OsmDataLayer)layer).associatedFile; - if (f != null) { - return f; - } - } - if (layer instanceof GpxLayer) { - File f = ((GpxLayer)layer).data.storageFile; - if (f != null) { - return f; - } - } - return openFileDialog(layer); - } + @Override public File getFile(Layer layer) { + if (layer instanceof OsmDataLayer) { + File f = ((OsmDataLayer)layer).associatedFile; + if (f != null) { + return f; + } + } + if (layer instanceof GpxLayer) { + File f = ((GpxLayer)layer).data.storageFile; + if (f != null) { + return f; + } + } + return openFileDialog(layer); + } } Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 1169) @@ -26,211 +26,211 @@ public abstract class SaveActionBase extends DiskAccessAction { - private Layer layer; - - public SaveActionBase(String name, String iconName, String tooltip, Shortcut shortcut, Layer layer) { - super(name, iconName, tooltip, shortcut); - this.layer = layer; - } - - @Deprecated - public SaveActionBase(String name, String iconName, String tooltip, int shortcut, int modifiers, Layer layer) { - super(name, iconName, tooltip, shortcut, modifiers); - this.layer = layer; - } - - public void actionPerformed(ActionEvent e) { - Layer layer = this.layer; - if (layer == null && Main.map != null && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer - || Main.map.mapView.getActiveLayer() instanceof GpxLayer)) - layer = Main.map.mapView.getActiveLayer(); - if (layer == null) - layer = Main.main.editLayer(); - - if (!checkSaveConditions(layer)) - return; - - - File file = getFile(layer); - if (file == null) - return; - - save(file, layer); - - layer.name = file.getName(); - layer.associatedFile = file; - Main.parent.repaint(); - } - - protected abstract File getFile(Layer layer); - - /** - * Checks whether it is ok to launch a save (whether we have data, - * there is no conflict etc.) - * @return true, if it is safe to save. - */ - public boolean checkSaveConditions(Layer layer) { - if (layer == null) { - JOptionPane.showMessageDialog(Main.parent, tr("Internal Error: cannot check conditions for no layer. Please report this as a bug.")); - return false; - } - if (Main.map == null) { - JOptionPane.showMessageDialog(Main.parent, tr("No document open so nothing to save.")); - return false; - } - - if (layer instanceof OsmDataLayer && isDataSetEmpty((OsmDataLayer)layer) && JOptionPane.NO_OPTION == JOptionPane.showConfirmDialog(Main.parent,tr("The document contains no data. Save anyway?"), tr("Empty document"), JOptionPane.YES_NO_OPTION)) { - return false; - } - if (layer instanceof GpxLayer && ((GpxLayer)layer).data == null) { - return false; - } - if (!Main.map.conflictDialog.conflicts.isEmpty()) { - int answer = JOptionPane.showConfirmDialog(Main.parent, - tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"),tr("Conflicts"), JOptionPane.YES_NO_OPTION); - if (answer != JOptionPane.YES_OPTION) - return false; - } - return true; - } - - public static File openFileDialog(Layer layer) { - JFileChooser fc = createAndOpenFileChooser(false, false, layer instanceof GpxLayer ? tr("Save GPX file") : tr("Save OSM file")); - if (fc == null) - return null; - - File file = fc.getSelectedFile(); - - String fn = file.getPath(); - if (fn.indexOf('.') == -1) { - FileFilter ff = fc.getFileFilter(); - if (ff instanceof ExtensionFileFilter) - fn += "." + ((ExtensionFileFilter)ff).defaultExtension; - else if (layer instanceof GpxLayer) - fn += ".gpx"; - else - fn += ".osm"; - file = new File(fn); - } - return file; - } - - private static void copy(File src, File dst) throws IOException { - FileInputStream srcStream; - FileOutputStream dstStream; - try { - srcStream = new FileInputStream(src); - dstStream = new FileOutputStream(dst); - } catch (FileNotFoundException e) { - JOptionPane.showMessageDialog(Main.parent, tr("Could not back up file.")+"\n"+e.getMessage()); - return; - } - byte buf[] = new byte[1<<16]; - int len; - while ((len = srcStream.read(buf)) != -1) { - dstStream.write(buf, 0, len); - } - srcStream.close(); - dstStream.close(); - } - - public static void save(File file, Layer layer) { - if (layer instanceof GpxLayer) { - save(file, (GpxLayer)layer); - ((GpxLayer)layer).data.storageFile = file; - } else if (layer instanceof OsmDataLayer) { - save(file, (OsmDataLayer)layer); - } - } - - public static void save(File file, OsmDataLayer layer) { - File tmpFile = null; - try { - if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(file.getPath())) { - GpxExportAction.exportGpx(file, layer); - } else if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(file.getPath())) { - // use a tmp file because if something errors out in the - // process of writing the file, we might just end up with - // a truncated file. That can destroy lots of work. - if (file.exists()) { - tmpFile = new File(file.getPath() + "~"); - copy(file, tmpFile); - } - OsmWriter.output(new FileOutputStream(file), new OsmWriter.All(layer.data, false)); - if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) - tmpFile.delete(); - } else { - JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); - return; - } - layer.cleanData(null, false); - } catch (IOException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage()); - - try { - // if the file save failed, then the tempfile will not - // be deleted. So, restore the backup if we made one. - if (tmpFile != null && tmpFile.exists()) { - copy(tmpFile, file); - } - } catch (IOException e2) { - e2.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while restoring backup file.")+"\n"+e2.getMessage()); - } - } - } - - public static void save(File file, GpxLayer layer) { - File tmpFile = null; - try { - if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(file.getPath())) { - - // use a tmp file because if something errors out in the - // process of writing the file, we might just end up with - // a truncated file. That can destroy lots of work. - if (file.exists()) { - tmpFile = new File(file.getPath() + "~"); - copy(file, tmpFile); - } - FileOutputStream fo = new FileOutputStream(file); - new GpxWriter(fo).write(layer.data); - fo.flush(); - fo.close(); - - if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) { - tmpFile.delete(); - } - } else { - JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); - return; - } - } catch (IOException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage()); - } - try { - // if the file save failed, then the tempfile will not - // be deleted. So, restore the backup if we made one. - if (tmpFile != null && tmpFile.exists()) { - copy(tmpFile, file); - } - } catch (IOException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while restoring backup file.")+"\n"+e.getMessage()); - } - } - - /** - * Check the data set if it would be empty on save. It is empty, if it contains - * no objects (after all objects that are created and deleted without being - * transfered to the server have been removed). - * - * @return true, if a save result in an empty data set. - */ - private boolean isDataSetEmpty(OsmDataLayer layer) { - for (OsmPrimitive osm : layer.data.allNonDeletedPrimitives()) - if (!osm.deleted || osm.id > 0) - return false; - return true; - } + private Layer layer; + + public SaveActionBase(String name, String iconName, String tooltip, Shortcut shortcut, Layer layer) { + super(name, iconName, tooltip, shortcut); + this.layer = layer; + } + + @Deprecated + public SaveActionBase(String name, String iconName, String tooltip, int shortcut, int modifiers, Layer layer) { + super(name, iconName, tooltip, shortcut, modifiers); + this.layer = layer; + } + + public void actionPerformed(ActionEvent e) { + Layer layer = this.layer; + if (layer == null && Main.map != null && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer + || Main.map.mapView.getActiveLayer() instanceof GpxLayer)) + layer = Main.map.mapView.getActiveLayer(); + if (layer == null) + layer = Main.main.editLayer(); + + if (!checkSaveConditions(layer)) + return; + + + File file = getFile(layer); + if (file == null) + return; + + save(file, layer); + + layer.name = file.getName(); + layer.associatedFile = file; + Main.parent.repaint(); + } + + protected abstract File getFile(Layer layer); + + /** + * Checks whether it is ok to launch a save (whether we have data, + * there is no conflict etc.) + * @return true, if it is safe to save. + */ + public boolean checkSaveConditions(Layer layer) { + if (layer == null) { + JOptionPane.showMessageDialog(Main.parent, tr("Internal Error: cannot check conditions for no layer. Please report this as a bug.")); + return false; + } + if (Main.map == null) { + JOptionPane.showMessageDialog(Main.parent, tr("No document open so nothing to save.")); + return false; + } + + if (layer instanceof OsmDataLayer && isDataSetEmpty((OsmDataLayer)layer) && JOptionPane.NO_OPTION == JOptionPane.showConfirmDialog(Main.parent,tr("The document contains no data. Save anyway?"), tr("Empty document"), JOptionPane.YES_NO_OPTION)) { + return false; + } + if (layer instanceof GpxLayer && ((GpxLayer)layer).data == null) { + return false; + } + if (!Main.map.conflictDialog.conflicts.isEmpty()) { + int answer = JOptionPane.showConfirmDialog(Main.parent, + tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"),tr("Conflicts"), JOptionPane.YES_NO_OPTION); + if (answer != JOptionPane.YES_OPTION) + return false; + } + return true; + } + + public static File openFileDialog(Layer layer) { + JFileChooser fc = createAndOpenFileChooser(false, false, layer instanceof GpxLayer ? tr("Save GPX file") : tr("Save OSM file")); + if (fc == null) + return null; + + File file = fc.getSelectedFile(); + + String fn = file.getPath(); + if (fn.indexOf('.') == -1) { + FileFilter ff = fc.getFileFilter(); + if (ff instanceof ExtensionFileFilter) + fn += "." + ((ExtensionFileFilter)ff).defaultExtension; + else if (layer instanceof GpxLayer) + fn += ".gpx"; + else + fn += ".osm"; + file = new File(fn); + } + return file; + } + + private static void copy(File src, File dst) throws IOException { + FileInputStream srcStream; + FileOutputStream dstStream; + try { + srcStream = new FileInputStream(src); + dstStream = new FileOutputStream(dst); + } catch (FileNotFoundException e) { + JOptionPane.showMessageDialog(Main.parent, tr("Could not back up file.")+"\n"+e.getMessage()); + return; + } + byte buf[] = new byte[1<<16]; + int len; + while ((len = srcStream.read(buf)) != -1) { + dstStream.write(buf, 0, len); + } + srcStream.close(); + dstStream.close(); + } + + public static void save(File file, Layer layer) { + if (layer instanceof GpxLayer) { + save(file, (GpxLayer)layer); + ((GpxLayer)layer).data.storageFile = file; + } else if (layer instanceof OsmDataLayer) { + save(file, (OsmDataLayer)layer); + } + } + + public static void save(File file, OsmDataLayer layer) { + File tmpFile = null; + try { + if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(file.getPath())) { + GpxExportAction.exportGpx(file, layer); + } else if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(file.getPath())) { + // use a tmp file because if something errors out in the + // process of writing the file, we might just end up with + // a truncated file. That can destroy lots of work. + if (file.exists()) { + tmpFile = new File(file.getPath() + "~"); + copy(file, tmpFile); + } + OsmWriter.output(new FileOutputStream(file), new OsmWriter.All(layer.data, false)); + if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) + tmpFile.delete(); + } else { + JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); + return; + } + layer.cleanData(null, false); + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage()); + + try { + // if the file save failed, then the tempfile will not + // be deleted. So, restore the backup if we made one. + if (tmpFile != null && tmpFile.exists()) { + copy(tmpFile, file); + } + } catch (IOException e2) { + e2.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while restoring backup file.")+"\n"+e2.getMessage()); + } + } + } + + public static void save(File file, GpxLayer layer) { + File tmpFile = null; + try { + if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(file.getPath())) { + + // use a tmp file because if something errors out in the + // process of writing the file, we might just end up with + // a truncated file. That can destroy lots of work. + if (file.exists()) { + tmpFile = new File(file.getPath() + "~"); + copy(file, tmpFile); + } + FileOutputStream fo = new FileOutputStream(file); + new GpxWriter(fo).write(layer.data); + fo.flush(); + fo.close(); + + if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) { + tmpFile.delete(); + } + } else { + JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); + return; + } + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage()); + } + try { + // if the file save failed, then the tempfile will not + // be deleted. So, restore the backup if we made one. + if (tmpFile != null && tmpFile.exists()) { + copy(tmpFile, file); + } + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while restoring backup file.")+"\n"+e.getMessage()); + } + } + + /** + * Check the data set if it would be empty on save. It is empty, if it contains + * no objects (after all objects that are created and deleted without being + * transfered to the server have been removed). + * + * @return true, if a save result in an empty data set. + */ + private boolean isDataSetEmpty(OsmDataLayer layer) { + for (OsmPrimitive osm : layer.data.allNonDeletedPrimitives()) + if (!osm.deleted || osm.id > 0) + return false; + return true; + } } Index: trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java (revision 1169) @@ -17,15 +17,15 @@ public class SaveAsAction extends SaveActionBase { - /** - * Construct the action with "Save" as label. - * @param layer Save this layer. - */ - public SaveAsAction(Layer layer) { - super(tr("Save as ..."), "save_as", tr("Save the current data to a new file."), - Shortcut.registerShortcut("system:saveas", tr("File: {0}", tr("Save as ...")), KeyEvent.VK_S, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), layer); - } + /** + * Construct the action with "Save" as label. + * @param layer Save this layer. + */ + public SaveAsAction(Layer layer) { + super(tr("Save as ..."), "save_as", tr("Save the current data to a new file."), + Shortcut.registerShortcut("system:saveas", tr("File: {0}", tr("Save as ...")), KeyEvent.VK_S, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), layer); + } - @Override protected File getFile(Layer layer) { - return openFileDialog(layer); - } + @Override protected File getFile(Layer layer) { + return openFileDialog(layer); + } } Index: trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 1169) @@ -12,11 +12,11 @@ public class SelectAllAction extends JosmAction { - public SelectAllAction() { - super(tr("Select All"),"selectall", tr("Select all undeleted objects in the data layer. This selects incomplete objects too."), - Shortcut.registerShortcut("system:selectall", tr("Edit: {0}", tr("Select All")), KeyEvent.VK_A, Shortcut.GROUP_MENU), true); - } + public SelectAllAction() { + super(tr("Select All"),"selectall", tr("Select all undeleted objects in the data layer. This selects incomplete objects too."), + Shortcut.registerShortcut("system:selectall", tr("Edit: {0}", tr("Select All")), KeyEvent.VK_A, Shortcut.GROUP_MENU), true); + } - public void actionPerformed(ActionEvent e) { - Main.ds.setSelected(Main.ds.allNonDeletedPhysicalPrimitives()); - } + public void actionPerformed(ActionEvent e) { + Main.ds.setSelected(Main.ds.allNonDeletedPhysicalPrimitives()); + } } Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 1169) @@ -44,259 +44,259 @@ public class SplitWayAction extends JosmAction implements SelectionChangedListener { - private Way selectedWay; - private List selectedNodes; - - /** - * Create a new SplitWayAction. - */ - public SplitWayAction() { - super(tr("Split Way"), "splitway", tr("Split a way at the selected node."), - Shortcut.registerShortcut("tools:splitway", tr("Tool: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.GROUP_EDIT), true); - DataSet.selListeners.add(this); - } - - /** - * Called when the action is executed. - * - * This method performs an expensive check whether the selection clearly defines one - * of the split actions outlined above, and if yes, calls the splitWay method. - */ - public void actionPerformed(ActionEvent e) { - - Collection selection = Main.ds.getSelected(); - - if (!checkSelection(selection)) { - JOptionPane.showMessageDialog(Main.parent, tr("The current selection cannot be used for splitting.")); - return; - } - - selectedWay = null; - selectedNodes = null; - - Visitor splitVisitor = new Visitor(){ - public void visit(Node n) { - if (selectedNodes == null) - selectedNodes = new LinkedList(); - selectedNodes.add(n); - } - public void visit(Way w) { - selectedWay = w; - } - public void visit(Relation e) { - // enties are not considered - } - }; - - for (OsmPrimitive p : selection) - p.visit(splitVisitor); - - // If only nodes are selected, try to guess which way to split. This works if there - // is exactly one way that all nodes are part of. - if (selectedWay == null && selectedNodes != null) { - HashMap wayOccurenceCounter = new HashMap(); - for (Node n : selectedNodes) { - for (Way w : Main.ds.ways) { - if (w.deleted || w.incomplete) continue; - int last = w.nodes.size()-1; - if(last <= 0) continue; // zero or one node ways - Boolean circular = w.nodes.get(0).equals(w.nodes.get(last)); - int i = 0; - for (Node wn : w.nodes) { - if ((circular || (i > 0 && i < last)) && n.equals(wn)) { - Integer old = wayOccurenceCounter.get(w); - wayOccurenceCounter.put(w, (old == null) ? 1 : old+1); - break; - } - i++; - } - } - } - if (wayOccurenceCounter.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, - trn("The selected node is no inner part of any way.", - "The selected nodes are no inner part of any way.", selectedNodes.size())); - return; - } - - for (Entry entry : wayOccurenceCounter.entrySet()) { - if (entry.getValue().equals(selectedNodes.size())) { - if (selectedWay != null) { - JOptionPane.showMessageDialog(Main.parent, tr("There is more than one way using the node(s) you selected. Please select the way also.")); - return; - } - selectedWay = entry.getKey(); - } - } - - if (selectedWay == null) { - JOptionPane.showMessageDialog(Main.parent, tr("The selected nodes do not share the same way.")); - return; - } - - // If a way and nodes are selected, verify that the nodes are part of the way. - } else if (selectedWay != null && selectedNodes != null) { - - HashSet nds = new HashSet(selectedNodes); - for (Node n : selectedWay.nodes) { - nds.remove(n); - } - if (!nds.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, - trn("The selected way does not contain the selected node.", - "The selected way does not contain all the selected nodes.", selectedNodes.size())); - return; - } - } - - // and then do the work. - splitWay(); - } - - /** - * Checks if the selection consists of something we can work with. - * Checks only if the number and type of items selected looks good; - * does not check whether the selected items are really a valid - * input for splitting (this would be too expensive to be carried - * out from the selectionChanged listener). - */ - private boolean checkSelection(Collection selection) { - boolean way = false; - boolean node = false; - for (OsmPrimitive p : selection) { - if (p instanceof Way && !way) { - way = true; - } else if (p instanceof Node) { - node = true; - } else { - return false; - } - } - return node; - } - - /** - * Split a way into two or more parts, starting at a selected node. - */ - private void splitWay() { - // We take our way's list of nodes and copy them to a way chunk (a - // list of nodes). Whenever we stumble upon a selected node, we start - // a new way chunk. - - Set nodeSet = new HashSet(selectedNodes); - List> wayChunks = new LinkedList>(); - List currentWayChunk = new ArrayList(); - wayChunks.add(currentWayChunk); - - Iterator it = selectedWay.nodes.iterator(); - while (it.hasNext()) { - Node currentNode = it.next(); - boolean atEndOfWay = currentWayChunk.isEmpty() || !it.hasNext(); - currentWayChunk.add(currentNode); - if (nodeSet.contains(currentNode) && !atEndOfWay) { - currentWayChunk = new ArrayList(); - currentWayChunk.add(currentNode); - wayChunks.add(currentWayChunk); - } - } - - // Handle circular ways specially. - // If you split at a circular way at two nodes, you just want to split - // it at these points, not also at the former endpoint. - // So if the last node is the same first node, join the last and the - // first way chunk. - List lastWayChunk = wayChunks.get(wayChunks.size() - 1); - if (wayChunks.size() >= 2 - && wayChunks.get(0).get(0) == lastWayChunk.get(lastWayChunk.size() - 1) - && !nodeSet.contains(wayChunks.get(0).get(0))) { - if (wayChunks.size() == 2) { - JOptionPane.showMessageDialog(Main.parent, tr("You must select two or more nodes to split a circular way.")); - return; - } - lastWayChunk.remove(lastWayChunk.size() - 1); - lastWayChunk.addAll(wayChunks.get(0)); - wayChunks.remove(wayChunks.size() - 1); - wayChunks.set(0, lastWayChunk); - } - - if (wayChunks.size() < 2) { - if(wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size()-1)) - JOptionPane.showMessageDialog(Main.parent, tr("You must select two or more nodes to split a circular way.")); - else - JOptionPane.showMessageDialog(Main.parent, tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)")); - return; - } - //Main.debug("wayChunks.size(): " + wayChunks.size()); - //Main.debug("way id: " + selectedWay.id); - - // build a list of commands, and also a new selection list - Collection commandList = new ArrayList(wayChunks.size()); - Collection newSelection = new ArrayList(wayChunks.size()); - - Iterator> chunkIt = wayChunks.iterator(); - - // First, change the original way - Way changedWay = new Way(selectedWay); - changedWay.nodes.clear(); - changedWay.nodes.addAll(chunkIt.next()); - commandList.add(new ChangeCommand(selectedWay, changedWay)); - newSelection.add(selectedWay); - - Collection newWays = new ArrayList(); - // Second, create new ways - while (chunkIt.hasNext()) { - Way wayToAdd = new Way(); - if (selectedWay.keys != null) { - wayToAdd.keys = new HashMap(selectedWay.keys); - wayToAdd.checkTagged(); + private Way selectedWay; + private List selectedNodes; + + /** + * Create a new SplitWayAction. + */ + public SplitWayAction() { + super(tr("Split Way"), "splitway", tr("Split a way at the selected node."), + Shortcut.registerShortcut("tools:splitway", tr("Tool: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.GROUP_EDIT), true); + DataSet.selListeners.add(this); + } + + /** + * Called when the action is executed. + * + * This method performs an expensive check whether the selection clearly defines one + * of the split actions outlined above, and if yes, calls the splitWay method. + */ + public void actionPerformed(ActionEvent e) { + + Collection selection = Main.ds.getSelected(); + + if (!checkSelection(selection)) { + JOptionPane.showMessageDialog(Main.parent, tr("The current selection cannot be used for splitting.")); + return; + } + + selectedWay = null; + selectedNodes = null; + + Visitor splitVisitor = new Visitor(){ + public void visit(Node n) { + if (selectedNodes == null) + selectedNodes = new LinkedList(); + selectedNodes.add(n); + } + public void visit(Way w) { + selectedWay = w; + } + public void visit(Relation e) { + // enties are not considered + } + }; + + for (OsmPrimitive p : selection) + p.visit(splitVisitor); + + // If only nodes are selected, try to guess which way to split. This works if there + // is exactly one way that all nodes are part of. + if (selectedWay == null && selectedNodes != null) { + HashMap wayOccurenceCounter = new HashMap(); + for (Node n : selectedNodes) { + for (Way w : Main.ds.ways) { + if (w.deleted || w.incomplete) continue; + int last = w.nodes.size()-1; + if(last <= 0) continue; // zero or one node ways + Boolean circular = w.nodes.get(0).equals(w.nodes.get(last)); + int i = 0; + for (Node wn : w.nodes) { + if ((circular || (i > 0 && i < last)) && n.equals(wn)) { + Integer old = wayOccurenceCounter.get(w); + wayOccurenceCounter.put(w, (old == null) ? 1 : old+1); + break; + } + i++; + } + } + } + if (wayOccurenceCounter.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + trn("The selected node is no inner part of any way.", + "The selected nodes are no inner part of any way.", selectedNodes.size())); + return; + } + + for (Entry entry : wayOccurenceCounter.entrySet()) { + if (entry.getValue().equals(selectedNodes.size())) { + if (selectedWay != null) { + JOptionPane.showMessageDialog(Main.parent, tr("There is more than one way using the node(s) you selected. Please select the way also.")); + return; + } + selectedWay = entry.getKey(); + } + } + + if (selectedWay == null) { + JOptionPane.showMessageDialog(Main.parent, tr("The selected nodes do not share the same way.")); + return; + } + + // If a way and nodes are selected, verify that the nodes are part of the way. + } else if (selectedWay != null && selectedNodes != null) { + + HashSet nds = new HashSet(selectedNodes); + for (Node n : selectedWay.nodes) { + nds.remove(n); + } + if (!nds.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + trn("The selected way does not contain the selected node.", + "The selected way does not contain all the selected nodes.", selectedNodes.size())); + return; + } + } + + // and then do the work. + splitWay(); + } + + /** + * Checks if the selection consists of something we can work with. + * Checks only if the number and type of items selected looks good; + * does not check whether the selected items are really a valid + * input for splitting (this would be too expensive to be carried + * out from the selectionChanged listener). + */ + private boolean checkSelection(Collection selection) { + boolean way = false; + boolean node = false; + for (OsmPrimitive p : selection) { + if (p instanceof Way && !way) { + way = true; + } else if (p instanceof Node) { + node = true; + } else { + return false; + } + } + return node; + } + + /** + * Split a way into two or more parts, starting at a selected node. + */ + private void splitWay() { + // We take our way's list of nodes and copy them to a way chunk (a + // list of nodes). Whenever we stumble upon a selected node, we start + // a new way chunk. + + Set nodeSet = new HashSet(selectedNodes); + List> wayChunks = new LinkedList>(); + List currentWayChunk = new ArrayList(); + wayChunks.add(currentWayChunk); + + Iterator it = selectedWay.nodes.iterator(); + while (it.hasNext()) { + Node currentNode = it.next(); + boolean atEndOfWay = currentWayChunk.isEmpty() || !it.hasNext(); + currentWayChunk.add(currentNode); + if (nodeSet.contains(currentNode) && !atEndOfWay) { + currentWayChunk = new ArrayList(); + currentWayChunk.add(currentNode); + wayChunks.add(currentWayChunk); + } + } + + // Handle circular ways specially. + // If you split at a circular way at two nodes, you just want to split + // it at these points, not also at the former endpoint. + // So if the last node is the same first node, join the last and the + // first way chunk. + List lastWayChunk = wayChunks.get(wayChunks.size() - 1); + if (wayChunks.size() >= 2 + && wayChunks.get(0).get(0) == lastWayChunk.get(lastWayChunk.size() - 1) + && !nodeSet.contains(wayChunks.get(0).get(0))) { + if (wayChunks.size() == 2) { + JOptionPane.showMessageDialog(Main.parent, tr("You must select two or more nodes to split a circular way.")); + return; + } + lastWayChunk.remove(lastWayChunk.size() - 1); + lastWayChunk.addAll(wayChunks.get(0)); + wayChunks.remove(wayChunks.size() - 1); + wayChunks.set(0, lastWayChunk); + } + + if (wayChunks.size() < 2) { + if(wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size()-1)) + JOptionPane.showMessageDialog(Main.parent, tr("You must select two or more nodes to split a circular way.")); + else + JOptionPane.showMessageDialog(Main.parent, tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)")); + return; + } + //Main.debug("wayChunks.size(): " + wayChunks.size()); + //Main.debug("way id: " + selectedWay.id); + + // build a list of commands, and also a new selection list + Collection commandList = new ArrayList(wayChunks.size()); + Collection newSelection = new ArrayList(wayChunks.size()); + + Iterator> chunkIt = wayChunks.iterator(); + + // First, change the original way + Way changedWay = new Way(selectedWay); + changedWay.nodes.clear(); + changedWay.nodes.addAll(chunkIt.next()); + commandList.add(new ChangeCommand(selectedWay, changedWay)); + newSelection.add(selectedWay); + + Collection newWays = new ArrayList(); + // Second, create new ways + while (chunkIt.hasNext()) { + Way wayToAdd = new Way(); + if (selectedWay.keys != null) { + wayToAdd.keys = new HashMap(selectedWay.keys); + wayToAdd.checkTagged(); wayToAdd.checkDirectionTagged(); - } - newWays.add(wayToAdd); - wayToAdd.nodes.addAll(chunkIt.next()); - commandList.add(new AddCommand(wayToAdd)); - //Main.debug("wayToAdd: " + wayToAdd); - newSelection.add(wayToAdd); - - } - Boolean warnme=false; - // now copy all relations to new way also - for (Relation r : Main.ds.relations) { - if (r.deleted || r.incomplete) continue; - for (RelationMember rm : r.members) { - if (rm.member instanceof Way) { - if (rm.member == selectedWay) - { - Relation c = new Relation(r); - for(Way wayToAdd : newWays) - { - RelationMember em = new RelationMember(); - em.member = wayToAdd; - em.role = rm.role; - if(em.role.length() > 0) - warnme = true; - c.members.add(em); - } - commandList.add(new ChangeCommand(r, c)); - break; - } - } - } - } - if(warnme) - JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to all new ways.\nYou should verify this and correct it when necessary.")); - - NameVisitor v = new NameVisitor(); - v.visit(selectedWay); - Main.main.undoRedo.add( - new SequenceCommand(tr("Split way {0} into {1} parts", - v.name, wayChunks.size()), - commandList)); - Main.ds.setSelected(newSelection); - } - - /** - * Enable the "split way" menu option if the selection looks like we could use it. - */ - public void selectionChanged(Collection newSelection) { - setEnabled(checkSelection(newSelection)); - } + } + newWays.add(wayToAdd); + wayToAdd.nodes.addAll(chunkIt.next()); + commandList.add(new AddCommand(wayToAdd)); + //Main.debug("wayToAdd: " + wayToAdd); + newSelection.add(wayToAdd); + + } + Boolean warnme=false; + // now copy all relations to new way also + for (Relation r : Main.ds.relations) { + if (r.deleted || r.incomplete) continue; + for (RelationMember rm : r.members) { + if (rm.member instanceof Way) { + if (rm.member == selectedWay) + { + Relation c = new Relation(r); + for(Way wayToAdd : newWays) + { + RelationMember em = new RelationMember(); + em.member = wayToAdd; + em.role = rm.role; + if(em.role.length() > 0) + warnme = true; + c.members.add(em); + } + commandList.add(new ChangeCommand(r, c)); + break; + } + } + } + } + if(warnme) + JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to all new ways.\nYou should verify this and correct it when necessary.")); + + NameVisitor v = new NameVisitor(); + v.visit(selectedWay); + Main.main.undoRedo.add( + new SequenceCommand(tr("Split way {0} into {1} parts", + v.name, wayChunks.size()), + commandList)); + Main.ds.setSelected(newSelection); + } + + /** + * Enable the "split way" menu option if the selection looks like we could use it. + */ + public void selectionChanged(Collection newSelection) { + setEnabled(checkSelection(newSelection)); + } } Index: trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (revision 1169) @@ -12,12 +12,12 @@ public class ToggleGPXLinesAction extends JosmAction { - public ToggleGPXLinesAction() { - super(tr("Toggle GPX Lines"), "gps-lines", tr("Toggles the global setting ''{0}''.", tr("Draw lines between raw gps points.")), - Shortcut.registerShortcut("view:gpxlines", tr("View: {0}", tr("Toggle GPX Lines")), KeyEvent.VK_X, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true); - } + public ToggleGPXLinesAction() { + super(tr("Toggle GPX Lines"), "gps-lines", tr("Toggles the global setting ''{0}''.", tr("Draw lines between raw gps points.")), + Shortcut.registerShortcut("view:gpxlines", tr("View: {0}", tr("Toggle GPX Lines")), KeyEvent.VK_X, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true); + } - public void actionPerformed(ActionEvent e) { - Main.pref.put("draw.rawgps.lines", !Main.pref.getBoolean("draw.rawgps.lines")); - Main.map.mapView.repaint(); - } + public void actionPerformed(ActionEvent e) { + Main.pref.put("draw.rawgps.lines", !Main.pref.getBoolean("draw.rawgps.lines")); + Main.map.mapView.repaint(); + } } Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 1169) @@ -36,300 +36,300 @@ public class UnGlueAction extends JosmAction { //implements SelectionChangedListener { - private Node selectedNode; - private Way selectedWay; - private ArrayList selectedNodes; - - /** - * Create a new UnGlueAction. - */ - public UnGlueAction() { - super(tr("UnGlue Ways"), "unglueways", tr("Duplicate nodes that are used by multiple ways."), - Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.GROUP_EDIT), true); - //DataSet.selListeners.add(this); - } - - /** - * Called when the action is executed. - * - * This method does some checking on the selection and calls the matching unGlueWay method. - */ - public void actionPerformed(ActionEvent e) { - - Collection selection = Main.ds.getSelected(); - - if (checkSelection(selection)) { - int count = 0; - for (Way w : Main.ds.ways) { - if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; - if (!w.nodes.contains(selectedNode)) continue; - count++; - } - if (count < 2) { - JOptionPane.showMessageDialog(Main.parent, tr("This node is not glued to anything else.")); - } else { - // and then do the work. - unglueWays(); - } - } else if (checkSelection2(selection)) { - ArrayList tmpNodes = new ArrayList(); - for (Node n : selectedNodes) { - int count = 0; - for (Way w : Main.ds.ways) { - if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; - if (!w.nodes.contains(n)) continue; - count++; - } - if (count >= 2) { - tmpNodes.add(n); - } - } - if (tmpNodes.size() < 1) { - if (selection.size() > 1) { - JOptionPane.showMessageDialog(Main.parent, tr("None of these nodes is glued to anything else.")); - } else { - JOptionPane.showMessageDialog(Main.parent, tr("None of this way's nodes is glued to anything else.")); - } - } else { - // and then do the work. - selectedNodes = tmpNodes; - unglueWays2(); - } - } else { - JOptionPane.showMessageDialog(Main.parent, - tr("The current selection cannot be used for unglueing.")+"\n"+ - "\n"+ - tr("Select either:")+"\n"+ - tr("* One node that is used by more than one way, or")+"\n"+ - tr("* One node that is used by more than one way and one of those ways, or")+"\n"+ - tr("* One way that has one or more nodes that are used by more than one way, or")+"\n"+ - tr("* One way and one or more of its nodes that are used by more than one way.")+"\n"+ - "\n"+ - tr("Note: If a way is selected, this way will get fresh copies of the unglued\n"+ - "nodes and the new nodes will be selected. Otherwise, all ways will get their\n"+ - "own copy and all nodes will be selected.") - ); - } - selectedNode = null; - selectedWay = null; - selectedNodes = null; - } - - /** - * Checks if the selection consists of something we can work with. - * Checks only if the number and type of items selected looks good; - * does not check whether the selected items are really a valid - * input for splitting (this would be too expensive to be carried - * out from the selectionChanged listener). - * - * If this method returns "true", selectedNode and selectedWay will - * be set. - * - * Returns true if either one node is selected or one node and one - * way are selected and the node is part of the way. - * - * The way will be put into the object variable "selectedWay", the - * node into "selectedNode". - */ - private boolean checkSelection(Collection selection) { - - int size = selection.size(); - if (size < 1 || size > 2) - return false; - - selectedNode = null; - selectedWay = null; - - for (OsmPrimitive p : selection) { - if (p instanceof Node) { - selectedNode = (Node) p; - if (size == 1 || selectedWay != null) - return size == 1 || selectedWay.nodes.contains(selectedNode); - } else if (p instanceof Way) { - selectedWay = (Way) p; - if (size == 2 && selectedNode != null) - return selectedWay.nodes.contains(selectedNode); - } - } - - return false; - } - - /** - * Checks if the selection consists of something we can work with. - * Checks only if the number and type of items selected looks good; - * does not check whether the selected items are really a valid - * input for splitting (this would be too expensive to be carried - * out from the selectionChanged listener). - * - * Returns true if one way and any number of nodes that are part of - * that way are selected. Note: "any" can be none, then all nodes of - * the way are used. - * - * The way will be put into the object variable "selectedWay", the - * nodes into "selectedNodes". - */ - private boolean checkSelection2(Collection selection) { - if (selection.size() < 1) - return false; - - selectedWay = null; - for (OsmPrimitive p : selection) { - if (p instanceof Way) { - if (selectedWay != null) { - return false; - } - selectedWay = (Way) p; - } - } - if (selectedWay == null) { - return false; - } - - selectedNodes = new ArrayList(); - for (OsmPrimitive p : selection) { - if (p instanceof Node) { - Node n = (Node) p; - if (!selectedWay.nodes.contains(n)) { - return false; - } - selectedNodes.add(n); - } - } - - if (selectedNodes.size() < 1) { - selectedNodes.addAll(selectedWay.nodes); - } - - return true; - } - - /** - * dupe the given node of the given way - * - * -> the new node will be put into the parameter newNodes. - * -> the add-node command will be put into the parameter cmds. - * -> the changed way will be returned and must be put into cmds by the caller! - */ - private Way modifyWay(Node originalNode, Way w, List cmds, List newNodes) { - ArrayList nn = new ArrayList(); - for (Node pushNode : w.nodes) { - if (originalNode == pushNode) { - // clone the node for all other ways - pushNode = new Node(pushNode); - pushNode.id = 0; - newNodes.add(pushNode); - cmds.add(new AddCommand(pushNode)); - } - nn.add(pushNode); - } - Way newWay = new Way(w); - newWay.nodes.clear(); - newWay.nodes.addAll(nn); - - return newWay; - } - - /** - * put all newNodes into the same relation(s) that originalNode is in - */ - private void fixRelations(Node originalNode, List cmds, List newNodes) { - // modify all relations containing the node - Relation newRel = null; - HashSet rolesToReAdd = null; - for (Relation r : Main.ds.relations) { - if (r.deleted || r.incomplete) continue; - newRel = null; - rolesToReAdd = null; - for (RelationMember rm : r.members) { - if (rm.member instanceof Node) { - if (rm.member == originalNode) { - if (newRel == null) { - newRel = new Relation(r); - newRel.members.clear(); - rolesToReAdd = new HashSet(); - } - rolesToReAdd.add(rm.role); - } - } - } - if (newRel != null) { - for (RelationMember rm : r.members) { - //if (rm.member != selectedNode) { - newRel.members.add(rm); - //} - } - for (Node n : newNodes) { - for (String role : rolesToReAdd) { - newRel.members.add(new RelationMember(role, n)); - } - } - cmds.add(new ChangeCommand(r, newRel)); - } - } - } - - - /** - * dupe a single node into as many nodes as there are ways using it, OR - * - * dupe a single node once, and put the copy on the selected way - */ - private void unglueWays() { - LinkedList cmds = new LinkedList(); - List newNodes = new LinkedList(); - - if (selectedWay == null) { - boolean firstway = true; - // modify all ways containing the nodes - for (Way w : Main.ds.ways) { - if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; - if (!w.nodes.contains(selectedNode)) continue; - if (!firstway) cmds.add(new ChangeCommand(w, modifyWay(selectedNode, w, cmds, newNodes))); - firstway = false; - } - } else { - cmds.add(new ChangeCommand(selectedWay, modifyWay(selectedNode, selectedWay, cmds, newNodes))); - } - - fixRelations(selectedNode, cmds, newNodes); - - Main.main.undoRedo.add(new SequenceCommand(tr("Dupe into {0} nodes", newNodes.size()+1), cmds)); - if (selectedWay == null) { // if a node has been selected, new selection is ALL nodes - newNodes.add(selectedNode); - } // if a node and a way has been selected, new selection is only the new node that was added to the selected way - Main.ds.setSelected(newNodes); - } - - /** - * dupe all nodes that are selected, and put the copies on the selected way - * - */ - private void unglueWays2() { - LinkedList cmds = new LinkedList(); - List allNewNodes = new LinkedList(); - Way tmpWay = selectedWay; - - for (Node n : selectedNodes) { - List newNodes = new LinkedList(); - tmpWay = modifyWay(n, tmpWay, cmds, newNodes); - fixRelations(n, cmds, newNodes); - allNewNodes.addAll(newNodes); - } - cmds.add(new ChangeCommand(selectedWay, tmpWay)); // only one changeCommand for a way, else garbage will happen - - Main.main.undoRedo.add(new SequenceCommand(tr("Dupe {0} nodes into {1} nodes", selectedNodes.size(), selectedNodes.size()+allNewNodes.size()), cmds)); - Main.ds.setSelected(allNewNodes); - } + private Node selectedNode; + private Way selectedWay; + private ArrayList selectedNodes; + + /** + * Create a new UnGlueAction. + */ + public UnGlueAction() { + super(tr("UnGlue Ways"), "unglueways", tr("Duplicate nodes that are used by multiple ways."), + Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.GROUP_EDIT), true); + //DataSet.selListeners.add(this); + } + + /** + * Called when the action is executed. + * + * This method does some checking on the selection and calls the matching unGlueWay method. + */ + public void actionPerformed(ActionEvent e) { + + Collection selection = Main.ds.getSelected(); + + if (checkSelection(selection)) { + int count = 0; + for (Way w : Main.ds.ways) { + if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; + if (!w.nodes.contains(selectedNode)) continue; + count++; + } + if (count < 2) { + JOptionPane.showMessageDialog(Main.parent, tr("This node is not glued to anything else.")); + } else { + // and then do the work. + unglueWays(); + } + } else if (checkSelection2(selection)) { + ArrayList tmpNodes = new ArrayList(); + for (Node n : selectedNodes) { + int count = 0; + for (Way w : Main.ds.ways) { + if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; + if (!w.nodes.contains(n)) continue; + count++; + } + if (count >= 2) { + tmpNodes.add(n); + } + } + if (tmpNodes.size() < 1) { + if (selection.size() > 1) { + JOptionPane.showMessageDialog(Main.parent, tr("None of these nodes is glued to anything else.")); + } else { + JOptionPane.showMessageDialog(Main.parent, tr("None of this way's nodes is glued to anything else.")); + } + } else { + // and then do the work. + selectedNodes = tmpNodes; + unglueWays2(); + } + } else { + JOptionPane.showMessageDialog(Main.parent, + tr("The current selection cannot be used for unglueing.")+"\n"+ + "\n"+ + tr("Select either:")+"\n"+ + tr("* One node that is used by more than one way, or")+"\n"+ + tr("* One node that is used by more than one way and one of those ways, or")+"\n"+ + tr("* One way that has one or more nodes that are used by more than one way, or")+"\n"+ + tr("* One way and one or more of its nodes that are used by more than one way.")+"\n"+ + "\n"+ + tr("Note: If a way is selected, this way will get fresh copies of the unglued\n"+ + "nodes and the new nodes will be selected. Otherwise, all ways will get their\n"+ + "own copy and all nodes will be selected.") + ); + } + selectedNode = null; + selectedWay = null; + selectedNodes = null; + } + + /** + * Checks if the selection consists of something we can work with. + * Checks only if the number and type of items selected looks good; + * does not check whether the selected items are really a valid + * input for splitting (this would be too expensive to be carried + * out from the selectionChanged listener). + * + * If this method returns "true", selectedNode and selectedWay will + * be set. + * + * Returns true if either one node is selected or one node and one + * way are selected and the node is part of the way. + * + * The way will be put into the object variable "selectedWay", the + * node into "selectedNode". + */ + private boolean checkSelection(Collection selection) { + + int size = selection.size(); + if (size < 1 || size > 2) + return false; + + selectedNode = null; + selectedWay = null; + + for (OsmPrimitive p : selection) { + if (p instanceof Node) { + selectedNode = (Node) p; + if (size == 1 || selectedWay != null) + return size == 1 || selectedWay.nodes.contains(selectedNode); + } else if (p instanceof Way) { + selectedWay = (Way) p; + if (size == 2 && selectedNode != null) + return selectedWay.nodes.contains(selectedNode); + } + } + + return false; + } + + /** + * Checks if the selection consists of something we can work with. + * Checks only if the number and type of items selected looks good; + * does not check whether the selected items are really a valid + * input for splitting (this would be too expensive to be carried + * out from the selectionChanged listener). + * + * Returns true if one way and any number of nodes that are part of + * that way are selected. Note: "any" can be none, then all nodes of + * the way are used. + * + * The way will be put into the object variable "selectedWay", the + * nodes into "selectedNodes". + */ + private boolean checkSelection2(Collection selection) { + if (selection.size() < 1) + return false; + + selectedWay = null; + for (OsmPrimitive p : selection) { + if (p instanceof Way) { + if (selectedWay != null) { + return false; + } + selectedWay = (Way) p; + } + } + if (selectedWay == null) { + return false; + } + + selectedNodes = new ArrayList(); + for (OsmPrimitive p : selection) { + if (p instanceof Node) { + Node n = (Node) p; + if (!selectedWay.nodes.contains(n)) { + return false; + } + selectedNodes.add(n); + } + } + + if (selectedNodes.size() < 1) { + selectedNodes.addAll(selectedWay.nodes); + } + + return true; + } + + /** + * dupe the given node of the given way + * + * -> the new node will be put into the parameter newNodes. + * -> the add-node command will be put into the parameter cmds. + * -> the changed way will be returned and must be put into cmds by the caller! + */ + private Way modifyWay(Node originalNode, Way w, List cmds, List newNodes) { + ArrayList nn = new ArrayList(); + for (Node pushNode : w.nodes) { + if (originalNode == pushNode) { + // clone the node for all other ways + pushNode = new Node(pushNode); + pushNode.id = 0; + newNodes.add(pushNode); + cmds.add(new AddCommand(pushNode)); + } + nn.add(pushNode); + } + Way newWay = new Way(w); + newWay.nodes.clear(); + newWay.nodes.addAll(nn); + + return newWay; + } + + /** + * put all newNodes into the same relation(s) that originalNode is in + */ + private void fixRelations(Node originalNode, List cmds, List newNodes) { + // modify all relations containing the node + Relation newRel = null; + HashSet rolesToReAdd = null; + for (Relation r : Main.ds.relations) { + if (r.deleted || r.incomplete) continue; + newRel = null; + rolesToReAdd = null; + for (RelationMember rm : r.members) { + if (rm.member instanceof Node) { + if (rm.member == originalNode) { + if (newRel == null) { + newRel = new Relation(r); + newRel.members.clear(); + rolesToReAdd = new HashSet(); + } + rolesToReAdd.add(rm.role); + } + } + } + if (newRel != null) { + for (RelationMember rm : r.members) { + //if (rm.member != selectedNode) { + newRel.members.add(rm); + //} + } + for (Node n : newNodes) { + for (String role : rolesToReAdd) { + newRel.members.add(new RelationMember(role, n)); + } + } + cmds.add(new ChangeCommand(r, newRel)); + } + } + } + + + /** + * dupe a single node into as many nodes as there are ways using it, OR + * + * dupe a single node once, and put the copy on the selected way + */ + private void unglueWays() { + LinkedList cmds = new LinkedList(); + List newNodes = new LinkedList(); + + if (selectedWay == null) { + boolean firstway = true; + // modify all ways containing the nodes + for (Way w : Main.ds.ways) { + if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; + if (!w.nodes.contains(selectedNode)) continue; + if (!firstway) cmds.add(new ChangeCommand(w, modifyWay(selectedNode, w, cmds, newNodes))); + firstway = false; + } + } else { + cmds.add(new ChangeCommand(selectedWay, modifyWay(selectedNode, selectedWay, cmds, newNodes))); + } + + fixRelations(selectedNode, cmds, newNodes); + + Main.main.undoRedo.add(new SequenceCommand(tr("Dupe into {0} nodes", newNodes.size()+1), cmds)); + if (selectedWay == null) { // if a node has been selected, new selection is ALL nodes + newNodes.add(selectedNode); + } // if a node and a way has been selected, new selection is only the new node that was added to the selected way + Main.ds.setSelected(newNodes); + } + + /** + * dupe all nodes that are selected, and put the copies on the selected way + * + */ + private void unglueWays2() { + LinkedList cmds = new LinkedList(); + List allNewNodes = new LinkedList(); + Way tmpWay = selectedWay; + + for (Node n : selectedNodes) { + List newNodes = new LinkedList(); + tmpWay = modifyWay(n, tmpWay, cmds, newNodes); + fixRelations(n, cmds, newNodes); + allNewNodes.addAll(newNodes); + } + cmds.add(new ChangeCommand(selectedWay, tmpWay)); // only one changeCommand for a way, else garbage will happen + + Main.main.undoRedo.add(new SequenceCommand(tr("Dupe {0} nodes into {1} nodes", selectedNodes.size(), selectedNodes.size()+allNewNodes.size()), cmds)); + Main.ds.setSelected(allNewNodes); + } // Disabled because we have such a nice help text that would not be shown otherwise. // -// /** -// * Enable the menu option if the selection looks like we could use it. -// */ -// public void selectionChanged(Collection newSelection) { -// setEnabled(checkSelection(newSelection) || checkSelection2(newSelection)); -// selectedNode = null; -// selectedWay = null; -// selectedNodes = null; -// } +// /** +// * Enable the menu option if the selection looks like we could use it. +// */ +// public void selectionChanged(Collection newSelection) { +// setEnabled(checkSelection(newSelection) || checkSelection2(newSelection)); +// selectedNode = null; +// selectedWay = null; +// selectedNodes = null; +// } } Index: trunk/src/org/openstreetmap/josm/actions/UndoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UndoAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/UndoAction.java (revision 1169) @@ -17,18 +17,18 @@ public class UndoAction extends JosmAction { - /** - * Construct the action with "Undo" as label. - */ - public UndoAction() { - super(tr("Undo"), "undo", tr("Undo the last action."), - Shortcut.registerShortcut("system:undo", tr("Edit: {0}", tr("Undo")), KeyEvent.VK_Z, Shortcut.GROUP_MENU), true); - setEnabled(false); - } + /** + * Construct the action with "Undo" as label. + */ + public UndoAction() { + super(tr("Undo"), "undo", tr("Undo the last action."), + Shortcut.registerShortcut("system:undo", tr("Edit: {0}", tr("Undo")), KeyEvent.VK_Z, Shortcut.GROUP_MENU), true); + setEnabled(false); + } - public void actionPerformed(ActionEvent e) { - if (Main.map == null) - return; - Main.map.repaint(); - Main.main.undoRedo.undo(); - } + public void actionPerformed(ActionEvent e) { + if (Main.map == null) + return; + Main.map.repaint(); + Main.main.undoRedo.undo(); + } } Index: trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 1169) @@ -13,30 +13,30 @@ public class UnselectAllAction extends JosmAction { - public UnselectAllAction() { - super(tr("Unselect All"), "unselectall", tr("Unselect all objects."), - Shortcut.registerShortcut("edit:unselectall", tr("Edit: {0}", tr("Unselect All")), KeyEvent.VK_U, Shortcut.GROUP_EDIT), true); - // this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put - // the correct group in + public UnselectAllAction() { + super(tr("Unselect All"), "unselectall", tr("Unselect all objects."), + Shortcut.registerShortcut("edit:unselectall", tr("Edit: {0}", tr("Unselect All")), KeyEvent.VK_U, Shortcut.GROUP_EDIT), true); + // this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put + // the correct group in - // Add extra shortcut C-S-a - Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( - Shortcut.registerShortcut("edit:unselectallfocus", tr("Edit: {0}", tr("Unselect All (Focus)")), - KeyEvent.VK_A, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT).getKeyStroke(), - tr("Unselect All")); + // Add extra shortcut C-S-a + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + Shortcut.registerShortcut("edit:unselectallfocus", tr("Edit: {0}", tr("Unselect All (Focus)")), + KeyEvent.VK_A, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT).getKeyStroke(), + tr("Unselect All")); - // Add extra shortcut ESCAPE - /* - * FIXME: this isn't optimal. In a better world the mapmode actions - * would be able to capture keyboard events and react accordingly. But - * for now this is a reasonable approximation. - */ - Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( - Shortcut.registerShortcut("edit:unselectallescape", tr("Edit: {0}", tr("Unselect All (Escape)")), - KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT).getKeyStroke(), - tr("Unselect All")); - } + // Add extra shortcut ESCAPE + /* + * FIXME: this isn't optimal. In a better world the mapmode actions + * would be able to capture keyboard events and react accordingly. But + * for now this is a reasonable approximation. + */ + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + Shortcut.registerShortcut("edit:unselectallescape", tr("Edit: {0}", tr("Unselect All (Escape)")), + KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT).getKeyStroke(), + tr("Unselect All")); + } - public void actionPerformed(ActionEvent e) { - Main.ds.setSelected(); - } + public void actionPerformed(ActionEvent e) { + Main.ds.setSelected(); + } } Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 1169) @@ -35,129 +35,129 @@ public class UploadAction extends JosmAction { - /** Upload Hook */ - public interface UploadHook { - /** - * Checks the upload. - * @param add The added primitives - * @param update The updated primitives - * @param delete The deleted primitives - * @return true, if the upload can continue - */ - public boolean checkUpload(Collection add, Collection update, Collection delete); - } + /** Upload Hook */ + public interface UploadHook { + /** + * Checks the upload. + * @param add The added primitives + * @param update The updated primitives + * @param delete The deleted primitives + * @return true, if the upload can continue + */ + public boolean checkUpload(Collection add, Collection update, Collection delete); + } - /** - * The list of upload hooks. These hooks will be called one after the other - * when the user wants to upload data. Plugins can insert their own hooks here - * if they want to be able to veto an upload. - * - * Be default, the standard upload dialog is the only element in the list. - * Plugins should normally insert their code before that, so that the upload - * dialog is the last thing shown before upload really starts; on occasion - * however, a plugin might also want to insert something after that. - */ - public final LinkedList uploadHooks = new LinkedList(); + /** + * The list of upload hooks. These hooks will be called one after the other + * when the user wants to upload data. Plugins can insert their own hooks here + * if they want to be able to veto an upload. + * + * Be default, the standard upload dialog is the only element in the list. + * Plugins should normally insert their code before that, so that the upload + * dialog is the last thing shown before upload really starts; on occasion + * however, a plugin might also want to insert something after that. + */ + public final LinkedList uploadHooks = new LinkedList(); - public UploadAction() { - super(tr("Upload to OSM ..."), "upload", tr("Upload all changes to the OSM server."), - Shortcut.registerShortcut("file:upload", tr("File: {0}", tr("Upload to OSM ...")), KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); + public UploadAction() { + super(tr("Upload to OSM ..."), "upload", tr("Upload all changes to the OSM server."), + Shortcut.registerShortcut("file:upload", tr("File: {0}", tr("Upload to OSM ...")), KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); - /** - * Displays a screen where the actions that would be taken are displayed and - * give the user the possibility to cancel the upload. - */ - uploadHooks.add(new UploadHook() { - public boolean checkUpload(Collection add, Collection update, Collection delete) { + /** + * Displays a screen where the actions that would be taken are displayed and + * give the user the possibility to cancel the upload. + */ + uploadHooks.add(new UploadHook() { + public boolean checkUpload(Collection add, Collection update, Collection delete) { - JPanel p = new JPanel(new GridBagLayout()); + JPanel p = new JPanel(new GridBagLayout()); - OsmPrimitivRenderer renderer = new OsmPrimitivRenderer(); + OsmPrimitivRenderer renderer = new OsmPrimitivRenderer(); - if (!add.isEmpty()) { - p.add(new JLabel(tr("Objects to add:")), GBC.eol()); - JList l = new JList(add.toArray()); - l.setCellRenderer(renderer); - l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); - p.add(new JScrollPane(l), GBC.eol().fill()); - } + if (!add.isEmpty()) { + p.add(new JLabel(tr("Objects to add:")), GBC.eol()); + JList l = new JList(add.toArray()); + l.setCellRenderer(renderer); + l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); + p.add(new JScrollPane(l), GBC.eol().fill()); + } - if (!update.isEmpty()) { - p.add(new JLabel(tr("Objects to modify:")), GBC.eol()); - JList l = new JList(update.toArray()); - l.setCellRenderer(renderer); - l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); - p.add(new JScrollPane(l), GBC.eol().fill()); - } + if (!update.isEmpty()) { + p.add(new JLabel(tr("Objects to modify:")), GBC.eol()); + JList l = new JList(update.toArray()); + l.setCellRenderer(renderer); + l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); + p.add(new JScrollPane(l), GBC.eol().fill()); + } - if (!delete.isEmpty()) { - p.add(new JLabel(tr("Objects to delete:")), GBC.eol()); - JList l = new JList(delete.toArray()); - l.setCellRenderer(renderer); - l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); - p.add(new JScrollPane(l), GBC.eol().fill()); - } + if (!delete.isEmpty()) { + p.add(new JLabel(tr("Objects to delete:")), GBC.eol()); + JList l = new JList(delete.toArray()); + l.setCellRenderer(renderer); + l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); + p.add(new JScrollPane(l), GBC.eol().fill()); + } - return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload these changes?"), - JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION; - } - }); - } + return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload these changes?"), + JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION; + } + }); + } - public void actionPerformed(ActionEvent e) { - if (Main.map == null) { - JOptionPane.showMessageDialog(Main.parent,tr("Nothing to upload. Get some data first.")); - return; - } + public void actionPerformed(ActionEvent e) { + if (Main.map == null) { + JOptionPane.showMessageDialog(Main.parent,tr("Nothing to upload. Get some data first.")); + return; + } - if (!Main.map.conflictDialog.conflicts.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent,tr("There are unresolved conflicts. You have to resolve these first.")); - Main.map.conflictDialog.action.button.setSelected(true); - Main.map.conflictDialog.action.actionPerformed(null); - return; - } + if (!Main.map.conflictDialog.conflicts.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent,tr("There are unresolved conflicts. You have to resolve these first.")); + Main.map.conflictDialog.action.button.setSelected(true); + Main.map.conflictDialog.action.actionPerformed(null); + return; + } - final LinkedList add = new LinkedList(); - final LinkedList update = new LinkedList(); - final LinkedList delete = new LinkedList(); - for (OsmPrimitive osm : Main.ds.allPrimitives()) { - if (osm.get("josm/ignore") != null) - continue; - if (osm.id == 0 && !osm.deleted) - add.addLast(osm); - else if (osm.modified && !osm.deleted) - update.addLast(osm); - else if (osm.deleted && osm.id != 0) - delete.addFirst(osm); - } + final LinkedList add = new LinkedList(); + final LinkedList update = new LinkedList(); + final LinkedList delete = new LinkedList(); + for (OsmPrimitive osm : Main.ds.allPrimitives()) { + if (osm.get("josm/ignore") != null) + continue; + if (osm.id == 0 && !osm.deleted) + add.addLast(osm); + else if (osm.modified && !osm.deleted) + update.addLast(osm); + else if (osm.deleted && osm.id != 0) + delete.addFirst(osm); + } - if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent,tr("No changes to upload.")); - return; - } + if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent,tr("No changes to upload.")); + return; + } - // Call all upload hooks in sequence. The upload confirmation dialog - // is one of these. - for(UploadHook hook : uploadHooks) - if(!hook.checkUpload(add, update, delete)) - return; + // Call all upload hooks in sequence. The upload confirmation dialog + // is one of these. + for(UploadHook hook : uploadHooks) + if(!hook.checkUpload(add, update, delete)) + return; - final OsmServerWriter server = new OsmServerWriter(); - final Collection all = new LinkedList(); - all.addAll(add); - all.addAll(update); - all.addAll(delete); + final OsmServerWriter server = new OsmServerWriter(); + final Collection all = new LinkedList(); + all.addAll(add); + all.addAll(update); + all.addAll(delete); - PleaseWaitRunnable uploadTask = new PleaseWaitRunnable(tr("Uploading data")){ - @Override protected void realRun() throws SAXException { - server.uploadOsm(all); - } - @Override protected void finish() { - Main.main.editLayer().cleanData(server.processed, !add.isEmpty()); - } - @Override protected void cancel() { - server.cancel(); - } - }; - Main.worker.execute(uploadTask); - } + PleaseWaitRunnable uploadTask = new PleaseWaitRunnable(tr("Uploading data")){ + @Override protected void realRun() throws SAXException { + server.uploadOsm(all); + } + @Override protected void finish() { + Main.main.editLayer().cleanData(server.processed, !add.isEmpty()); + } + @Override protected void cancel() { + server.cancel(); + } + }; + Main.worker.execute(uploadTask); + } } Index: trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (revision 1169) @@ -12,14 +12,14 @@ public final class ZoomInAction extends JosmAction { - public ZoomInAction() { - super(tr("Zoom in"), "dialogs/zoomin", tr("Zoom in"), - Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom in")), KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT), true); - setEnabled(true); - } + public ZoomInAction() { + super(tr("Zoom in"), "dialogs/zoomin", tr("Zoom in"), + Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom in")), KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT), true); + setEnabled(true); + } - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { if (Main.map == null) return; - double zoom = Main.map.mapView.getScale(); - Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom * .9); - } + double zoom = Main.map.mapView.getScale(); + Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom * .9); + } } Index: trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (revision 1169) @@ -12,14 +12,14 @@ public final class ZoomOutAction extends JosmAction { - public ZoomOutAction() { - super(tr("Zoom out"), "dialogs/zoomout", tr("Zoom out"), - Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom out")), KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), true); - setEnabled(true); - } + public ZoomOutAction() { + super(tr("Zoom out"), "dialogs/zoomout", tr("Zoom out"), + Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom out")), KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), true); + setEnabled(true); + } - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { if (Main.map == null) return; - double zoom = Main.map.mapView.getScale(); - Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom /.9); - } + double zoom = Main.map.mapView.getScale(); + Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom /.9); + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 1169) @@ -15,26 +15,26 @@ public class AudioBackAction extends JosmAction { - private double amount; // note, normally negative, i.e. jump backwards in time + private double amount; // note, normally negative, i.e. jump backwards in time - public AudioBackAction() { - super(tr("Back"), "audio-back", tr("Jump back."), - Shortcut.registerShortcut("audio:back", tr("Audio: {0}", tr("Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true); - try { - amount = - Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0")); - } catch (NumberFormatException e) { - amount = 10.0; - } - this.putValue("help", "Action/Back"); - } + public AudioBackAction() { + super(tr("Back"), "audio-back", tr("Jump back."), + Shortcut.registerShortcut("audio:back", tr("Audio: {0}", tr("Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true); + try { + amount = - Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0")); + } catch (NumberFormatException e) { + amount = 10.0; + } + this.putValue("help", "Action/Back"); + } - public void actionPerformed(ActionEvent e) { - try { - if (AudioPlayer.playing() || AudioPlayer.paused()) - AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position() + amount); - else - MarkerLayer.playAudio(); - } catch (Exception ex) { - AudioPlayer.audioMalfunction(ex); - } - } + public void actionPerformed(ActionEvent e) { + try { + if (AudioPlayer.playing() || AudioPlayer.paused()) + AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position() + amount); + else + MarkerLayer.playAudio(); + } catch (Exception ex) { + AudioPlayer.audioMalfunction(ex); + } + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 1169) @@ -11,39 +11,39 @@ abstract public class AudioFastSlowAction extends JosmAction { - private double multiplier; + private double multiplier; - public AudioFastSlowAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean fast) { - super(name, iconName, tooltip, shortcut, true); - try { - multiplier = Double.parseDouble(Main.pref.get("audio.fastfwdmultiplier","1.3")); - } catch (NumberFormatException e) { - multiplier = 1.3; - } - if (! fast) - multiplier = 1.0 / multiplier; - } + public AudioFastSlowAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean fast) { + super(name, iconName, tooltip, shortcut, true); + try { + multiplier = Double.parseDouble(Main.pref.get("audio.fastfwdmultiplier","1.3")); + } catch (NumberFormatException e) { + multiplier = 1.3; + } + if (! fast) + multiplier = 1.0 / multiplier; + } - @Deprecated - public AudioFastSlowAction(String name, String iconName, String tooltip, int shortcut, int modifier, boolean fast) { - super(name, iconName, tooltip, shortcut, modifier, true); - try { - multiplier = Double.parseDouble(Main.pref.get("audio.fastfwdmultiplier","1.3")); - } catch (NumberFormatException e) { - multiplier = 1.3; - } - if (! fast) - multiplier = 1.0 / multiplier; - } + @Deprecated + public AudioFastSlowAction(String name, String iconName, String tooltip, int shortcut, int modifier, boolean fast) { + super(name, iconName, tooltip, shortcut, modifier, true); + try { + multiplier = Double.parseDouble(Main.pref.get("audio.fastfwdmultiplier","1.3")); + } catch (NumberFormatException e) { + multiplier = 1.3; + } + if (! fast) + multiplier = 1.0 / multiplier; + } - public void actionPerformed(ActionEvent e) { - double speed = AudioPlayer.speed(); - if (speed * multiplier <= 0.1) - return; - try { - if (AudioPlayer.playing() || AudioPlayer.paused()) - AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position(), speed * multiplier); - } catch (Exception ex) { - AudioPlayer.audioMalfunction(ex); - } - } + public void actionPerformed(ActionEvent e) { + double speed = AudioPlayer.speed(); + if (speed * multiplier <= 0.1) + return; + try { + if (AudioPlayer.playing() || AudioPlayer.paused()) + AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position(), speed * multiplier); + } catch (Exception ex) { + AudioPlayer.audioMalfunction(ex); + } + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java (revision 1169) @@ -9,7 +9,7 @@ public class AudioFasterAction extends AudioFastSlowAction { - public AudioFasterAction() { - super(tr("Faster"), "audio-faster", tr("Faster Forward"), - Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", tr("Faster")), KeyEvent.VK_F9, Shortcut.GROUP_DIRECT), true); - } + public AudioFasterAction() { + super(tr("Faster"), "audio-faster", tr("Faster Forward"), + Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", tr("Faster")), KeyEvent.VK_F9, Shortcut.GROUP_DIRECT), true); + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 1169) @@ -15,25 +15,25 @@ public class AudioFwdAction extends JosmAction { - private double amount; + private double amount; - public AudioFwdAction() { - super(tr("Forward"), "audio-fwd", tr("Jump forward"), - Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", tr("Forward")), KeyEvent.VK_F7, Shortcut.GROUP_DIRECT), true); - try { - amount = Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0")); - } catch (NumberFormatException e) { - amount = 10.0; - } - } + public AudioFwdAction() { + super(tr("Forward"), "audio-fwd", tr("Jump forward"), + Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", tr("Forward")), KeyEvent.VK_F7, Shortcut.GROUP_DIRECT), true); + try { + amount = Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0")); + } catch (NumberFormatException e) { + amount = 10.0; + } + } - public void actionPerformed(ActionEvent e) { - try { - if (AudioPlayer.playing() || AudioPlayer.paused()) - AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position() + amount); - else - MarkerLayer.playAudio(); - } catch (Exception ex) { - AudioPlayer.audioMalfunction(ex); - } - } + public void actionPerformed(ActionEvent e) { + try { + if (AudioPlayer.playing() || AudioPlayer.paused()) + AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position() + amount); + else + MarkerLayer.playAudio(); + } catch (Exception ex) { + AudioPlayer.audioMalfunction(ex); + } + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 1169) @@ -13,11 +13,11 @@ public class AudioNextAction extends JosmAction { - public AudioNextAction() { - super(tr("Next Marker"), "audio-next", tr("Play next marker."), - Shortcut.registerShortcut("audio:next", tr("Audio: {0}", tr("Next Marker")), KeyEvent.VK_F8, Shortcut.GROUP_DIRECT), true); - } + public AudioNextAction() { + super(tr("Next Marker"), "audio-next", tr("Play next marker."), + Shortcut.registerShortcut("audio:next", tr("Audio: {0}", tr("Next Marker")), KeyEvent.VK_F8, Shortcut.GROUP_DIRECT), true); + } - public void actionPerformed(ActionEvent e) { - MarkerLayer.playNextMarker(); - } + public void actionPerformed(ActionEvent e) { + MarkerLayer.playNextMarker(); + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 1169) @@ -15,26 +15,26 @@ public class AudioPlayPauseAction extends JosmAction { - public AudioPlayPauseAction() { - super(tr("Play/pause"), "audio-playpause", tr("Play/pause audio."), - Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", tr("Play/pause")), KeyEvent.VK_PERIOD, Shortcut.GROUP_DIRECT), true); - } + public AudioPlayPauseAction() { + super(tr("Play/pause"), "audio-playpause", tr("Play/pause audio."), + Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", tr("Play/pause")), KeyEvent.VK_PERIOD, Shortcut.GROUP_DIRECT), true); + } - public void actionPerformed(ActionEvent e) { - URL url = AudioPlayer.url(); - try { - if (AudioPlayer.paused() && url != null) { - AudioPlayer.play(url); - } else if (AudioPlayer.playing()){ - if (AudioPlayer.speed() != 1.0) - AudioPlayer.play(url, AudioPlayer.position()); - else - AudioPlayer.pause(); - } else { - // find first audio marker to play - MarkerLayer.playAudio(); - } - } catch (Exception ex) { - AudioPlayer.audioMalfunction(ex); - } - } + public void actionPerformed(ActionEvent e) { + URL url = AudioPlayer.url(); + try { + if (AudioPlayer.paused() && url != null) { + AudioPlayer.play(url); + } else if (AudioPlayer.playing()){ + if (AudioPlayer.speed() != 1.0) + AudioPlayer.play(url, AudioPlayer.position()); + else + AudioPlayer.pause(); + } else { + // find first audio marker to play + MarkerLayer.playAudio(); + } + } catch (Exception ex) { + AudioPlayer.audioMalfunction(ex); + } + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 1169) @@ -13,11 +13,11 @@ public class AudioPrevAction extends JosmAction { - public AudioPrevAction() { - super(tr("Previous Marker"), "audio-prev", tr("Play previous marker."), - Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", tr("Previous Marker")), KeyEvent.VK_F5, Shortcut.GROUP_DIRECT), true); - } + public AudioPrevAction() { + super(tr("Previous Marker"), "audio-prev", tr("Play previous marker."), + Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", tr("Previous Marker")), KeyEvent.VK_F5, Shortcut.GROUP_DIRECT), true); + } - public void actionPerformed(ActionEvent e) { - MarkerLayer.playPreviousMarker(); - } + public void actionPerformed(ActionEvent e) { + MarkerLayer.playPreviousMarker(); + } } Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (revision 1169) @@ -9,7 +9,7 @@ public class AudioSlowerAction extends AudioFastSlowAction { - public AudioSlowerAction() { - super(tr("Slower"), "audio-slower", tr("Slower Forward"), - Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", tr("Slower")), KeyEvent.VK_F4, Shortcut.GROUP_DIRECT), true); - } + public AudioSlowerAction() { + super(tr("Slower"), "audio-slower", tr("Slower Forward"), + Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", tr("Slower")), KeyEvent.VK_F4, Shortcut.GROUP_DIRECT), true); + } } Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 1169) @@ -21,66 +21,66 @@ public class DownloadGpsTask implements DownloadTask { - private static class Task extends PleaseWaitRunnable { - private BoundingBoxDownloader reader; - private GpxData rawData; - private final boolean newLayer; + private static class Task extends PleaseWaitRunnable { + private BoundingBoxDownloader reader; + private GpxData rawData; + private final boolean newLayer; - public Task(boolean newLayer, BoundingBoxDownloader reader) { - super(tr("Downloading GPS data")); - this.reader = reader; - this.newLayer = newLayer; - } + public Task(boolean newLayer, BoundingBoxDownloader reader) { + super(tr("Downloading GPS data")); + this.reader = reader; + this.newLayer = newLayer; + } - @Override public void realRun() throws IOException, SAXException { - rawData = reader.parseRawGps(); - } + @Override public void realRun() throws IOException, SAXException { + rawData = reader.parseRawGps(); + } - @Override protected void finish() { - if (rawData == null) - return; + @Override protected void finish() { + if (rawData == null) + return; rawData.recalculateBounds(); Bounds b = rawData.bounds; - String name = b.min.lat() + " " + b.min.lon() + " x " + b.max.lat() + " " + b.max.lon(); - GpxLayer layer = new GpxLayer(rawData, name); - if (newLayer || findMergeLayer() == null) - Main.main.addLayer(layer); - else - findMergeLayer().mergeFrom(layer); - } - - private Layer findMergeLayer() { - if (Main.map == null) - return null; - Layer active = Main.map.mapView.getActiveLayer(); - if (active != null && active instanceof GpxLayer) - return active; - for (Layer l : Main.map.mapView.getAllLayers()) - if (l instanceof GpxLayer) - return l; - return null; + String name = b.min.lat() + " " + b.min.lon() + " x " + b.max.lat() + " " + b.max.lon(); + GpxLayer layer = new GpxLayer(rawData, name); + if (newLayer || findMergeLayer() == null) + Main.main.addLayer(layer); + else + findMergeLayer().mergeFrom(layer); } - @Override protected void cancel() { - if (reader != null) - reader.cancel(); - } - } + private Layer findMergeLayer() { + if (Main.map == null) + return null; + Layer active = Main.map.mapView.getActiveLayer(); + if (active != null && active instanceof GpxLayer) + return active; + for (Layer l : Main.map.mapView.getAllLayers()) + if (l instanceof GpxLayer) + return l; + return null; + } - private JCheckBox checkBox = new JCheckBox(tr("Raw GPS data")); - - public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) { - Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon)); - Main.worker.execute(task); - } - - public JCheckBox getCheckBox() { - return checkBox; + @Override protected void cancel() { + if (reader != null) + reader.cancel(); + } } - public String getPreferencesSuffix() { - return "gps"; + private JCheckBox checkBox = new JCheckBox(tr("Raw GPS data")); + + public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) { + Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon)); + Main.worker.execute(task); } - public void loadUrl(boolean a,java.lang.String b) { + public JCheckBox getCheckBox() { + return checkBox; + } + + public String getPreferencesSuffix() { + return "gps"; + } + + public void loadUrl(boolean a,java.lang.String b) { // FIXME this is not currently used } Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 1169) @@ -31,24 +31,24 @@ private static Bounds currentBounds; - private static class Task extends PleaseWaitRunnable { - private OsmServerReader reader; - private DataSet dataSet; - private boolean newLayer; + private static class Task extends PleaseWaitRunnable { + private OsmServerReader reader; + private DataSet dataSet; + private boolean newLayer; - public Task(boolean newLayer, OsmServerReader reader) { - super(tr("Downloading data")); - this.reader = reader; - this.newLayer = newLayer; - } + public Task(boolean newLayer, OsmServerReader reader) { + super(tr("Downloading data")); + this.reader = reader; + this.newLayer = newLayer; + } - @Override public void realRun() throws IOException, SAXException { - dataSet = reader.parseOsm(); - } + @Override public void realRun() throws IOException, SAXException { + dataSet = reader.parseOsm(); + } - @Override protected void finish() { - if (dataSet == null) - return; // user cancelled download or error occoured - if (dataSet.allPrimitives().isEmpty()) { - errorMessage = tr("No data imported."); + @Override protected void finish() { + if (dataSet == null) + return; // user cancelled download or error occoured + if (dataSet.allPrimitives().isEmpty()) { + errorMessage = tr("No data imported."); // need to synthesize a download bounds lest the visual indication of downloaded // area doesn't work @@ -56,48 +56,48 @@ } - OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer"), null); - if (newLayer) - Main.main.addLayer(layer); - else - Main.main.editLayer().mergeFrom(layer); - } + OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer"), null); + if (newLayer) + Main.main.addLayer(layer); + else + Main.main.editLayer().mergeFrom(layer); + } - @Override protected void cancel() { - if (reader != null) - reader.cancel(); - } - } - private JCheckBox checkBox = new JCheckBox(tr("OpenStreetMap data"), true); + @Override protected void cancel() { + if (reader != null) + reader.cancel(); + } + } + private JCheckBox checkBox = new JCheckBox(tr("OpenStreetMap data"), true); - public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) { - // Swap min and max if user has specified them the wrong way round - // (easy to do if you are crossing 0, for example) - // FIXME should perhaps be done in download dialog? - if (minlat > maxlat) { - double t = minlat; minlat = maxlat; maxlat = t; - } - if (minlon > maxlon) { - double t = minlon; minlon = maxlon; maxlon = t; - } - - Task task = new Task(action != null && (action.dialog == null || action.dialog.newLayer.isSelected()), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon)); + public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) { + // Swap min and max if user has specified them the wrong way round + // (easy to do if you are crossing 0, for example) + // FIXME should perhaps be done in download dialog? + if (minlat > maxlat) { + double t = minlat; minlat = maxlat; maxlat = t; + } + if (minlon > maxlon) { + double t = minlon; minlon = maxlon; maxlon = t; + } + + Task task = new Task(action != null && (action.dialog == null || action.dialog.newLayer.isSelected()), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon)); currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon)); - Main.worker.execute(task); + Main.worker.execute(task); } - + public void loadUrl(boolean new_layer, String url) { Task task = new Task(new_layer, new OsmServerLocationReader(url)); Main.worker.execute(task); } - - - - public JCheckBox getCheckBox() { - return checkBox; + + + + public JCheckBox getCheckBox() { + return checkBox; } - public String getPreferencesSuffix() { - return "osm"; + public String getPreferencesSuffix() { + return "osm"; } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 1169) @@ -36,96 +36,96 @@ public class DeleteAction extends MapMode { - /** - * Construct a new DeleteAction. Mnemonic is the delete - key. - * @param mapFrame The frame this action belongs to. - */ - public DeleteAction(MapFrame mapFrame) { - super(tr("Delete Mode"), - "delete", - tr("Delete nodes or ways."), - Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")), KeyEvent.VK_D, Shortcut.GROUP_EDIT), - mapFrame, - ImageProvider.getCursor("normal", "delete")); - } + /** + * Construct a new DeleteAction. Mnemonic is the delete - key. + * @param mapFrame The frame this action belongs to. + */ + public DeleteAction(MapFrame mapFrame) { + super(tr("Delete Mode"), + "delete", + tr("Delete nodes or ways."), + Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")), KeyEvent.VK_D, Shortcut.GROUP_EDIT), + mapFrame, + ImageProvider.getCursor("normal", "delete")); + } - @Override public void enterMode() { - super.enterMode(); - Main.map.mapView.addMouseListener(this); - } + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + } - @Override public void exitMode() { - super.exitMode(); - Main.map.mapView.removeMouseListener(this); - } + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + } - @Override public void actionPerformed(ActionEvent e) { - super.actionPerformed(e); - if(!Main.map.mapView.isDrawableLayer()) - return; - doActionPerformed(e); - } + @Override public void actionPerformed(ActionEvent e) { + super.actionPerformed(e); + if(!Main.map.mapView.isDrawableLayer()) + return; + doActionPerformed(e); + } - public void doActionPerformed(ActionEvent e) { - if(!Main.map.mapView.isDrawableLayer()) - return; - boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + public void doActionPerformed(ActionEvent e) { + if(!Main.map.mapView.isDrawableLayer()) + return; + boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; - Command c; - if (ctrl) { - c = DeleteCommand.deleteWithReferences(Main.ds.getSelected()); - } else { - c = DeleteCommand.delete(Main.ds.getSelected(), !alt); - } - if (c != null) { - Main.main.undoRedo.add(c); - } + Command c; + if (ctrl) { + c = DeleteCommand.deleteWithReferences(Main.ds.getSelected()); + } else { + c = DeleteCommand.delete(Main.ds.getSelected(), !alt); + } + if (c != null) { + Main.main.undoRedo.add(c); + } - Main.ds.setSelected(); - Main.map.repaint(); - } + Main.ds.setSelected(); + Main.map.repaint(); + } - /** - * If user clicked with the left button, delete the nearest object. - * position. - */ - @Override public void mouseClicked(MouseEvent e) { - if (e.getButton() != MouseEvent.BUTTON1) - return; - if(!Main.map.mapView.isDrawableLayer()) - return; - boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + /** + * If user clicked with the left button, delete the nearest object. + * position. + */ + @Override public void mouseClicked(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON1) + return; + if(!Main.map.mapView.isDrawableLayer()) + return; + boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; + boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; - OsmPrimitive sel = Main.map.mapView.getNearestNode(e.getPoint()); - Command c = null; - if (sel == null) { - WaySegment ws = Main.map.mapView.getNearestWaySegment(e.getPoint()); - if (ws != null) { - if (shift) { - c = DeleteCommand.deleteWaySegment(ws); - } else if (ctrl) { - c = DeleteCommand.deleteWithReferences(Collections.singleton((OsmPrimitive)ws.way)); - } else { - c = DeleteCommand.delete(Collections.singleton((OsmPrimitive)ws.way), !alt); - } - } - } else if (ctrl) { - c = DeleteCommand.deleteWithReferences(Collections.singleton(sel)); - } else { - c = DeleteCommand.delete(Collections.singleton(sel), !alt); - } - if (c != null) { - Main.main.undoRedo.add(c); - } + OsmPrimitive sel = Main.map.mapView.getNearestNode(e.getPoint()); + Command c = null; + if (sel == null) { + WaySegment ws = Main.map.mapView.getNearestWaySegment(e.getPoint()); + if (ws != null) { + if (shift) { + c = DeleteCommand.deleteWaySegment(ws); + } else if (ctrl) { + c = DeleteCommand.deleteWithReferences(Collections.singleton((OsmPrimitive)ws.way)); + } else { + c = DeleteCommand.delete(Collections.singleton((OsmPrimitive)ws.way), !alt); + } + } + } else if (ctrl) { + c = DeleteCommand.deleteWithReferences(Collections.singleton(sel)); + } else { + c = DeleteCommand.delete(Collections.singleton(sel), !alt); + } + if (c != null) { + Main.main.undoRedo.add(c); + } - Main.ds.setSelected(); - Main.map.mapView.repaint(); - } + Main.ds.setSelected(); + Main.map.mapView.repaint(); + } - @Override public String getModeHelpText() { - return tr("Click to delete. Shift: delete way segment. Alt: don't delete unused nodes when deleting a way. Ctrl: delete referring objects."); - } + @Override public String getModeHelpText() { + return tr("Click to delete. Shift: delete way segment. Alt: don't delete unused nodes when deleting a way. Ctrl: delete referring objects."); + } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 1169) @@ -58,578 +58,578 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, AWTEventListener { - private static Node lastUsedNode = null; - private double PHI=Math.toRadians(90); - - private boolean ctrl; - private boolean alt; - private boolean shift; - private boolean mouseOnExistingNode; - private boolean drawHelperLine; - private Point mousePos; - private Color selectedColor; - - private Node currentBaseNode; - private EastNorth currentMouseEastNorth; - - public DrawAction(MapFrame mapFrame) { - super(tr("Draw"), "node/autonode", tr("Draw nodes"), - Shortcut.registerShortcut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, Shortcut.GROUP_EDIT), - mapFrame, getCursor()); - - // Add extra shortcut N - Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( - Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw")); - - //putValue("help", "Action/AddNode/Autnode"); - selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW); - - drawHelperLine = Main.pref.getBoolean("draw.helper-line", true); - } - - private static Cursor getCursor() { - try { - return ImageProvider.getCursor("crosshair", null); + private static Node lastUsedNode = null; + private double PHI=Math.toRadians(90); + + private boolean ctrl; + private boolean alt; + private boolean shift; + private boolean mouseOnExistingNode; + private boolean drawHelperLine; + private Point mousePos; + private Color selectedColor; + + private Node currentBaseNode; + private EastNorth currentMouseEastNorth; + + public DrawAction(MapFrame mapFrame) { + super(tr("Draw"), "node/autonode", tr("Draw nodes"), + Shortcut.registerShortcut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, Shortcut.GROUP_EDIT), + mapFrame, getCursor()); + + // Add extra shortcut N + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw")); + + //putValue("help", "Action/AddNode/Autnode"); + selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW); + + drawHelperLine = Main.pref.getBoolean("draw.helper-line", true); + } + + private static Cursor getCursor() { + try { + return ImageProvider.getCursor("crosshair", null); } catch (Exception e) { } - return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR); - } - - @Override public void enterMode() { - super.enterMode(); - Main.map.mapView.addMouseListener(this); - Main.map.mapView.addMouseMotionListener(this); - Main.map.mapView.addTemporaryLayer(this); - DataSet.selListeners.add(this); - try { - Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); - } catch (SecurityException ex) { - } - // would like to but haven't got mouse position yet: - // computeHelperLine(false, false, false); - } - @Override public void exitMode() { - super.exitMode(); - Main.map.mapView.removeMouseListener(this); - Main.map.mapView.removeMouseMotionListener(this); - Main.map.mapView.removeTemporaryLayer(this); - DataSet.selListeners.remove(this); - try { - Toolkit.getDefaultToolkit().removeAWTEventListener(this); - } catch (SecurityException ex) { - } - } - - /** - * redraw to (possibly) get rid of helper line if selection changes. - */ - public void eventDispatched(AWTEvent event) { - if(!Main.map.mapView.isDrawableLayer()) - return; - InputEvent e = (InputEvent) event; - ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; - shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - computeHelperLine(); - } - /** - * redraw to (possibly) get rid of helper line if selection changes. - */ - public void selectionChanged(Collection newSelection) { - if(!Main.map.mapView.isDrawableLayer()) - return; - computeHelperLine(); - } - - /** - * If user clicked with the left button, add a node at the current mouse - * position. - * - * If in nodeway mode, insert the node into the way. - */ - @Override public void mouseClicked(MouseEvent e) { - - if (e.getButton() != MouseEvent.BUTTON1) - return; - if(!Main.map.mapView.isDrawableLayer()) - return; - - // we copy ctrl/alt/shift from the event just in case our global - // AWTEvent didn't make it through the security manager. Unclear - // if that can ever happen but better be safe. - ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; - shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - mousePos = e.getPoint(); - - Collection selection = Main.ds.getSelected(); - Collection cmds = new LinkedList(); - - ArrayList reuseWays = new ArrayList(), - replacedWays = new ArrayList(); - boolean newNode = false; - Node n = null; - - if (!ctrl) { - n = Main.map.mapView.getNearestNode(mousePos); - } - - if (n != null) { - // user clicked on node - if (shift || selection.isEmpty()) { - // select the clicked node and do nothing else - // (this is just a convenience option so that people don't - // have to switch modes) - Main.ds.setSelected(n); - return; - } - - } else { - // no node found in clicked area - n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY())); - if (n.coor.isOutSideWorld()) { - JOptionPane.showMessageDialog(Main.parent, - tr("Cannot add a node outside of the world.")); - return; - } - newNode = true; - - cmds.add(new AddCommand(n)); - - if (!ctrl) { - // Insert the node into all the nearby way segments - List wss = Main.map.mapView.getNearestWaySegments(e.getPoint()); - Map> insertPoints = new HashMap>(); - for (WaySegment ws : wss) { - List is; - if (insertPoints.containsKey(ws.way)) { - is = insertPoints.get(ws.way); - } else { - is = new ArrayList(); - insertPoints.put(ws.way, is); - } - - is.add(ws.lowerIndex); - } - - Set> segSet = new HashSet>(); - - for (Map.Entry> insertPoint : insertPoints.entrySet()) { - Way w = insertPoint.getKey(); - List is = insertPoint.getValue(); - - Way wnew = new Way(w); - - pruneSuccsAndReverse(is); - for (int i : is) segSet.add( - Pair.sort(new Pair(w.nodes.get(i), w.nodes.get(i+1)))); - for (int i : is) wnew.nodes.add(i + 1, n); - - cmds.add(new ChangeCommand(insertPoint.getKey(), wnew)); - replacedWays.add(insertPoint.getKey()); - reuseWays.add(wnew); - } - - adjustNode(segSet, n); - } - } - - // This part decides whether or not a "segment" (i.e. a connection) is made to an - // existing node. - - // For a connection to be made, the user must either have a node selected (connection - // is made to that node), or he must have a way selected *and* one of the endpoints - // of that way must be the last used node (connection is made to last used node), or - // he must have a way and a node selected (connection is made to the selected node). - - boolean extendedWay = false; - - if (!shift && selection.size() > 0 && selection.size() < 3) { - - Node selectedNode = null; - Way selectedWay = null; - - for (OsmPrimitive p : selection) { - if (p instanceof Node) { - if (selectedNode != null) return; - selectedNode = (Node) p; - } else if (p instanceof Way) { - if (selectedWay != null) return; - selectedWay = (Way) p; - } - } - - // the node from which we make a connection - Node n0 = null; - - if (selectedNode == null) { - if (selectedWay == null) return; - if (lastUsedNode == selectedWay.nodes.get(0) || lastUsedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { - n0 = lastUsedNode; - } - } else if (selectedWay == null) { - n0 = selectedNode; - } else { - if (selectedNode == selectedWay.nodes.get(0) || selectedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { - n0 = selectedNode; - } - } - - if (n0 == null || n0 == n) { - return; // Don't create zero length way segments. - } - - // Ok we know now that we'll insert a line segment, but will it connect to an - // existing way or make a new way of its own? The "alt" modifier means that the - // user wants a new way. - - Way way = alt ? null : (selectedWay != null) ? selectedWay : getWayForNode(n0); - if (way == null) { - way = new Way(); - way.nodes.add(n0); - cmds.add(new AddCommand(way)); - } else { - int i; - if ((i = replacedWays.indexOf(way)) != -1) { - way = reuseWays.get(i); - } else { - Way wnew = new Way(way); - cmds.add(new ChangeCommand(way, wnew)); - way = wnew; - } - } - - if (way.nodes.get(way.nodes.size() - 1) == n0) { - way.nodes.add(n); - } else { - way.nodes.add(0, n); - } - - extendedWay = true; - Main.ds.setSelected(way); - } - - String title; - if (!extendedWay && !newNode) { - return; // We didn't do anything. - } else if (!extendedWay) { - if (reuseWays.isEmpty()) { - title = tr("Add node"); - } else { - title = tr("Add node into way"); - } - for (Way w : reuseWays) w.selected = false; - Main.ds.setSelected(n); - } else if (!newNode) { - title = tr("Connect existing way to node"); - } else if (reuseWays.isEmpty()) { - title = tr("Add a new node to an existing way"); - } else { - title = tr("Add node into way and connect"); - } - - Command c = new SequenceCommand(title, cmds); - - Main.main.undoRedo.add(c); - lastUsedNode = n; - computeHelperLine(); - Main.map.mapView.repaint(); - } - - @Override public void mouseMoved(MouseEvent e) { - if(!Main.map.mapView.isDrawableLayer()) - return; - - // we copy ctrl/alt/shift from the event just in case our global - // AWTEvent didn't make it through the security manager. Unclear - // if that can ever happen but better be safe. - - ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; - shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - mousePos = e.getPoint(); - - computeHelperLine(); - } - - /** - * This method prepares data required for painting the "helper line" from - * the last used position to the mouse cursor. It duplicates some code from - * mouseClicked() (FIXME). - */ - private void computeHelperLine() { - if (mousePos == null) { - // Don't draw the line. - currentMouseEastNorth = null; - currentBaseNode = null; - return; - } - - double distance = -1; - double angle = -1; - - Collection selection = Main.ds.getSelected(); - - Node selectedNode = null; - Way selectedWay = null; - Node currentMouseNode = null; - mouseOnExistingNode = false; - - Main.map.statusLine.setAngle(-1); - Main.map.statusLine.setHeading(-1); - Main.map.statusLine.setDist(-1); - - if (!ctrl && mousePos != null) { - currentMouseNode = Main.map.mapView.getNearestNode(mousePos); - } - - if (currentMouseNode != null) { - // user clicked on node - if (selection.isEmpty()) return; - currentMouseEastNorth = currentMouseNode.eastNorth; - mouseOnExistingNode = true; - } else { - // no node found in clicked area - currentMouseEastNorth = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y); - } - - for (OsmPrimitive p : selection) { - if (p instanceof Node) { - if (selectedNode != null) return; - selectedNode = (Node) p; - } else if (p instanceof Way) { - if (selectedWay != null) return; - selectedWay = (Way) p; - } - } - - // the node from which we make a connection - currentBaseNode = null; - Node previousNode = null; - - if (selectedNode == null) { - if (selectedWay == null) return; - if (lastUsedNode == selectedWay.nodes.get(0) || lastUsedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { - currentBaseNode = lastUsedNode; - if (lastUsedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1) && selectedWay.nodes.size() > 1) { - previousNode = selectedWay.nodes.get(selectedWay.nodes.size()-2); - } - } - } else if (selectedWay == null) { - currentBaseNode = selectedNode; - } else { - if (selectedNode == selectedWay.nodes.get(0) || selectedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { - currentBaseNode = selectedNode; - } - } - - if (currentBaseNode == null || currentBaseNode == currentMouseNode) { - return; // Don't create zero length way segments. - } - - // find out the distance, in metres, between the base point and the mouse cursor - LatLon mouseLatLon = Main.proj.eastNorth2latlon(currentMouseEastNorth); - distance = currentBaseNode.coor.greatCircleDistance(mouseLatLon); - double hdg = Math.toDegrees(currentBaseNode.coor.heading(mouseLatLon)); - if (previousNode != null) { - angle = hdg - Math.toDegrees(previousNode.coor.heading(currentBaseNode.coor)); - if (angle < 0) angle += 360; - } - Main.map.statusLine.setAngle(angle); - Main.map.statusLine.setHeading(hdg); - Main.map.statusLine.setDist(distance); - updateStatusLine(); - - if (!drawHelperLine) return; - - Main.map.mapView.repaint(); - } - - /** - * Repaint on mouse exit so that the helper line goes away. - */ - @Override public void mouseExited(MouseEvent e) { - if(!Main.map.mapView.isDrawableLayer()) - return; - mousePos = e.getPoint(); - Main.map.mapView.repaint(); - } - - /** - * @return If the node is the end of exactly one way, return this. - * null otherwise. - */ - public static Way getWayForNode(Node n) { - Way way = null; - for (Way w : Main.ds.ways) { - if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; - Node firstNode = w.nodes.get(0); - Node lastNode = w.nodes.get(w.nodes.size() - 1); - if ((firstNode == n || lastNode == n) && (firstNode != lastNode)) { - if (way != null) - return null; - way = w; - } - } - return way; - } - - private static void pruneSuccsAndReverse(List is) { - //if (is.size() < 2) return; - - HashSet is2 = new HashSet(); - for (int i : is) { - if (!is2.contains(i - 1) && !is2.contains(i + 1)) { - is2.add(i); - } - } - is.clear(); - is.addAll(is2); - Collections.sort(is); - Collections.reverse(is); - } - - /** - * Adjusts the position of a node to lie on a segment (or a segment - * intersection). - * - * If one or more than two segments are passed, the node is adjusted - * to lie on the first segment that is passed. - * - * If two segments are passed, the node is adjusted to be at their - * intersection. - * - * No action is taken if no segments are passed. - * - * @param segs the segments to use as a reference when adjusting - * @param n the node to adjust - */ - private static void adjustNode(Collection> segs, Node n) { - - switch (segs.size()) { - case 0: - return; - case 2: - // This computes the intersection between - // the two segments and adjusts the node position. - Iterator> i = segs.iterator(); - Pair seg = i.next(); - EastNorth A = seg.a.eastNorth; - EastNorth B = seg.b.eastNorth; - seg = i.next(); - EastNorth C = seg.a.eastNorth; - EastNorth D = seg.b.eastNorth; - - double u=det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north()); - - // Check for parallel segments and do nothing if they are - // In practice this will probably only happen when a way has been duplicated - - if (u == 0) return; - - // q is a number between 0 and 1 - // It is the point in the segment where the intersection occurs - // if the segment is scaled to lenght 1 - - double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u; - EastNorth intersection = new EastNorth( - B.east() + q * (A.east() - B.east()), - B.north() + q * (A.north() - B.north())); - - int snapToIntersectionThreshold=0; - try { snapToIntersectionThreshold = Integer.parseInt(Main.pref.get("edit.snap-intersection-threshold","10")); } catch (NumberFormatException x) {} - - // only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise - // fall through to default action. - // (for semi-parallel lines, intersection might be miles away!) - if (Main.map.mapView.getPoint(n.eastNorth).distance(Main.map.mapView.getPoint(intersection)) < snapToIntersectionThreshold) { - n.eastNorth = intersection; - return; - } - - default: - EastNorth P = n.eastNorth; - seg = segs.iterator().next(); - A = seg.a.eastNorth; - B = seg.b.eastNorth; - double a = P.distanceSq(B); - double b = P.distanceSq(A); - double c = A.distanceSq(B); + return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR); + } + + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addMouseMotionListener(this); + Main.map.mapView.addTemporaryLayer(this); + DataSet.selListeners.add(this); + try { + Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); + } catch (SecurityException ex) { + } + // would like to but haven't got mouse position yet: + // computeHelperLine(false, false, false); + } + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeMouseMotionListener(this); + Main.map.mapView.removeTemporaryLayer(this); + DataSet.selListeners.remove(this); + try { + Toolkit.getDefaultToolkit().removeAWTEventListener(this); + } catch (SecurityException ex) { + } + } + + /** + * redraw to (possibly) get rid of helper line if selection changes. + */ + public void eventDispatched(AWTEvent event) { + if(!Main.map.mapView.isDrawableLayer()) + return; + InputEvent e = (InputEvent) event; + ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; + computeHelperLine(); + } + /** + * redraw to (possibly) get rid of helper line if selection changes. + */ + public void selectionChanged(Collection newSelection) { + if(!Main.map.mapView.isDrawableLayer()) + return; + computeHelperLine(); + } + + /** + * If user clicked with the left button, add a node at the current mouse + * position. + * + * If in nodeway mode, insert the node into the way. + */ + @Override public void mouseClicked(MouseEvent e) { + + if (e.getButton() != MouseEvent.BUTTON1) + return; + if(!Main.map.mapView.isDrawableLayer()) + return; + + // we copy ctrl/alt/shift from the event just in case our global + // AWTEvent didn't make it through the security manager. Unclear + // if that can ever happen but better be safe. + ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; + mousePos = e.getPoint(); + + Collection selection = Main.ds.getSelected(); + Collection cmds = new LinkedList(); + + ArrayList reuseWays = new ArrayList(), + replacedWays = new ArrayList(); + boolean newNode = false; + Node n = null; + + if (!ctrl) { + n = Main.map.mapView.getNearestNode(mousePos); + } + + if (n != null) { + // user clicked on node + if (shift || selection.isEmpty()) { + // select the clicked node and do nothing else + // (this is just a convenience option so that people don't + // have to switch modes) + Main.ds.setSelected(n); + return; + } + + } else { + // no node found in clicked area + n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY())); + if (n.coor.isOutSideWorld()) { + JOptionPane.showMessageDialog(Main.parent, + tr("Cannot add a node outside of the world.")); + return; + } + newNode = true; + + cmds.add(new AddCommand(n)); + + if (!ctrl) { + // Insert the node into all the nearby way segments + List wss = Main.map.mapView.getNearestWaySegments(e.getPoint()); + Map> insertPoints = new HashMap>(); + for (WaySegment ws : wss) { + List is; + if (insertPoints.containsKey(ws.way)) { + is = insertPoints.get(ws.way); + } else { + is = new ArrayList(); + insertPoints.put(ws.way, is); + } + + is.add(ws.lowerIndex); + } + + Set> segSet = new HashSet>(); + + for (Map.Entry> insertPoint : insertPoints.entrySet()) { + Way w = insertPoint.getKey(); + List is = insertPoint.getValue(); + + Way wnew = new Way(w); + + pruneSuccsAndReverse(is); + for (int i : is) segSet.add( + Pair.sort(new Pair(w.nodes.get(i), w.nodes.get(i+1)))); + for (int i : is) wnew.nodes.add(i + 1, n); + + cmds.add(new ChangeCommand(insertPoint.getKey(), wnew)); + replacedWays.add(insertPoint.getKey()); + reuseWays.add(wnew); + } + + adjustNode(segSet, n); + } + } + + // This part decides whether or not a "segment" (i.e. a connection) is made to an + // existing node. + + // For a connection to be made, the user must either have a node selected (connection + // is made to that node), or he must have a way selected *and* one of the endpoints + // of that way must be the last used node (connection is made to last used node), or + // he must have a way and a node selected (connection is made to the selected node). + + boolean extendedWay = false; + + if (!shift && selection.size() > 0 && selection.size() < 3) { + + Node selectedNode = null; + Way selectedWay = null; + + for (OsmPrimitive p : selection) { + if (p instanceof Node) { + if (selectedNode != null) return; + selectedNode = (Node) p; + } else if (p instanceof Way) { + if (selectedWay != null) return; + selectedWay = (Way) p; + } + } + + // the node from which we make a connection + Node n0 = null; + + if (selectedNode == null) { + if (selectedWay == null) return; + if (lastUsedNode == selectedWay.nodes.get(0) || lastUsedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { + n0 = lastUsedNode; + } + } else if (selectedWay == null) { + n0 = selectedNode; + } else { + if (selectedNode == selectedWay.nodes.get(0) || selectedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { + n0 = selectedNode; + } + } + + if (n0 == null || n0 == n) { + return; // Don't create zero length way segments. + } + + // Ok we know now that we'll insert a line segment, but will it connect to an + // existing way or make a new way of its own? The "alt" modifier means that the + // user wants a new way. + + Way way = alt ? null : (selectedWay != null) ? selectedWay : getWayForNode(n0); + if (way == null) { + way = new Way(); + way.nodes.add(n0); + cmds.add(new AddCommand(way)); + } else { + int i; + if ((i = replacedWays.indexOf(way)) != -1) { + way = reuseWays.get(i); + } else { + Way wnew = new Way(way); + cmds.add(new ChangeCommand(way, wnew)); + way = wnew; + } + } + + if (way.nodes.get(way.nodes.size() - 1) == n0) { + way.nodes.add(n); + } else { + way.nodes.add(0, n); + } + + extendedWay = true; + Main.ds.setSelected(way); + } + + String title; + if (!extendedWay && !newNode) { + return; // We didn't do anything. + } else if (!extendedWay) { + if (reuseWays.isEmpty()) { + title = tr("Add node"); + } else { + title = tr("Add node into way"); + } + for (Way w : reuseWays) w.selected = false; + Main.ds.setSelected(n); + } else if (!newNode) { + title = tr("Connect existing way to node"); + } else if (reuseWays.isEmpty()) { + title = tr("Add a new node to an existing way"); + } else { + title = tr("Add node into way and connect"); + } + + Command c = new SequenceCommand(title, cmds); + + Main.main.undoRedo.add(c); + lastUsedNode = n; + computeHelperLine(); + Main.map.mapView.repaint(); + } + + @Override public void mouseMoved(MouseEvent e) { + if(!Main.map.mapView.isDrawableLayer()) + return; + + // we copy ctrl/alt/shift from the event just in case our global + // AWTEvent didn't make it through the security manager. Unclear + // if that can ever happen but better be safe. + + ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; + mousePos = e.getPoint(); + + computeHelperLine(); + } + + /** + * This method prepares data required for painting the "helper line" from + * the last used position to the mouse cursor. It duplicates some code from + * mouseClicked() (FIXME). + */ + private void computeHelperLine() { + if (mousePos == null) { + // Don't draw the line. + currentMouseEastNorth = null; + currentBaseNode = null; + return; + } + + double distance = -1; + double angle = -1; + + Collection selection = Main.ds.getSelected(); + + Node selectedNode = null; + Way selectedWay = null; + Node currentMouseNode = null; + mouseOnExistingNode = false; + + Main.map.statusLine.setAngle(-1); + Main.map.statusLine.setHeading(-1); + Main.map.statusLine.setDist(-1); + + if (!ctrl && mousePos != null) { + currentMouseNode = Main.map.mapView.getNearestNode(mousePos); + } + + if (currentMouseNode != null) { + // user clicked on node + if (selection.isEmpty()) return; + currentMouseEastNorth = currentMouseNode.eastNorth; + mouseOnExistingNode = true; + } else { + // no node found in clicked area + currentMouseEastNorth = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y); + } + + for (OsmPrimitive p : selection) { + if (p instanceof Node) { + if (selectedNode != null) return; + selectedNode = (Node) p; + } else if (p instanceof Way) { + if (selectedWay != null) return; + selectedWay = (Way) p; + } + } + + // the node from which we make a connection + currentBaseNode = null; + Node previousNode = null; + + if (selectedNode == null) { + if (selectedWay == null) return; + if (lastUsedNode == selectedWay.nodes.get(0) || lastUsedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { + currentBaseNode = lastUsedNode; + if (lastUsedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1) && selectedWay.nodes.size() > 1) { + previousNode = selectedWay.nodes.get(selectedWay.nodes.size()-2); + } + } + } else if (selectedWay == null) { + currentBaseNode = selectedNode; + } else { + if (selectedNode == selectedWay.nodes.get(0) || selectedNode == selectedWay.nodes.get(selectedWay.nodes.size()-1)) { + currentBaseNode = selectedNode; + } + } + + if (currentBaseNode == null || currentBaseNode == currentMouseNode) { + return; // Don't create zero length way segments. + } + + // find out the distance, in metres, between the base point and the mouse cursor + LatLon mouseLatLon = Main.proj.eastNorth2latlon(currentMouseEastNorth); + distance = currentBaseNode.coor.greatCircleDistance(mouseLatLon); + double hdg = Math.toDegrees(currentBaseNode.coor.heading(mouseLatLon)); + if (previousNode != null) { + angle = hdg - Math.toDegrees(previousNode.coor.heading(currentBaseNode.coor)); + if (angle < 0) angle += 360; + } + Main.map.statusLine.setAngle(angle); + Main.map.statusLine.setHeading(hdg); + Main.map.statusLine.setDist(distance); + updateStatusLine(); + + if (!drawHelperLine) return; + + Main.map.mapView.repaint(); + } + + /** + * Repaint on mouse exit so that the helper line goes away. + */ + @Override public void mouseExited(MouseEvent e) { + if(!Main.map.mapView.isDrawableLayer()) + return; + mousePos = e.getPoint(); + Main.map.mapView.repaint(); + } + + /** + * @return If the node is the end of exactly one way, return this. + * null otherwise. + */ + public static Way getWayForNode(Node n) { + Way way = null; + for (Way w : Main.ds.ways) { + if (w.deleted || w.incomplete || w.nodes.size() < 1) continue; + Node firstNode = w.nodes.get(0); + Node lastNode = w.nodes.get(w.nodes.size() - 1); + if ((firstNode == n || lastNode == n) && (firstNode != lastNode)) { + if (way != null) + return null; + way = w; + } + } + return way; + } + + private static void pruneSuccsAndReverse(List is) { + //if (is.size() < 2) return; + + HashSet is2 = new HashSet(); + for (int i : is) { + if (!is2.contains(i - 1) && !is2.contains(i + 1)) { + is2.add(i); + } + } + is.clear(); + is.addAll(is2); + Collections.sort(is); + Collections.reverse(is); + } + + /** + * Adjusts the position of a node to lie on a segment (or a segment + * intersection). + * + * If one or more than two segments are passed, the node is adjusted + * to lie on the first segment that is passed. + * + * If two segments are passed, the node is adjusted to be at their + * intersection. + * + * No action is taken if no segments are passed. + * + * @param segs the segments to use as a reference when adjusting + * @param n the node to adjust + */ + private static void adjustNode(Collection> segs, Node n) { + + switch (segs.size()) { + case 0: + return; + case 2: + // This computes the intersection between + // the two segments and adjusts the node position. + Iterator> i = segs.iterator(); + Pair seg = i.next(); + EastNorth A = seg.a.eastNorth; + EastNorth B = seg.b.eastNorth; + seg = i.next(); + EastNorth C = seg.a.eastNorth; + EastNorth D = seg.b.eastNorth; + + double u=det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north()); + + // Check for parallel segments and do nothing if they are + // In practice this will probably only happen when a way has been duplicated + + if (u == 0) return; + + // q is a number between 0 and 1 + // It is the point in the segment where the intersection occurs + // if the segment is scaled to lenght 1 + + double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u; + EastNorth intersection = new EastNorth( + B.east() + q * (A.east() - B.east()), + B.north() + q * (A.north() - B.north())); + + int snapToIntersectionThreshold=0; + try { snapToIntersectionThreshold = Integer.parseInt(Main.pref.get("edit.snap-intersection-threshold","10")); } catch (NumberFormatException x) {} + + // only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise + // fall through to default action. + // (for semi-parallel lines, intersection might be miles away!) + if (Main.map.mapView.getPoint(n.eastNorth).distance(Main.map.mapView.getPoint(intersection)) < snapToIntersectionThreshold) { + n.eastNorth = intersection; + return; + } + + default: + EastNorth P = n.eastNorth; + seg = segs.iterator().next(); + A = seg.a.eastNorth; + B = seg.b.eastNorth; + double a = P.distanceSq(B); + double b = P.distanceSq(A); + double c = A.distanceSq(B); q = (a - b + c) / (2*c); - n.eastNorth = new EastNorth( - B.east() + q * (A.east() - B.east()), - B.north() + q * (A.north() - B.north())); - } - } - - // helper for adjustNode - static double det(double a, double b, double c, double d) - { - return a * d - b * c; - } - - public void paint(Graphics g, MapView mv) { - - // don't draw line if disabled in prefs - if (!drawHelperLine) return; - - // sanity checks - if (Main.map.mapView == null) return; - if (mousePos == null) return; - - // if shift key is held ("no auto-connect"), don't draw a line - if (shift) return; - - // don't draw line if we don't know where from or where to - if (currentBaseNode == null) return; - if (currentMouseEastNorth == null) return; - - // don't draw line if mouse is outside window - if (!Main.map.mapView.getBounds().contains(mousePos)) return; - - Graphics2D g2 = (Graphics2D) g; - g2.setColor(selectedColor); - g2.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); - GeneralPath b = new GeneralPath(); - Point p1=mv.getPoint(currentBaseNode.eastNorth); - Point p2=mv.getPoint(currentMouseEastNorth); - - double t = Math.atan2(p2.y-p1.y, p2.x-p1.x) + Math.PI; - - b.moveTo(p1.x,p1.y); b.lineTo(p2.x, p2.y); - - // if alt key is held ("start new way"), draw a little perpendicular line - if (alt) { - b.moveTo((int)(p1.x + 8*Math.cos(t+PHI)), (int)(p1.y + 8*Math.sin(t+PHI))); - b.lineTo((int)(p1.x + 8*Math.cos(t-PHI)), (int)(p1.y + 8*Math.sin(t-PHI))); - } - - g2.draw(b); - g2.setStroke(new BasicStroke(1)); - - } - - @Override public String getModeHelpText() { - String rv; - - if (currentBaseNode != null && !shift) { - if (mouseOnExistingNode) { - if (alt && /* FIXME: way exists */true) - rv = tr("Click to create a new way to the existing node."); - else - rv =tr("Click to make a connection to the existing node."); - } else { - if (alt && /* FIXME: way exists */true) - rv = tr("Click to insert a node and create a new way."); - else - rv = tr("Click to insert a new node and make a connection."); - } - } - else { - rv = tr("Click to insert a new node."); - } - - //rv.append(tr("Click to add a new node. Ctrl: no node re-use/auto-insert. Shift: no auto-connect. Alt: new way")); - //rv.append(tr("Click to add a new node. Ctrl: no node re-use/auto-insert. Shift: no auto-connect. Alt: new way")); - return rv.toString(); - } + n.eastNorth = new EastNorth( + B.east() + q * (A.east() - B.east()), + B.north() + q * (A.north() - B.north())); + } + } + + // helper for adjustNode + static double det(double a, double b, double c, double d) + { + return a * d - b * c; + } + + public void paint(Graphics g, MapView mv) { + + // don't draw line if disabled in prefs + if (!drawHelperLine) return; + + // sanity checks + if (Main.map.mapView == null) return; + if (mousePos == null) return; + + // if shift key is held ("no auto-connect"), don't draw a line + if (shift) return; + + // don't draw line if we don't know where from or where to + if (currentBaseNode == null) return; + if (currentMouseEastNorth == null) return; + + // don't draw line if mouse is outside window + if (!Main.map.mapView.getBounds().contains(mousePos)) return; + + Graphics2D g2 = (Graphics2D) g; + g2.setColor(selectedColor); + g2.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); + GeneralPath b = new GeneralPath(); + Point p1=mv.getPoint(currentBaseNode.eastNorth); + Point p2=mv.getPoint(currentMouseEastNorth); + + double t = Math.atan2(p2.y-p1.y, p2.x-p1.x) + Math.PI; + + b.moveTo(p1.x,p1.y); b.lineTo(p2.x, p2.y); + + // if alt key is held ("start new way"), draw a little perpendicular line + if (alt) { + b.moveTo((int)(p1.x + 8*Math.cos(t+PHI)), (int)(p1.y + 8*Math.sin(t+PHI))); + b.lineTo((int)(p1.x + 8*Math.cos(t-PHI)), (int)(p1.y + 8*Math.sin(t-PHI))); + } + + g2.draw(b); + g2.setStroke(new BasicStroke(1)); + + } + + @Override public String getModeHelpText() { + String rv; + + if (currentBaseNode != null && !shift) { + if (mouseOnExistingNode) { + if (alt && /* FIXME: way exists */true) + rv = tr("Click to create a new way to the existing node."); + else + rv =tr("Click to make a connection to the existing node."); + } else { + if (alt && /* FIXME: way exists */true) + rv = tr("Click to insert a node and create a new way."); + else + rv = tr("Click to insert a new node and make a connection."); + } + } + else { + rv = tr("Click to insert a new node."); + } + + //rv.append(tr("Click to add a new node. Ctrl: no node re-use/auto-insert. Shift: no auto-connect. Alt: new way")); + //rv.append(tr("Click to add a new node. Ctrl: no node re-use/auto-insert. Shift: no auto-connect. Alt: new way")); + return rv.toString(); + } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 1169) @@ -40,227 +40,227 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable { - enum Mode { EXTRUDE, rotate, select } - private Mode mode = null; - private long mouseDownTime = 0; - private WaySegment selectedSegment = null; - private Color selectedColor; - - double xoff; - double yoff; - double distance; - - /** - * The old cursor before the user pressed the mouse button. - */ - private Cursor oldCursor; - /** - * The current position of the mouse - */ - private Point mousePos; - /** - * The position of the mouse cursor when the drag action was initiated. - */ - private Point initialMousePos; - /** - * The time which needs to pass between click and release before something - * counts as a move, in milliseconds - */ - private int initialMoveDelay = 200; - - /** - * Create a new SelectAction - * @param mapFrame The MapFrame this action belongs to. - */ - public ExtrudeAction(MapFrame mapFrame) { - super(tr("Extrude"), "extrude/extrude", tr("Create areas"), - Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.GROUP_EDIT), - mapFrame, - getCursor("normal", "rectangle", Cursor.DEFAULT_CURSOR)); - putValue("help", "Action/Extrude/Extrude"); - initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200); - selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW); - } - - private static Cursor getCursor(String name, String mod, int def) { - try { - return ImageProvider.getCursor(name, mod); + enum Mode { EXTRUDE, rotate, select } + private Mode mode = null; + private long mouseDownTime = 0; + private WaySegment selectedSegment = null; + private Color selectedColor; + + double xoff; + double yoff; + double distance; + + /** + * The old cursor before the user pressed the mouse button. + */ + private Cursor oldCursor; + /** + * The current position of the mouse + */ + private Point mousePos; + /** + * The position of the mouse cursor when the drag action was initiated. + */ + private Point initialMousePos; + /** + * The time which needs to pass between click and release before something + * counts as a move, in milliseconds + */ + private int initialMoveDelay = 200; + + /** + * Create a new SelectAction + * @param mapFrame The MapFrame this action belongs to. + */ + public ExtrudeAction(MapFrame mapFrame) { + super(tr("Extrude"), "extrude/extrude", tr("Create areas"), + Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.GROUP_EDIT), + mapFrame, + getCursor("normal", "rectangle", Cursor.DEFAULT_CURSOR)); + putValue("help", "Action/Extrude/Extrude"); + initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200); + selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW); + } + + private static Cursor getCursor(String name, String mod, int def) { + try { + return ImageProvider.getCursor(name, mod); } catch (Exception e) { } - return Cursor.getPredefinedCursor(def); - } - - private void setCursor(Cursor c) { - if (oldCursor == null) { - oldCursor = Main.map.mapView.getCursor(); - Main.map.mapView.setCursor(c); - } - } - - private void restoreCursor() { - if (oldCursor != null) { - Main.map.mapView.setCursor(oldCursor); - oldCursor = null; - } - } - - @Override public void enterMode() { - super.enterMode(); - Main.map.mapView.addMouseListener(this); - Main.map.mapView.addMouseMotionListener(this); - } - - @Override public void exitMode() { - super.exitMode(); - Main.map.mapView.removeMouseListener(this); - Main.map.mapView.removeMouseMotionListener(this); - Main.map.mapView.removeTemporaryLayer(this); - - } - - /** - * If the left mouse button is pressed, move all currently selected - * objects (if one of them is under the mouse) or the current one under the - * mouse (which will become selected). - */ - @Override public void mouseDragged(MouseEvent e) { - if (mode == Mode.select) return; - - // do not count anything as a move if it lasts less than 100 milliseconds. - if ((mode == Mode.EXTRUDE) && (System.currentTimeMillis() - mouseDownTime < initialMoveDelay)) return; - - if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) - return; - - if (mode == Mode.EXTRUDE) { - setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); - } - - if (mousePos == null) { - mousePos = e.getPoint(); - return; - } - - Main.map.mapView.repaint(); - mousePos = e.getPoint(); - - } - - public void paint(Graphics g, MapView mv) { - if (selectedSegment != null) { - Node n1 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex); - Node n2 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex+1); - - EastNorth en1 = n1.eastNorth; - EastNorth en2 = n2.eastNorth; - if (en1.east() < en2.east()) { en2 = en1; en1 = n2.eastNorth; } - EastNorth en3 = mv.getEastNorth(mousePos.x, mousePos.y); - - double u = ((en3.east()-en1.east())*(en2.east()-en1.east()) + (en3.north()-en1.north())*(en2.north()-en1.north()))/en2.distanceSq(en1); - // the point on the segment from which the distance to mouse pos is shortest - EastNorth base = new EastNorth(en1.east()+u*(en2.east()-en1.east()), en1.north()+u*(en2.north()-en1.north())); - - // the distance, in projection units, between the base point and the mouse cursor - double len = base.distance(en3); - - // find out the distance, in metres, between the base point and the mouse cursor - distance = Main.proj.eastNorth2latlon(base).greatCircleDistance(Main.proj.eastNorth2latlon(en3)); - Main.map.statusLine.setDist(distance); - updateStatusLine(); - - // compute the angle at which the segment is drawn - // and use it to compute the x and y offsets for the - // corner points. - double sin_alpha = (en2.north()-en1.north())/en2.distance(en1); - - // this is a kludge because sometimes extrusion just goes the wrong direction - if ((en3.east()>base.east()) ^ (sin_alpha < 0)) len=-len; - xoff = sin_alpha * len; - yoff = Math.sqrt(1-sin_alpha*sin_alpha) * len; - - Graphics2D g2 = (Graphics2D) g; - g2.setColor(selectedColor); - g2.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); - GeneralPath b = new GeneralPath(); - Point p1=mv.getPoint(en1); - Point p2=mv.getPoint(en2); - Point p3=mv.getPoint(en1.add(-xoff, -yoff)); - Point p4=mv.getPoint(en2.add(-xoff, -yoff)); - - b.moveTo(p1.x,p1.y); b.lineTo(p3.x, p3.y); - b.lineTo(p4.x, p4.y); b.lineTo(p2.x, p2.y); - b.lineTo(p1.x,p1.y); - g2.draw(b); - g2.setStroke(new BasicStroke(1)); - } - } - - /** - */ - @Override public void mousePressed(MouseEvent e) { - if (!(Boolean)this.getValue("active")) return; - if (e.getButton() != MouseEvent.BUTTON1) - return; - // boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - // boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; - // boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - - mouseDownTime = System.currentTimeMillis(); - - selectedSegment = - Main.map.mapView.getNearestWaySegment(e.getPoint()); - - mode = (selectedSegment == null) ? Mode.select : Mode.EXTRUDE; - oldCursor = Main.map.mapView.getCursor(); - - updateStatusLine(); - Main.map.mapView.addTemporaryLayer(this); - Main.map.mapView.repaint(); - - mousePos = e.getPoint(); - initialMousePos = e.getPoint(); - } - - /** - * Restore the old mouse cursor. - */ - @Override public void mouseReleased(MouseEvent e) { - restoreCursor(); - if (selectedSegment == null) return; - if (mousePos.distance(initialMousePos) > 10) { - Node n1 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex); - Node n2 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex+1); - EastNorth en3 = n2.eastNorth.add(-xoff, -yoff); - Node n3 = new Node(Main.proj.eastNorth2latlon(en3)); - EastNorth en4 = n1.eastNorth.add(-xoff, -yoff); - Node n4 = new Node(Main.proj.eastNorth2latlon(en4)); - Way wnew = new Way(selectedSegment.way); - wnew.nodes.add(selectedSegment.lowerIndex+1, n3); - wnew.nodes.add(selectedSegment.lowerIndex+1, n4); - if (wnew.nodes.size() == 4) wnew.nodes.add(n1); - Collection cmds = new LinkedList(); - cmds.add(new AddCommand(n4)); - cmds.add(new AddCommand(n3)); - cmds.add(new ChangeCommand(selectedSegment.way, wnew)); - Command c = new SequenceCommand(tr("Extrude Way"), cmds); - Main.main.undoRedo.add(c); - } - - Main.map.mapView.removeTemporaryLayer(this); - selectedSegment = null; - mode = null; - updateStatusLine(); - Main.map.mapView.repaint(); - } - - @Override public String getModeHelpText() { - if (mode == Mode.select) { - return tr("Release the mouse button to select the objects in the rectangle."); - } else if (mode == Mode.EXTRUDE) { - return tr("Draw a rectangle of the desired size, then release the mouse button."); - } else if (mode == Mode.rotate) { - return tr("Release the mouse button to stop rotating."); - } else { - return tr("Drag a way segment to make a rectangle."); - } - } + return Cursor.getPredefinedCursor(def); + } + + private void setCursor(Cursor c) { + if (oldCursor == null) { + oldCursor = Main.map.mapView.getCursor(); + Main.map.mapView.setCursor(c); + } + } + + private void restoreCursor() { + if (oldCursor != null) { + Main.map.mapView.setCursor(oldCursor); + oldCursor = null; + } + } + + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addMouseMotionListener(this); + } + + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeMouseMotionListener(this); + Main.map.mapView.removeTemporaryLayer(this); + + } + + /** + * If the left mouse button is pressed, move all currently selected + * objects (if one of them is under the mouse) or the current one under the + * mouse (which will become selected). + */ + @Override public void mouseDragged(MouseEvent e) { + if (mode == Mode.select) return; + + // do not count anything as a move if it lasts less than 100 milliseconds. + if ((mode == Mode.EXTRUDE) && (System.currentTimeMillis() - mouseDownTime < initialMoveDelay)) return; + + if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) + return; + + if (mode == Mode.EXTRUDE) { + setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + } + + if (mousePos == null) { + mousePos = e.getPoint(); + return; + } + + Main.map.mapView.repaint(); + mousePos = e.getPoint(); + + } + + public void paint(Graphics g, MapView mv) { + if (selectedSegment != null) { + Node n1 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex); + Node n2 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex+1); + + EastNorth en1 = n1.eastNorth; + EastNorth en2 = n2.eastNorth; + if (en1.east() < en2.east()) { en2 = en1; en1 = n2.eastNorth; } + EastNorth en3 = mv.getEastNorth(mousePos.x, mousePos.y); + + double u = ((en3.east()-en1.east())*(en2.east()-en1.east()) + (en3.north()-en1.north())*(en2.north()-en1.north()))/en2.distanceSq(en1); + // the point on the segment from which the distance to mouse pos is shortest + EastNorth base = new EastNorth(en1.east()+u*(en2.east()-en1.east()), en1.north()+u*(en2.north()-en1.north())); + + // the distance, in projection units, between the base point and the mouse cursor + double len = base.distance(en3); + + // find out the distance, in metres, between the base point and the mouse cursor + distance = Main.proj.eastNorth2latlon(base).greatCircleDistance(Main.proj.eastNorth2latlon(en3)); + Main.map.statusLine.setDist(distance); + updateStatusLine(); + + // compute the angle at which the segment is drawn + // and use it to compute the x and y offsets for the + // corner points. + double sin_alpha = (en2.north()-en1.north())/en2.distance(en1); + + // this is a kludge because sometimes extrusion just goes the wrong direction + if ((en3.east()>base.east()) ^ (sin_alpha < 0)) len=-len; + xoff = sin_alpha * len; + yoff = Math.sqrt(1-sin_alpha*sin_alpha) * len; + + Graphics2D g2 = (Graphics2D) g; + g2.setColor(selectedColor); + g2.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); + GeneralPath b = new GeneralPath(); + Point p1=mv.getPoint(en1); + Point p2=mv.getPoint(en2); + Point p3=mv.getPoint(en1.add(-xoff, -yoff)); + Point p4=mv.getPoint(en2.add(-xoff, -yoff)); + + b.moveTo(p1.x,p1.y); b.lineTo(p3.x, p3.y); + b.lineTo(p4.x, p4.y); b.lineTo(p2.x, p2.y); + b.lineTo(p1.x,p1.y); + g2.draw(b); + g2.setStroke(new BasicStroke(1)); + } + } + + /** + */ + @Override public void mousePressed(MouseEvent e) { + if (!(Boolean)this.getValue("active")) return; + if (e.getButton() != MouseEvent.BUTTON1) + return; + // boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + // boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + // boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; + + mouseDownTime = System.currentTimeMillis(); + + selectedSegment = + Main.map.mapView.getNearestWaySegment(e.getPoint()); + + mode = (selectedSegment == null) ? Mode.select : Mode.EXTRUDE; + oldCursor = Main.map.mapView.getCursor(); + + updateStatusLine(); + Main.map.mapView.addTemporaryLayer(this); + Main.map.mapView.repaint(); + + mousePos = e.getPoint(); + initialMousePos = e.getPoint(); + } + + /** + * Restore the old mouse cursor. + */ + @Override public void mouseReleased(MouseEvent e) { + restoreCursor(); + if (selectedSegment == null) return; + if (mousePos.distance(initialMousePos) > 10) { + Node n1 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex); + Node n2 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex+1); + EastNorth en3 = n2.eastNorth.add(-xoff, -yoff); + Node n3 = new Node(Main.proj.eastNorth2latlon(en3)); + EastNorth en4 = n1.eastNorth.add(-xoff, -yoff); + Node n4 = new Node(Main.proj.eastNorth2latlon(en4)); + Way wnew = new Way(selectedSegment.way); + wnew.nodes.add(selectedSegment.lowerIndex+1, n3); + wnew.nodes.add(selectedSegment.lowerIndex+1, n4); + if (wnew.nodes.size() == 4) wnew.nodes.add(n1); + Collection cmds = new LinkedList(); + cmds.add(new AddCommand(n4)); + cmds.add(new AddCommand(n3)); + cmds.add(new ChangeCommand(selectedSegment.way, wnew)); + Command c = new SequenceCommand(tr("Extrude Way"), cmds); + Main.main.undoRedo.add(c); + } + + Main.map.mapView.removeTemporaryLayer(this); + selectedSegment = null; + mode = null; + updateStatusLine(); + Main.map.mapView.repaint(); + } + + @Override public String getModeHelpText() { + if (mode == Mode.select) { + return tr("Release the mouse button to select the objects in the rectangle."); + } else if (mode == Mode.EXTRUDE) { + return tr("Draw a rectangle of the desired size, then release the mouse button."); + } else if (mode == Mode.rotate) { + return tr("Release the mouse button to stop rotating."); + } else { + return tr("Drag a way segment to make a rectangle."); + } + } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 1169) @@ -23,69 +23,69 @@ */ abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener { - private final Cursor cursor; - private Cursor oldCursor; + private final Cursor cursor; + private Cursor oldCursor; - /** - * Constructor for mapmodes without an menu - */ - public MapMode(String name, String iconName, String tooltip, Shortcut shortcut, MapFrame mapFrame, Cursor cursor) { - super(name, "mapmode/"+iconName, tooltip, shortcut, false); - this.cursor = cursor; - putValue("active", false); - } + /** + * Constructor for mapmodes without an menu + */ + public MapMode(String name, String iconName, String tooltip, Shortcut shortcut, MapFrame mapFrame, Cursor cursor) { + super(name, "mapmode/"+iconName, tooltip, shortcut, false); + this.cursor = cursor; + putValue("active", false); + } - /** - * Constructor for mapmodes without an menu - */ - @Deprecated - public MapMode(String name, String iconName, String tooltip, int keystroke, MapFrame mapFrame, Cursor cursor) { - super(name, "mapmode/"+iconName, tooltip, keystroke, 0, false); - this.cursor = cursor; - putValue("active", false); - } + /** + * Constructor for mapmodes without an menu + */ + @Deprecated + public MapMode(String name, String iconName, String tooltip, int keystroke, MapFrame mapFrame, Cursor cursor) { + super(name, "mapmode/"+iconName, tooltip, keystroke, 0, false); + this.cursor = cursor; + putValue("active", false); + } - /** - * Constructor for mapmodes with an menu (no shortcut will be registered) - */ - public MapMode(String name, String iconName, String tooltip, MapFrame mapFrame, Cursor cursor) { - putValue(NAME, name); - putValue(SMALL_ICON, ImageProvider.get("mapmode", iconName)); - putValue(SHORT_DESCRIPTION, tooltip); - this.cursor = cursor; - } + /** + * Constructor for mapmodes with an menu (no shortcut will be registered) + */ + public MapMode(String name, String iconName, String tooltip, MapFrame mapFrame, Cursor cursor) { + putValue(NAME, name); + putValue(SMALL_ICON, ImageProvider.get("mapmode", iconName)); + putValue(SHORT_DESCRIPTION, tooltip); + this.cursor = cursor; + } - public void enterMode() { - putValue("active", true); - oldCursor = Main.map.mapView.getCursor(); - Main.map.mapView.setCursor(cursor); - updateStatusLine(); - } - public void exitMode() { - putValue("active", false); - Main.map.mapView.setCursor(oldCursor); - } + public void enterMode() { + putValue("active", true); + oldCursor = Main.map.mapView.getCursor(); + Main.map.mapView.setCursor(cursor); + updateStatusLine(); + } + public void exitMode() { + putValue("active", false); + Main.map.mapView.setCursor(oldCursor); + } - protected void updateStatusLine() { - Main.map.statusLine.setHelpText(getModeHelpText()); - Main.map.statusLine.repaint(); - } + protected void updateStatusLine() { + Main.map.statusLine.setHelpText(getModeHelpText()); + Main.map.statusLine.repaint(); + } - public String getModeHelpText() { - return ""; - } - /** - * Call selectMapMode(this) on the parent mapFrame. - */ - public void actionPerformed(ActionEvent e) { - if (Main.map != null) - Main.map.selectMapMode(this); - } + public String getModeHelpText() { + return ""; + } + /** + * Call selectMapMode(this) on the parent mapFrame. + */ + public void actionPerformed(ActionEvent e) { + if (Main.map != null) + Main.map.selectMapMode(this); + } - public void mouseReleased(MouseEvent e) {} - public void mouseExited(MouseEvent e) {} - public void mousePressed(MouseEvent e) {} - public void mouseClicked(MouseEvent e) {} - public void mouseEntered(MouseEvent e) {} - public void mouseMoved(MouseEvent e) {} - public void mouseDragged(MouseEvent e) {} + public void mouseReleased(MouseEvent e) {} + public void mouseExited(MouseEvent e) {} + public void mousePressed(MouseEvent e) {} + public void mouseClicked(MouseEvent e) {} + public void mouseEntered(MouseEvent e) {} + public void mouseMoved(MouseEvent e) {} + public void mouseDragged(MouseEvent e) {} } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (revision 1169) @@ -21,69 +21,69 @@ public class PlayHeadDragMode extends MapMode { - private boolean dragging = false; - private Point mousePos = null; - private Point mouseStart = null; - private PlayHeadMarker playHeadMarker = null; + private boolean dragging = false; + private Point mousePos = null; + private Point mouseStart = null; + private PlayHeadMarker playHeadMarker = null; - public PlayHeadDragMode(PlayHeadMarker m) { - super("play head drag", "playheaddrag", "play head drag", null, - Main.map, Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); - playHeadMarker = m; - } + public PlayHeadDragMode(PlayHeadMarker m) { + super("play head drag", "playheaddrag", "play head drag", null, + Main.map, Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + playHeadMarker = m; + } - @Override public void enterMode() { - super.enterMode(); - Main.map.mapView.addMouseListener(this); - Main.map.mapView.addMouseMotionListener(this); - } + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addMouseMotionListener(this); + } - @Override public void exitMode() { - super.exitMode(); - Main.map.mapView.removeMouseListener(this); - Main.map.mapView.removeMouseMotionListener(this); - } + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeMouseMotionListener(this); + } - @Override public void mousePressed(MouseEvent ev) { - mouseStart = mousePos = ev.getPoint(); - } + @Override public void mousePressed(MouseEvent ev) { + mouseStart = mousePos = ev.getPoint(); + } - @Override public void mouseDragged(MouseEvent ev) { - if (mouseStart == null || mousePos == null) return; - if ((ev.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) return; - Point p = ev.getPoint(); - if (p == null) return; - if (! dragging) { - if (p.distance(mouseStart) < 3) return; - playHeadMarker.startDrag(); - dragging = true; - } - if (p.distance(mousePos) == 0) return; - playHeadMarker.drag(Main.map.mapView.getEastNorth(ev.getX(), ev.getY())); - mousePos = p; - } + @Override public void mouseDragged(MouseEvent ev) { + if (mouseStart == null || mousePos == null) return; + if ((ev.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) return; + Point p = ev.getPoint(); + if (p == null) return; + if (! dragging) { + if (p.distance(mouseStart) < 3) return; + playHeadMarker.startDrag(); + dragging = true; + } + if (p.distance(mousePos) == 0) return; + playHeadMarker.drag(Main.map.mapView.getEastNorth(ev.getX(), ev.getY())); + mousePos = p; + } - @Override public void mouseReleased(MouseEvent ev) { - Point p = ev.getPoint(); - mouseStart = null; - if (ev.getButton() != MouseEvent.BUTTON1 || p == null || ! dragging) - return; - boolean shift = (ev.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - EastNorth en = Main.map.mapView.getEastNorth(ev.getX(), ev.getY()); - if (! shift) { - playHeadMarker.reposition(en); - } else { - playHeadMarker.synchronize(en); - } - mousePos = null; - dragging = false; + @Override public void mouseReleased(MouseEvent ev) { + Point p = ev.getPoint(); + mouseStart = null; + if (ev.getButton() != MouseEvent.BUTTON1 || p == null || ! dragging) + return; + boolean shift = (ev.getModifiers() & ActionEvent.SHIFT_MASK) != 0; + EastNorth en = Main.map.mapView.getEastNorth(ev.getX(), ev.getY()); + if (! shift) { + playHeadMarker.reposition(en); + } else { + playHeadMarker.synchronize(en); + } + mousePos = null; + dragging = false; - /* - boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; - */ - } + /* + boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0; + */ + } - @Override public String getModeHelpText() { - return tr("Drag play head and release near track to play audio from there; SHIFT+release to synchronize audio at that point."); - } + @Override public String getModeHelpText() { + return tr("Drag play head and release near track to play audio from there; SHIFT+release to synchronize audio at that point."); + } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 1169) @@ -30,50 +30,50 @@ public class ZoomAction extends MapMode implements SelectionEnded { - /** - * Shortcut to the mapview. - */ - private final MapView mv; - /** - * Manager that manages the selection rectangle with the aspect ratio of the - * MapView. - */ - private final SelectionManager selectionManager; + /** + * Shortcut to the mapview. + */ + private final MapView mv; + /** + * Manager that manages the selection rectangle with the aspect ratio of the + * MapView. + */ + private final SelectionManager selectionManager; - /** - * Construct a ZoomAction without a label. - * @param mapFrame The MapFrame, whose zoom mode should be enabled. - */ - public ZoomAction(MapFrame mapFrame) { - super(tr("Zoom"), "zoom", tr("Zoom and move map"), - Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.GROUP_EDIT), - mapFrame, ImageProvider.getCursor("normal", "zoom")); - mv = mapFrame.mapView; - selectionManager = new SelectionManager(this, true, mv); - } + /** + * Construct a ZoomAction without a label. + * @param mapFrame The MapFrame, whose zoom mode should be enabled. + */ + public ZoomAction(MapFrame mapFrame) { + super(tr("Zoom"), "zoom", tr("Zoom and move map"), + Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.GROUP_EDIT), + mapFrame, ImageProvider.getCursor("normal", "zoom")); + mv = mapFrame.mapView; + selectionManager = new SelectionManager(this, true, mv); + } - /** - * Zoom to the rectangle on the map. - */ - public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) { - if (r.width >= 3 && r.height >= 3) { - double scale = mv.getScale() * r.getWidth()/mv.getWidth(); - EastNorth newCenter = mv.getEastNorth(r.x+r.width/2, r.y+r.height/2); - mv.zoomTo(newCenter, scale); - } - } + /** + * Zoom to the rectangle on the map. + */ + public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) { + if (r.width >= 3 && r.height >= 3) { + double scale = mv.getScale() * r.getWidth()/mv.getWidth(); + EastNorth newCenter = mv.getEastNorth(r.x+r.width/2, r.y+r.height/2); + mv.zoomTo(newCenter, scale); + } + } - @Override public void enterMode() { - super.enterMode(); - selectionManager.register(mv); - } + @Override public void enterMode() { + super.enterMode(); + selectionManager.register(mv); + } - @Override public void exitMode() { - super.exitMode(); - selectionManager.unregister(mv); - } + @Override public void exitMode() { + super.exitMode(); + selectionManager.unregister(mv); + } - @Override public String getModeHelpText() { - return tr("Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; move zoom with right button"); - } + @Override public String getModeHelpText() { + return tr("Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up,left,down,right; move zoom with right button"); + } } Index: trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 1169) @@ -7,100 +7,100 @@ public class PushbackTokenizer { - private PushbackReader search; + private PushbackReader search; - private LinkedList pushBackBuf = new LinkedList(); + private LinkedList pushBackBuf = new LinkedList(); - public PushbackTokenizer(PushbackReader search) { - this.search = search; - } + public PushbackTokenizer(PushbackReader search) { + this.search = search; + } - /** - * The token returned is null or starts with an identifier character: - * - for an '-'. This will be the only character - * : for an key. The value is the next token - * | for "OR" - * ' ' for anything else. - * @return The next token in the stream. - */ - public String nextToken() { - if (!pushBackBuf.isEmpty()) { - return pushBackBuf.removeLast(); - } + /** + * The token returned is null or starts with an identifier character: + * - for an '-'. This will be the only character + * : for an key. The value is the next token + * | for "OR" + * ' ' for anything else. + * @return The next token in the stream. + */ + public String nextToken() { + if (!pushBackBuf.isEmpty()) { + return pushBackBuf.removeLast(); + } - try { - int next; - char c = ' '; - while (c == ' ' || c == '\t' || c == '\n') { - next = search.read(); - if (next == -1) - return null; - c = (char)next; - } - StringBuilder s; - switch (c) { - case ':': - next = search.read(); - c = (char) next; - if (next == -1 || c == ' ' || c == '\t') { - pushBack(" "); - } else { - search.unread(next); - } - return ":"; - case '-': - return "-"; - case '(': - return "("; - case ')': - return ")"; - case '|': - return "|"; - case '"': - s = new StringBuilder(" "); - for (int nc = search.read(); nc != -1 && nc != '"'; nc = search.read()) - s.append((char)nc); - return s.toString(); - default: - s = new StringBuilder(); - for (;;) { - s.append(c); - next = search.read(); - if (next == -1) { - if (s.toString().equals("OR")) - return "|"; - return " "+s.toString(); - } - c = (char)next; - if (c == ' ' || c == '\t' || c == '"' || c == ':' || c == '(' || c == ')' || c == '|') { - search.unread(next); - if (s.toString().equals("OR")) - return "|"; - return " "+s.toString(); - } - } - } - } catch (IOException e) { - throw new RuntimeException(e.getMessage(), e); - } - } + try { + int next; + char c = ' '; + while (c == ' ' || c == '\t' || c == '\n') { + next = search.read(); + if (next == -1) + return null; + c = (char)next; + } + StringBuilder s; + switch (c) { + case ':': + next = search.read(); + c = (char) next; + if (next == -1 || c == ' ' || c == '\t') { + pushBack(" "); + } else { + search.unread(next); + } + return ":"; + case '-': + return "-"; + case '(': + return "("; + case ')': + return ")"; + case '|': + return "|"; + case '"': + s = new StringBuilder(" "); + for (int nc = search.read(); nc != -1 && nc != '"'; nc = search.read()) + s.append((char)nc); + return s.toString(); + default: + s = new StringBuilder(); + for (;;) { + s.append(c); + next = search.read(); + if (next == -1) { + if (s.toString().equals("OR")) + return "|"; + return " "+s.toString(); + } + c = (char)next; + if (c == ' ' || c == '\t' || c == '"' || c == ':' || c == '(' || c == ')' || c == '|') { + search.unread(next); + if (s.toString().equals("OR")) + return "|"; + return " "+s.toString(); + } + } + } + } catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } + } - public boolean readIfEqual(String tok) { - String nextTok = nextToken(); - if (nextTok == null ? tok == null : nextTok.equals(tok)) - return true; - pushBack(nextTok); - return false; - } + public boolean readIfEqual(String tok) { + String nextTok = nextToken(); + if (nextTok == null ? tok == null : nextTok.equals(tok)) + return true; + pushBack(nextTok); + return false; + } - public String readText() { - String nextTok = nextToken(); - if (nextTok != null && nextTok.startsWith(" ")) - return nextTok.substring(1); - pushBack(nextTok); - return null; - } + public String readText() { + String nextTok = nextToken(); + if (nextTok != null && nextTok.startsWith(" ")) + return nextTok.substring(1); + pushBack(nextTok); + return null; + } - public void pushBack(String tok) { - pushBackBuf.addLast(tok); - } + public void pushBack(String tok) { + pushBackBuf.addLast(tok); + } } Index: trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 1169) @@ -20,273 +20,273 @@ public class SearchCompiler { - private boolean caseSensitive = false; - private PushbackTokenizer tokenizer; - - public SearchCompiler(boolean caseSensitive, PushbackTokenizer tokenizer) { - this.caseSensitive = caseSensitive; - this.tokenizer = tokenizer; - } - - abstract public static class Match { - abstract public boolean match(OsmPrimitive osm); - } - - private static class Always extends Match { - @Override public boolean match(OsmPrimitive osm) { - return true; - } - } - - private static class Not extends Match { - private final Match match; - public Not(Match match) {this.match = match;} - @Override public boolean match(OsmPrimitive osm) { - return !match.match(osm); - } - @Override public String toString() {return "!"+match;} - } - - private static class And extends Match { - private Match lhs; - private Match rhs; - public And(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;} - @Override public boolean match(OsmPrimitive osm) { - return lhs.match(osm) && rhs.match(osm); - } - @Override public String toString() {return lhs+" && "+rhs;} - } - - private static class Or extends Match { - private Match lhs; - private Match rhs; - public Or(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;} - @Override public boolean match(OsmPrimitive osm) { - return lhs.match(osm) || rhs.match(osm); - } - @Override public String toString() {return lhs+" || "+rhs;} - } - - private static class Id extends Match { - private long id; - public Id(long id) {this.id = id;} - @Override public boolean match(OsmPrimitive osm) { - return osm.id == id; - } - @Override public String toString() {return "id="+id;} - } - - private class KeyValue extends Match { - private String key; - private String value; - public KeyValue(String key, String value) {this.key = key; this.value = value; } - @Override public boolean match(OsmPrimitive osm) { - String value = null; - if (key.equals("timestamp")) - value = osm.getTimeStr(); - else - value = osm.get(key); - if (value == null) - return false; - String v1 = caseSensitive ? value : value.toLowerCase(); - String v2 = caseSensitive ? this.value : this.value.toLowerCase(); - // is not Java 1.5 - //v1 = java.text.Normalizer.normalize(v1, java.text.Normalizer.Form.NFC); - //v2 = java.text.Normalizer.normalize(v2, java.text.Normalizer.Form.NFC); - return v1.indexOf(v2) != -1; - } - @Override public String toString() {return key+"="+value;} - } - - private class Any extends Match { - private String s; - public Any(String s) {this.s = s;} - @Override public boolean match(OsmPrimitive osm) { - if (osm.keys == null) - return s.equals(""); - String search = caseSensitive ? s : s.toLowerCase(); - // is not Java 1.5 - //search = java.text.Normalizer.normalize(search, java.text.Normalizer.Form.NFC); - for (Entry e : osm.keys.entrySet()) { - String key = caseSensitive ? e.getKey() : e.getKey().toLowerCase(); - String value = caseSensitive ? e.getValue() : e.getValue().toLowerCase(); - // is not Java 1.5 - //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC); - if (key.indexOf(search) != -1 || value.indexOf(search) != -1) - return true; - } - if (osm.user != null) { - String name = osm.user.name; - // is not Java 1.5 - //String name = java.text.Normalizer.normalize(name, java.text.Normalizer.Form.NFC); - if (!caseSensitive) - name = name.toLowerCase(); - if (name.indexOf(search) != -1) - return true; - } - return false; - } - @Override public String toString() {return s;} - } - - private static class ExactType extends Match { - private String type; - public ExactType(String type) {this.type = type;} - @Override public boolean match(OsmPrimitive osm) { - if (osm instanceof Node) - return type.equals("node"); - if (osm instanceof Way) - return type.equals("way"); - if (osm instanceof Relation) - return type.equals("relation"); - throw new IllegalStateException("unknown class "+osm.getClass()); - } - @Override public String toString() {return "type="+type;} - } - - private static class UserMatch extends Match { - private User user; - public UserMatch(String user) { this.user = User.get(user); } - @Override public boolean match(OsmPrimitive osm) { - return osm.user == user; - } - @Override public String toString() { return "user=" + user.name; } - } - - private static class NodeCount extends Match { - private int count; - public NodeCount(int count) {this.count = count;} - @Override public boolean match(OsmPrimitive osm) { - return osm instanceof Way && ((Way) osm).nodes.size() == count; - } - @Override public String toString() {return "nodes="+count;} - } - - private static class Modified extends Match { - @Override public boolean match(OsmPrimitive osm) { - return osm.modified || osm.id == 0; - } - @Override public String toString() {return "modified";} - } - - private static class Selected extends Match { - @Override public boolean match(OsmPrimitive osm) { - return osm.selected; - } - @Override public String toString() {return "selected";} - } - - private static class Incomplete extends Match { - @Override public boolean match(OsmPrimitive osm) { + private boolean caseSensitive = false; + private PushbackTokenizer tokenizer; + + public SearchCompiler(boolean caseSensitive, PushbackTokenizer tokenizer) { + this.caseSensitive = caseSensitive; + this.tokenizer = tokenizer; + } + + abstract public static class Match { + abstract public boolean match(OsmPrimitive osm); + } + + private static class Always extends Match { + @Override public boolean match(OsmPrimitive osm) { + return true; + } + } + + private static class Not extends Match { + private final Match match; + public Not(Match match) {this.match = match;} + @Override public boolean match(OsmPrimitive osm) { + return !match.match(osm); + } + @Override public String toString() {return "!"+match;} + } + + private static class And extends Match { + private Match lhs; + private Match rhs; + public And(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;} + @Override public boolean match(OsmPrimitive osm) { + return lhs.match(osm) && rhs.match(osm); + } + @Override public String toString() {return lhs+" && "+rhs;} + } + + private static class Or extends Match { + private Match lhs; + private Match rhs; + public Or(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;} + @Override public boolean match(OsmPrimitive osm) { + return lhs.match(osm) || rhs.match(osm); + } + @Override public String toString() {return lhs+" || "+rhs;} + } + + private static class Id extends Match { + private long id; + public Id(long id) {this.id = id;} + @Override public boolean match(OsmPrimitive osm) { + return osm.id == id; + } + @Override public String toString() {return "id="+id;} + } + + private class KeyValue extends Match { + private String key; + private String value; + public KeyValue(String key, String value) {this.key = key; this.value = value; } + @Override public boolean match(OsmPrimitive osm) { + String value = null; + if (key.equals("timestamp")) + value = osm.getTimeStr(); + else + value = osm.get(key); + if (value == null) + return false; + String v1 = caseSensitive ? value : value.toLowerCase(); + String v2 = caseSensitive ? this.value : this.value.toLowerCase(); + // is not Java 1.5 + //v1 = java.text.Normalizer.normalize(v1, java.text.Normalizer.Form.NFC); + //v2 = java.text.Normalizer.normalize(v2, java.text.Normalizer.Form.NFC); + return v1.indexOf(v2) != -1; + } + @Override public String toString() {return key+"="+value;} + } + + private class Any extends Match { + private String s; + public Any(String s) {this.s = s;} + @Override public boolean match(OsmPrimitive osm) { + if (osm.keys == null) + return s.equals(""); + String search = caseSensitive ? s : s.toLowerCase(); + // is not Java 1.5 + //search = java.text.Normalizer.normalize(search, java.text.Normalizer.Form.NFC); + for (Entry e : osm.keys.entrySet()) { + String key = caseSensitive ? e.getKey() : e.getKey().toLowerCase(); + String value = caseSensitive ? e.getValue() : e.getValue().toLowerCase(); + // is not Java 1.5 + //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC); + if (key.indexOf(search) != -1 || value.indexOf(search) != -1) + return true; + } + if (osm.user != null) { + String name = osm.user.name; + // is not Java 1.5 + //String name = java.text.Normalizer.normalize(name, java.text.Normalizer.Form.NFC); + if (!caseSensitive) + name = name.toLowerCase(); + if (name.indexOf(search) != -1) + return true; + } + return false; + } + @Override public String toString() {return s;} + } + + private static class ExactType extends Match { + private String type; + public ExactType(String type) {this.type = type;} + @Override public boolean match(OsmPrimitive osm) { + if (osm instanceof Node) + return type.equals("node"); + if (osm instanceof Way) + return type.equals("way"); + if (osm instanceof Relation) + return type.equals("relation"); + throw new IllegalStateException("unknown class "+osm.getClass()); + } + @Override public String toString() {return "type="+type;} + } + + private static class UserMatch extends Match { + private User user; + public UserMatch(String user) { this.user = User.get(user); } + @Override public boolean match(OsmPrimitive osm) { + return osm.user == user; + } + @Override public String toString() { return "user=" + user.name; } + } + + private static class NodeCount extends Match { + private int count; + public NodeCount(int count) {this.count = count;} + @Override public boolean match(OsmPrimitive osm) { + return osm instanceof Way && ((Way) osm).nodes.size() == count; + } + @Override public String toString() {return "nodes="+count;} + } + + private static class Modified extends Match { + @Override public boolean match(OsmPrimitive osm) { + return osm.modified || osm.id == 0; + } + @Override public String toString() {return "modified";} + } + + private static class Selected extends Match { + @Override public boolean match(OsmPrimitive osm) { + return osm.selected; + } + @Override public String toString() {return "selected";} + } + + private static class Incomplete extends Match { + @Override public boolean match(OsmPrimitive osm) { return osm.incomplete; - } - @Override public String toString() {return "incomplete";} - } - - public static class ParseError extends Exception { - public ParseError(String msg) { - super(msg); - } - } - - public static Match compile(String searchStr, boolean caseSensitive) - throws ParseError { - return new SearchCompiler(caseSensitive, - new PushbackTokenizer( - new PushbackReader(new StringReader(searchStr)))) - .parse(); - } - - public Match parse() throws ParseError { - Match m = parseJuxta(); - if (!tokenizer.readIfEqual(null)) { - throw new ParseError("Unexpected token: " + tokenizer.nextToken()); - } - return m; - } - - private Match parseJuxta() throws ParseError { - Match juxta = new Always(); - - Match m; - while ((m = parseOr()) != null) { - juxta = new And(m, juxta); - } - - return juxta; - } - - private Match parseOr() throws ParseError { - Match a = parseNot(); - if (tokenizer.readIfEqual("|")) { - Match b = parseNot(); - if (a == null || b == null) { - throw new ParseError(tr("Missing arguments for or.")); - } - return new Or(a, b); - } - return a; - } - - private Match parseNot() throws ParseError { - if (tokenizer.readIfEqual("-")) { - Match m = parseParens(); - if (m == null) { - throw new ParseError(tr("Missing argument for not.")); - } - return new Not(m); - } - return parseParens(); - } - - private Match parseParens() throws ParseError { - if (tokenizer.readIfEqual("(")) { - Match m = parseJuxta(); - if (!tokenizer.readIfEqual(")")) { - throw new ParseError(tr("Expected closing parenthesis.")); - } - return m; - } - return parsePat(); - } - - private Match parsePat() { - String tok = tokenizer.readText(); - - if (tokenizer.readIfEqual(":")) { - String tok2 = tokenizer.readText(); - if (tok == null) tok = ""; - if (tok2 == null) tok2 = ""; - return parseKV(tok, tok2); - } - - if (tok == null) { - return null; - } else if (tok.equals("modified")) { - return new Modified(); - } else if (tok.equals("incomplete")) { - return new Incomplete(); - } else if (tok.equals("selected")) { - return new Selected(); - } else { - return new Any(tok); - } - } - - private Match parseKV(String key, String value) { - if (key.equals("type")) { - return new ExactType(value); - } else if (key.equals("user")) { - return new UserMatch(value); - } else if (key.equals("nodes")) { - return new NodeCount(Integer.parseInt(value)); - } else if (key.equals("id")) { - try { - return new Id(Long.parseLong(value)); - } catch (NumberFormatException x) { - return new Id(0); - } - } else { - return new KeyValue(key, value); - } - } + } + @Override public String toString() {return "incomplete";} + } + + public static class ParseError extends Exception { + public ParseError(String msg) { + super(msg); + } + } + + public static Match compile(String searchStr, boolean caseSensitive) + throws ParseError { + return new SearchCompiler(caseSensitive, + new PushbackTokenizer( + new PushbackReader(new StringReader(searchStr)))) + .parse(); + } + + public Match parse() throws ParseError { + Match m = parseJuxta(); + if (!tokenizer.readIfEqual(null)) { + throw new ParseError("Unexpected token: " + tokenizer.nextToken()); + } + return m; + } + + private Match parseJuxta() throws ParseError { + Match juxta = new Always(); + + Match m; + while ((m = parseOr()) != null) { + juxta = new And(m, juxta); + } + + return juxta; + } + + private Match parseOr() throws ParseError { + Match a = parseNot(); + if (tokenizer.readIfEqual("|")) { + Match b = parseNot(); + if (a == null || b == null) { + throw new ParseError(tr("Missing arguments for or.")); + } + return new Or(a, b); + } + return a; + } + + private Match parseNot() throws ParseError { + if (tokenizer.readIfEqual("-")) { + Match m = parseParens(); + if (m == null) { + throw new ParseError(tr("Missing argument for not.")); + } + return new Not(m); + } + return parseParens(); + } + + private Match parseParens() throws ParseError { + if (tokenizer.readIfEqual("(")) { + Match m = parseJuxta(); + if (!tokenizer.readIfEqual(")")) { + throw new ParseError(tr("Expected closing parenthesis.")); + } + return m; + } + return parsePat(); + } + + private Match parsePat() { + String tok = tokenizer.readText(); + + if (tokenizer.readIfEqual(":")) { + String tok2 = tokenizer.readText(); + if (tok == null) tok = ""; + if (tok2 == null) tok2 = ""; + return parseKV(tok, tok2); + } + + if (tok == null) { + return null; + } else if (tok.equals("modified")) { + return new Modified(); + } else if (tok.equals("incomplete")) { + return new Incomplete(); + } else if (tok.equals("selected")) { + return new Selected(); + } else { + return new Any(tok); + } + } + + private Match parseKV(String key, String value) { + if (key.equals("type")) { + return new ExactType(value); + } else if (key.equals("user")) { + return new UserMatch(value); + } else if (key.equals("nodes")) { + return new NodeCount(Integer.parseInt(value)); + } else if (key.equals("id")) { + try { + return new Id(Long.parseLong(value)); + } catch (NumberFormatException x) { + return new Id(0); + } + } else { + return new KeyValue(key, value); + } + } } Index: trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (revision 1169) @@ -1,5 +1,5 @@ // License: GPL. Copyright 2007 by Immanuel Scholz and others /** - * + * */ package org.openstreetmap.josm.actions.search; @@ -26,46 +26,46 @@ public class SelectionWebsiteLoader extends PleaseWaitRunnable { - public final URL url; - public Collection sel; - private final SearchAction.SearchMode mode; - private OsmIdReader idReader = new OsmIdReader(); - public SelectionWebsiteLoader(String urlStr, SearchAction.SearchMode mode) { - super(tr("Load Selection")); - this.mode = mode; - URL u = null; - try {u = new URL(urlStr);} catch (MalformedURLException e) {} - this.url = u; - } - @Override protected void realRun() { - Main.pleaseWaitDlg.currentAction.setText(tr("Contact {0}...", url.getHost())); - sel = mode != SearchAction.SearchMode.remove ? new LinkedList() : Main.ds.allNonDeletedPrimitives(); - try { - URLConnection con = url.openConnection(); - InputStream in = new ProgressInputStream(con, Main.pleaseWaitDlg); - Main.pleaseWaitDlg.currentAction.setText(tr("Downloading...")); - Map ids = idReader.parseIds(in); - for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) { - if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) { - if (mode == SearchAction.SearchMode.remove) - sel.remove(osm); - else - sel.add(osm); - } - } - } catch (IOException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("Could not read from url: \"{0}\"",url)); - } catch (SAXException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in url: \"{0}\"",url)); - } - } - @Override protected void cancel() { - sel = null; - idReader.cancel(); - } - @Override protected void finish() { - if (sel != null) - Main.ds.setSelected(sel); - } + public final URL url; + public Collection sel; + private final SearchAction.SearchMode mode; + private OsmIdReader idReader = new OsmIdReader(); + public SelectionWebsiteLoader(String urlStr, SearchAction.SearchMode mode) { + super(tr("Load Selection")); + this.mode = mode; + URL u = null; + try {u = new URL(urlStr);} catch (MalformedURLException e) {} + this.url = u; + } + @Override protected void realRun() { + Main.pleaseWaitDlg.currentAction.setText(tr("Contact {0}...", url.getHost())); + sel = mode != SearchAction.SearchMode.remove ? new LinkedList() : Main.ds.allNonDeletedPrimitives(); + try { + URLConnection con = url.openConnection(); + InputStream in = new ProgressInputStream(con, Main.pleaseWaitDlg); + Main.pleaseWaitDlg.currentAction.setText(tr("Downloading...")); + Map ids = idReader.parseIds(in); + for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) { + if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) { + if (mode == SearchAction.SearchMode.remove) + sel.remove(osm); + else + sel.add(osm); + } + } + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not read from url: \"{0}\"",url)); + } catch (SAXException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in url: \"{0}\"",url)); + } + } + @Override protected void cancel() { + sel = null; + idReader.cancel(); + } + @Override protected void finish() { + if (sel != null) + Main.ds.setSelected(sel); + } } Index: trunk/src/org/openstreetmap/josm/command/AddCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/AddCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/AddCommand.java (revision 1169) @@ -22,48 +22,48 @@ * A command that adds an osm primitive to a dataset. Keys cannot be added this * way. - * + * * See {@link ChangeCommand ChangeCommand} for comments on relation back references. - * + * * @author imi */ public class AddCommand extends Command { - /** - * The primitive to add to the dataset. - */ - private final OsmPrimitive osm; - - private DataSet ds; + /** + * The primitive to add to the dataset. + */ + private final OsmPrimitive osm; - /** - * Create the command and specify the element to add. - */ - public AddCommand(OsmPrimitive osm) { - this.osm = osm; - this.ds = Main.main.editLayer().data; - } + private DataSet ds; - @Override public boolean executeCommand() { - osm.visit(new AddVisitor(ds)); - return true; - } - - @Override public void undoCommand() { - osm.visit(new DeleteVisitor(ds)); - } - - @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - added.add(osm); - } - - // faster implementation - @Override public boolean invalidBecauselayerRemoved(Layer oldLayer) { - return oldLayer instanceof OsmDataLayer && ((OsmDataLayer)oldLayer).data == ds; + /** + * Create the command and specify the element to add. + */ + public AddCommand(OsmPrimitive osm) { + this.osm = osm; + this.ds = Main.main.editLayer().data; } - @Override public MutableTreeNode description() { - NameVisitor v = new NameVisitor(); - osm.visit(v); - return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); + @Override public boolean executeCommand() { + osm.visit(new AddVisitor(ds)); + return true; + } + + @Override public void undoCommand() { + osm.visit(new DeleteVisitor(ds)); + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + added.add(osm); + } + + // faster implementation + @Override public boolean invalidBecauselayerRemoved(Layer oldLayer) { + return oldLayer instanceof OsmDataLayer && ((OsmDataLayer)oldLayer).data == ds; + } + + @Override public MutableTreeNode description() { + NameVisitor v = new NameVisitor(); + osm.visit(v); + return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); } } Index: trunk/src/org/openstreetmap/josm/command/ChangeCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (revision 1169) @@ -14,34 +14,34 @@ /** - * Command that basically replaces one OSM primitive by another of the + * Command that basically replaces one OSM primitive by another of the * same type. - * + * * @author Imi */ public class ChangeCommand extends Command { - private final OsmPrimitive osm; - private final OsmPrimitive newOsm; + private final OsmPrimitive osm; + private final OsmPrimitive newOsm; - public ChangeCommand(OsmPrimitive osm, OsmPrimitive newOsm) { - this.osm = osm; - this.newOsm = newOsm; + public ChangeCommand(OsmPrimitive osm, OsmPrimitive newOsm) { + this.osm = osm; + this.newOsm = newOsm; } - @Override public boolean executeCommand() { - super.executeCommand(); - osm.cloneFrom(newOsm); - osm.modified = true; - return true; + @Override public boolean executeCommand() { + super.executeCommand(); + osm.cloneFrom(newOsm); + osm.modified = true; + return true; } - @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - modified.add(osm); + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + modified.add(osm); } - @Override public MutableTreeNode description() { - NameVisitor v = new NameVisitor(); - osm.visit(v); - return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); + @Override public MutableTreeNode description() { + NameVisitor v = new NameVisitor(); + osm.visit(v); + return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); } } Index: trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 1169) @@ -20,89 +20,89 @@ * Command that manipulate the key/value structure of several objects. Manages deletion, * adding and modify of values and keys. - * + * * @author imi */ public class ChangePropertyCommand extends Command { - /** - * All primitives that are affected with this command. - */ - private final List objects; - /** - * The key that is subject to change. - */ - private final String key; - /** - * The key value. If it is null, delete all key references with the given - * key. Otherwise, change the properties of all objects to the given value or create keys of - * those objects that do not have the key yet. - */ - private final String value; - - public ChangePropertyCommand(Collection objects, String key, String value) { - this.objects = new LinkedList(); - this.key = key; - this.value = value; - if (value == null) { - for (OsmPrimitive osm : objects) { - if(osm.get(key) != null) - this.objects.add(osm); - } - } else { - for (OsmPrimitive osm : objects) { - String val = osm.get(key); - if (val == null || !value.equals(val)) { - this.objects.add(osm); - } - } - } - } + /** + * All primitives that are affected with this command. + */ + private final List objects; + /** + * The key that is subject to change. + */ + private final String key; + /** + * The key value. If it is null, delete all key references with the given + * key. Otherwise, change the properties of all objects to the given value or create keys of + * those objects that do not have the key yet. + */ + private final String value; - public ChangePropertyCommand(OsmPrimitive object, String key, String value) { - this.objects = new LinkedList(); - this.key = key; - this.value = value; - String val = object.get(key); - if ((value == null && val != null) - || (value != null && (val == null || !value.equals(val)))) - this.objects.add(object); - } - - @Override public boolean executeCommand() { - super.executeCommand(); // save old - if (value == null) { - for (OsmPrimitive osm : objects) { - osm.modified = true; - osm.remove(key); - } - } else { - for (OsmPrimitive osm : objects) { - osm.modified = true; - osm.put(key, value); - } - } - return true; - } + public ChangePropertyCommand(Collection objects, String key, String value) { + this.objects = new LinkedList(); + this.key = key; + this.value = value; + if (value == null) { + for (OsmPrimitive osm : objects) { + if(osm.get(key) != null) + this.objects.add(osm); + } + } else { + for (OsmPrimitive osm : objects) { + String val = osm.get(key); + if (val == null || !value.equals(val)) { + this.objects.add(osm); + } + } + } + } - @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - modified.addAll(objects); - } + public ChangePropertyCommand(OsmPrimitive object, String key, String value) { + this.objects = new LinkedList(); + this.key = key; + this.value = value; + String val = object.get(key); + if ((value == null && val != null) + || (value != null && (val == null || !value.equals(val)))) + this.objects.add(object); + } - @Override public MutableTreeNode description() { - String text = value == null ? tr( "Remove \"{0}\" for", key) : tr("Set {0}={1} for",key,value); - if (objects.size() == 1) { - NameVisitor v = new NameVisitor(); - objects.iterator().next().visit(v); - text += " "+tr(v.className)+" "+v.name; - } else - text += " "+objects.size()+" "+trn("object","objects",objects.size()); - DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL)); - if (objects.size() == 1) - return root; - NameVisitor v = new NameVisitor(); - for (OsmPrimitive osm : objects) { - osm.visit(v); - root.add(new DefaultMutableTreeNode(v.toLabel())); - } - return root; + @Override public boolean executeCommand() { + super.executeCommand(); // save old + if (value == null) { + for (OsmPrimitive osm : objects) { + osm.modified = true; + osm.remove(key); + } + } else { + for (OsmPrimitive osm : objects) { + osm.modified = true; + osm.put(key, value); + } + } + return true; + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + modified.addAll(objects); + } + + @Override public MutableTreeNode description() { + String text = value == null ? tr( "Remove \"{0}\" for", key) : tr("Set {0}={1} for",key,value); + if (objects.size() == 1) { + NameVisitor v = new NameVisitor(); + objects.iterator().next().visit(v); + text += " "+tr(v.className)+" "+v.name; + } else + text += " "+objects.size()+" "+trn("object","objects",objects.size()); + DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL)); + if (objects.size() == 1) + return root; + NameVisitor v = new NameVisitor(); + for (OsmPrimitive osm : objects) { + osm.visit(v); + root.add(new DefaultMutableTreeNode(v.toLabel())); + } + return root; } } Index: trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/Command.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/Command.java (revision 1169) @@ -25,5 +25,5 @@ * one atomic action on a specific dataset, such as move or delete. * - * Remember that the command must be executable and undoable, even if the + * Remember that the command must be executable and undoable, even if the * Main.ds has changed, so the command must save the dataset it operates on * if necessary. @@ -47,5 +47,5 @@ } - private CloneVisitor orig; + private CloneVisitor orig; protected DataSet ds; @@ -70,8 +70,8 @@ /** - * Undoes the command. + * Undoes the command. * It can be assumed that all objects are in the same state they were before. * It can also be assumed that executeCommand was called exactly once before. - * + * * This implementation undoes all objects stored by a former call to executeCommand. */ @@ -122,5 +122,5 @@ * Fill in the changed data this command operates on. * Add to the lists, don't clear them. - * + * * @param modified The modified primitives * @param deleted The deleted primitives Index: trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 1169) @@ -25,56 +25,56 @@ public class ConflictResolveCommand extends Command { - private final Collection conflicts; - private final Map resolved; - private Map origAllConflicts; - private final ConflictDialog conflictDialog; + private final Collection conflicts; + private final Map resolved; + private Map origAllConflicts; + private final ConflictDialog conflictDialog; - public ConflictResolveCommand(List conflicts, Map resolved) { - this.conflicts = conflicts; - this.resolved = resolved; - conflictDialog = Main.map.conflictDialog; - } + public ConflictResolveCommand(List conflicts, Map resolved) { + this.conflicts = conflicts; + this.resolved = resolved; + conflictDialog = Main.map.conflictDialog; + } - @Override public boolean executeCommand() { - super.executeCommand(); + @Override public boolean executeCommand() { + super.executeCommand(); - origAllConflicts = new HashMap(conflictDialog.conflicts); - - Set completed = new HashSet(resolved.keySet()); - for (ConflictItem ci : conflicts) { - for (Entry e : resolved.entrySet()) { - if (ci.resolution == ConflictResolver.Resolution.THEIR) - ci.apply(e.getKey(), e.getValue()); - else if (ci.resolution == ConflictResolver.Resolution.MY) - ci.apply(e.getValue(), e.getKey()); - else if (ci.hasConflict(e.getKey(), e.getValue())) - completed.remove(e.getKey()); - } - } - if (!completed.isEmpty()) { - for (OsmPrimitive k : completed) - conflictDialog.conflicts.remove(k); - conflictDialog.rebuildList(); - } - return true; - } + origAllConflicts = new HashMap(conflictDialog.conflicts); - @Override public void undoCommand() { - super.undoCommand(); - Main.map.conflictDialog.conflicts.clear(); - Main.map.conflictDialog.conflicts.putAll(origAllConflicts); - Main.map.conflictDialog.rebuildList(); - } + Set completed = new HashSet(resolved.keySet()); + for (ConflictItem ci : conflicts) { + for (Entry e : resolved.entrySet()) { + if (ci.resolution == ConflictResolver.Resolution.THEIR) + ci.apply(e.getKey(), e.getValue()); + else if (ci.resolution == ConflictResolver.Resolution.MY) + ci.apply(e.getValue(), e.getKey()); + else if (ci.hasConflict(e.getKey(), e.getValue())) + completed.remove(e.getKey()); + } + } + if (!completed.isEmpty()) { + for (OsmPrimitive k : completed) + conflictDialog.conflicts.remove(k); + conflictDialog.rebuildList(); + } + return true; + } - @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - modified.addAll(resolved.keySet()); - } + @Override public void undoCommand() { + super.undoCommand(); + Main.map.conflictDialog.conflicts.clear(); + Main.map.conflictDialog.conflicts.putAll(origAllConflicts); + Main.map.conflictDialog.rebuildList(); + } - @Override public MutableTreeNode description() { - int i = 0; - for (ConflictItem c : conflicts) - if (c.resolution != null) - i++; - return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "object"), JLabel.HORIZONTAL)); + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + modified.addAll(resolved.keySet()); + } + + @Override public MutableTreeNode description() { + int i = 0; + for (ConflictItem c : conflicts) + if (c.resolution != null) + i++; + return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "object"), JLabel.HORIZONTAL)); } } Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 1169) @@ -105,12 +105,12 @@ /** * Delete the primitives and everything they reference. - * + * * If a node is deleted, the node and all ways and relations the node is part of are deleted as * well. - * + * * If a way is deleted, all relations the way is member of are also deleted. - * + * * If a way is deleted, only the way and no nodes are deleted. - * + * * @param selection The list of all object to be deleted. * @return command A command to perform the deletions, or null of there is nothing to delete. @@ -130,11 +130,11 @@ /** * Try to delete all given primitives. - * + * * If a node is used by a way, it's removed from that way. If a node or a way is used by a * relation, inform the user and do not delete. - * + * * If this would cause ways with less than 2 nodes to be created, delete these ways instead. If * they are part of a relation, inform the user and do not delete. - * + * * @param selection The objects to delete. * @param alsoDeleteNodesInWay true if nodes should be deleted as well @@ -341,7 +341,7 @@ // leave message in one tr() as there is a grammatical connection. tr("You are about to delete nodes outside of the area you have downloaded." + - "
" + + "
" + "This can cause problems because other objects (that you don't see) might use them." + - "
" + + "
" + "Do you really want to delete?") + "")); return DontShowAgainInfo.show("delete_outside_nodes", msg, false, JOptionPane.YES_NO_OPTION, JOptionPane.YES_OPTION); Index: trunk/src/org/openstreetmap/josm/command/MoveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 1169) @@ -26,99 +26,99 @@ * MoveCommand moves a set of OsmPrimitives along the map. It can be moved again * to collect several MoveCommands into one command. - * + * * @author imi */ public class MoveCommand extends Command { - /** - * The objects that should be moved. - */ - public Collection objects = new LinkedList(); - /** - * x difference movement. Coordinates are in northern/eastern - */ - private double x; - /** - * y difference movement. Coordinates are in northern/eastern - */ - private double y; + /** + * The objects that should be moved. + */ + public Collection objects = new LinkedList(); + /** + * x difference movement. Coordinates are in northern/eastern + */ + private double x; + /** + * y difference movement. Coordinates are in northern/eastern + */ + private double y; - /** - * Small helper for holding the interesting part of the old data state of the - * objects. - */ - public static class OldState { - LatLon latlon; - EastNorth eastNorth; - boolean modified; - } - - /** - * List of all old states of the objects. - */ - private List oldState = new LinkedList(); + /** + * Small helper for holding the interesting part of the old data state of the + * objects. + */ + public static class OldState { + LatLon latlon; + EastNorth eastNorth; + boolean modified; + } - - public MoveCommand(OsmPrimitive osm, double x, double y) { - this(Collections.singleton(osm), x, y); - } - /** - * Create a MoveCommand and assign the initial object set and movement vector. - */ - public MoveCommand(Collection objects, double x, double y) { - this.x = x; - this.y = y; - this.objects = AllNodesVisitor.getAllNodes(objects); - for (Node n : this.objects) { - OldState os = new OldState(); - os.eastNorth = n.eastNorth; - os.latlon = n.coor; - os.modified = n.modified; - oldState.add(os); - } - } + /** + * List of all old states of the objects. + */ + private List oldState = new LinkedList(); - /** - * Move the same set of objects again by the specified vector. The vectors - * are added together and so the resulting will be moved to the previous - * vector plus this one. - * - * The move is immediately executed and any undo will undo both vectors to - * the original position the objects had before first moving. - */ - public void moveAgain(double x, double y) { - for (Node n : objects) { - n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y); - n.coor = Main.proj.eastNorth2latlon(n.eastNorth); - } - this.x += x; - this.y += y; - } - - @Override public boolean executeCommand() { - for (Node n : objects) { - n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y); - n.coor = Main.proj.eastNorth2latlon(n.eastNorth); - n.modified = true; - } - return true; - } - @Override public void undoCommand() { - Iterator it = oldState.iterator(); - for (Node n : objects) { - OldState os = it.next(); - n.eastNorth = os.eastNorth; - n.coor = os.latlon; - n.modified = os.modified; - } - } + public MoveCommand(OsmPrimitive osm, double x, double y) { + this(Collections.singleton(osm), x, y); + } + /** + * Create a MoveCommand and assign the initial object set and movement vector. + */ + public MoveCommand(Collection objects, double x, double y) { + this.x = x; + this.y = y; + this.objects = AllNodesVisitor.getAllNodes(objects); + for (Node n : this.objects) { + OldState os = new OldState(); + os.eastNorth = n.eastNorth; + os.latlon = n.coor; + os.modified = n.modified; + oldState.add(os); + } + } - @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - for (OsmPrimitive osm : objects) - modified.add(osm); - } + /** + * Move the same set of objects again by the specified vector. The vectors + * are added together and so the resulting will be moved to the previous + * vector plus this one. + * + * The move is immediately executed and any undo will undo both vectors to + * the original position the objects had before first moving. + */ + public void moveAgain(double x, double y) { + for (Node n : objects) { + n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y); + n.coor = Main.proj.eastNorth2latlon(n.eastNorth); + } + this.x += x; + this.y += y; + } - @Override public MutableTreeNode description() { - return new DefaultMutableTreeNode(new JLabel(tr("Move")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); + @Override public boolean executeCommand() { + for (Node n : objects) { + n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y); + n.coor = Main.proj.eastNorth2latlon(n.eastNorth); + n.modified = true; + } + return true; + } + + @Override public void undoCommand() { + Iterator it = oldState.iterator(); + for (Node n : objects) { + OldState os = it.next(); + n.eastNorth = os.eastNorth; + n.coor = os.latlon; + n.modified = os.modified; + } + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + for (OsmPrimitive osm : objects) + modified.add(osm); + } + + @Override public MutableTreeNode description() { + return new DefaultMutableTreeNode(new JLabel(tr("Move")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); } } Index: trunk/src/org/openstreetmap/josm/command/RotateCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 1169) @@ -23,115 +23,115 @@ /** * RotateCommand rotates a number of objects around their centre. - * + * * @author Frederik Ramm */ public class RotateCommand extends Command { - - /** - * The objects to rotate. - */ - public Collection objects = new LinkedList(); - - /** - * pivot point - */ - private Node pivot; - - /** - * angle of rotation starting click to pivot - */ - private double startAngle; - - /** - * computed rotation angle between starting click and current mouse pos - */ - private double rotationAngle; - - /** - * List of all old states of the objects. - */ - private Map oldState = new HashMap(); - - /** - * Creates a RotateCommand. - * Assign the initial object set, compute pivot point and rotation angle. - * Computation of pivot point is done by the same rules that are used in - * the "align nodes in circle" action. - */ - public RotateCommand(Collection objects, EastNorth start, EastNorth end) { - this.objects = AllNodesVisitor.getAllNodes(objects); - pivot = new Node(new LatLon(0,0)); - pivot.eastNorth = new EastNorth(0,0); + /** + * The objects to rotate. + */ + public Collection objects = new LinkedList(); - for (Node n : this.objects) { - MoveCommand.OldState os = new MoveCommand.OldState(); - os.eastNorth = n.eastNorth; - os.latlon = n.coor; - os.modified = n.modified; - oldState.put(n, os); - pivot.eastNorth = new EastNorth(pivot.eastNorth.east()+os.eastNorth.east(), pivot.eastNorth.north()+os.eastNorth.north()); - } - pivot.eastNorth = new EastNorth(pivot.eastNorth.east()/this.objects.size(), pivot.eastNorth.north()/this.objects.size()); - pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth); + /** + * pivot point + */ + private Node pivot; - rotationAngle = Math.PI/2; - rotateAgain(start, end); - } + /** + * angle of rotation starting click to pivot + */ + private double startAngle; - /** - * Rotate the same set of objects again, by the angle between given - * start and end nodes. Internally this is added to the existing - * rotation so a later undo will undo the whole rotation. - */ - public void rotateAgain(EastNorth start, EastNorth end) { - // compute angle - startAngle = Math.atan2(start.east()-pivot.eastNorth.east(), start.north()-pivot.eastNorth.north()); - double endAngle = Math.atan2(end.east()-pivot.eastNorth.east(), end.north()-pivot.eastNorth.north()); - rotationAngle += startAngle - endAngle; - rotateNodes(false); - } + /** + * computed rotation angle between starting click and current mouse pos + */ + private double rotationAngle; - /** - * Helper for actually rotationg the nodes. - * @param setModified - true if rotated nodes should be flagged "modified" - */ - private void rotateNodes(boolean setModified) { - for (Node n : objects) { - double cosPhi = Math.cos(rotationAngle); - double sinPhi = Math.sin(rotationAngle); - EastNorth oldEastNorth = oldState.get(n).eastNorth; - double x = oldEastNorth.east() - pivot.eastNorth.east(); - double y = oldEastNorth.north() - pivot.eastNorth.north(); - double nx = sinPhi * x + cosPhi * y + pivot.eastNorth.east(); - double ny = -cosPhi * x + sinPhi * y + pivot.eastNorth.north(); - n.eastNorth = new EastNorth(nx, ny); - n.coor = Main.proj.eastNorth2latlon(n.eastNorth); - if (setModified) - n.modified = true; - } - } - - @Override public boolean executeCommand() { - rotateNodes(true); - return true; - } + /** + * List of all old states of the objects. + */ + private Map oldState = new HashMap(); - @Override public void undoCommand() { - for (Node n : objects) { - MoveCommand.OldState os = oldState.get(n); - n.eastNorth = os.eastNorth; - n.coor = os.latlon; - n.modified = os.modified; - } - } + /** + * Creates a RotateCommand. + * Assign the initial object set, compute pivot point and rotation angle. + * Computation of pivot point is done by the same rules that are used in + * the "align nodes in circle" action. + */ + public RotateCommand(Collection objects, EastNorth start, EastNorth end) { - @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - for (OsmPrimitive osm : objects) - modified.add(osm); - } + this.objects = AllNodesVisitor.getAllNodes(objects); + pivot = new Node(new LatLon(0,0)); + pivot.eastNorth = new EastNorth(0,0); - @Override public MutableTreeNode description() { - return new DefaultMutableTreeNode(new JLabel(tr("Rotate")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); + for (Node n : this.objects) { + MoveCommand.OldState os = new MoveCommand.OldState(); + os.eastNorth = n.eastNorth; + os.latlon = n.coor; + os.modified = n.modified; + oldState.put(n, os); + pivot.eastNorth = new EastNorth(pivot.eastNorth.east()+os.eastNorth.east(), pivot.eastNorth.north()+os.eastNorth.north()); + } + pivot.eastNorth = new EastNorth(pivot.eastNorth.east()/this.objects.size(), pivot.eastNorth.north()/this.objects.size()); + pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth); + + rotationAngle = Math.PI/2; + rotateAgain(start, end); + } + + /** + * Rotate the same set of objects again, by the angle between given + * start and end nodes. Internally this is added to the existing + * rotation so a later undo will undo the whole rotation. + */ + public void rotateAgain(EastNorth start, EastNorth end) { + // compute angle + startAngle = Math.atan2(start.east()-pivot.eastNorth.east(), start.north()-pivot.eastNorth.north()); + double endAngle = Math.atan2(end.east()-pivot.eastNorth.east(), end.north()-pivot.eastNorth.north()); + rotationAngle += startAngle - endAngle; + rotateNodes(false); + } + + /** + * Helper for actually rotationg the nodes. + * @param setModified - true if rotated nodes should be flagged "modified" + */ + private void rotateNodes(boolean setModified) { + for (Node n : objects) { + double cosPhi = Math.cos(rotationAngle); + double sinPhi = Math.sin(rotationAngle); + EastNorth oldEastNorth = oldState.get(n).eastNorth; + double x = oldEastNorth.east() - pivot.eastNorth.east(); + double y = oldEastNorth.north() - pivot.eastNorth.north(); + double nx = sinPhi * x + cosPhi * y + pivot.eastNorth.east(); + double ny = -cosPhi * x + sinPhi * y + pivot.eastNorth.north(); + n.eastNorth = new EastNorth(nx, ny); + n.coor = Main.proj.eastNorth2latlon(n.eastNorth); + if (setModified) + n.modified = true; + } + } + + @Override public boolean executeCommand() { + rotateNodes(true); + return true; + } + + @Override public void undoCommand() { + for (Node n : objects) { + MoveCommand.OldState os = oldState.get(n); + n.eastNorth = os.eastNorth; + n.coor = os.latlon; + n.modified = os.modified; + } + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + for (OsmPrimitive osm : objects) + modified.add(osm); + } + + @Override public MutableTreeNode description() { + return new DefaultMutableTreeNode(new JLabel(tr("Rotate")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); } } Index: trunk/src/org/openstreetmap/josm/command/SequenceCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (revision 1169) @@ -20,74 +20,74 @@ public class SequenceCommand extends Command { - /** - * The command sequenz to be executed. - */ - private Command[] sequence; - private boolean sequence_complete; - private final String name; - public boolean continueOnError = false; + /** + * The command sequenz to be executed. + */ + private Command[] sequence; + private boolean sequence_complete; + private final String name; + public boolean continueOnError = false; - /** - * Create the command by specifying the list of commands to execute. - * @param sequenz The sequence that should be executed. - */ - public SequenceCommand(String name, Collection sequenz) { - this.name = name; - this.sequence = new Command[sequenz.size()]; - this.sequence = sequenz.toArray(this.sequence); - } + /** + * Create the command by specifying the list of commands to execute. + * @param sequenz The sequence that should be executed. + */ + public SequenceCommand(String name, Collection sequenz) { + this.name = name; + this.sequence = new Command[sequenz.size()]; + this.sequence = sequenz.toArray(this.sequence); + } - /** - * Convenient constructor, if the commands are known at compile time. - */ - public SequenceCommand(String name, Command... sequenz) { - this(name, Arrays.asList(sequenz)); - } - - public int executed_commands = 0; - @Override public boolean executeCommand() { - for (int i=0; i < sequence.length; i++) { - Command c = sequence[i]; - boolean result = c.executeCommand(); - if (!result) - Main.debug("SequenceCommand, executing command[" + i + "] " + c + " result: " + result); - if (!result && !continueOnError) { - this.undoCommands(i-1); - return false; - } - } - sequence_complete = true; - return true; - } + /** + * Convenient constructor, if the commands are known at compile time. + */ + public SequenceCommand(String name, Command... sequenz) { + this(name, Arrays.asList(sequenz)); + } - public Command getLastCommand() { - if(sequence.length == 0) - return null; - return sequence[sequence.length-1]; - } - private void undoCommands(int start) { - // We probably aborted this halfway though the - // execution sequence because of a sub-command - // error. We already undid the sub-commands. - if (!sequence_complete) - return; - for (int i = start; i >= 0; --i) - sequence[i].undoCommand(); - } + public int executed_commands = 0; + @Override public boolean executeCommand() { + for (int i=0; i < sequence.length; i++) { + Command c = sequence[i]; + boolean result = c.executeCommand(); + if (!result) + Main.debug("SequenceCommand, executing command[" + i + "] " + c + " result: " + result); + if (!result && !continueOnError) { + this.undoCommands(i-1); + return false; + } + } + sequence_complete = true; + return true; + } - @Override public void undoCommand() { - this.undoCommands(sequence.length-1); - } + public Command getLastCommand() { + if(sequence.length == 0) + return null; + return sequence[sequence.length-1]; + } + private void undoCommands(int start) { + // We probably aborted this halfway though the + // execution sequence because of a sub-command + // error. We already undid the sub-commands. + if (!sequence_complete) + return; + for (int i = start; i >= 0; --i) + sequence[i].undoCommand(); + } - @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - for (Command c : sequence) - c.fillModifiedData(modified, deleted, added); - } + @Override public void undoCommand() { + this.undoCommands(sequence.length-1); + } - @Override public MutableTreeNode description() { - DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Sequence")+": "+name); - for (Command c : sequence) - root.add(c.description()); - return root; + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + for (Command c : sequence) + c.fillModifiedData(modified, deleted, added); + } + + @Override public MutableTreeNode description() { + DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Sequence")+": "+name); + for (Command c : sequence) + root.add(c.description()); + return root; } } Index: trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 1169) @@ -13,50 +13,50 @@ extends JTable { - private static final int MAX_VISIBLE_LINES = 10; + private static final int MAX_VISIBLE_LINES = 10; public static class BoldRenderer extends JLabel implements - TableCellRenderer { + TableCellRenderer { - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, int row, - int column) { + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, int row, + int column) { - Font f = getFont(); - setFont(new Font(f.getName(), f.getStyle() | Font.BOLD, f.getSize())); + Font f = getFont(); + setFont(new Font(f.getName(), f.getStyle() | Font.BOLD, f.getSize())); - setText((String)value); + setText((String)value); - return this; - } - } + return this; + } + } - private static BoldRenderer boldRenderer = null; + private static BoldRenderer boldRenderer = null; - protected CorrectionTable(TM correctionTableModel) { - super(correctionTableModel); + protected CorrectionTable(TM correctionTableModel) { + super(correctionTableModel); - final int correctionsSize = correctionTableModel.getCorrections().size(); - final int lines = correctionsSize > MAX_VISIBLE_LINES ? MAX_VISIBLE_LINES + final int correctionsSize = correctionTableModel.getCorrections().size(); + final int lines = correctionsSize > MAX_VISIBLE_LINES ? MAX_VISIBLE_LINES : correctionsSize; - setPreferredScrollableViewportSize(new Dimension(400, lines - * getRowHeight())); - getColumnModel().getColumn(correctionTableModel.getApplyColumn()) + setPreferredScrollableViewportSize(new Dimension(400, lines + * getRowHeight())); + getColumnModel().getColumn(correctionTableModel.getApplyColumn()) .setPreferredWidth(40); - setRowSelectionAllowed(false); - } + setRowSelectionAllowed(false); + } - public TableCellRenderer getCellRenderer(int row, int column) { - if (getCorrectionTableModel().isBoldCell(row, column)) { - if (boldRenderer == null) - boldRenderer = new BoldRenderer(); - return boldRenderer; - } - return super.getCellRenderer(row, column); - } + public TableCellRenderer getCellRenderer(int row, int column) { + if (getCorrectionTableModel().isBoldCell(row, column)) { + if (boldRenderer == null) + boldRenderer = new BoldRenderer(); + return boldRenderer; + } + return super.getCellRenderer(row, column); + } - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") public TM getCorrectionTableModel() { - return (TM)getModel(); - } + return (TM)getModel(); + } } Index: trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 1169) @@ -12,69 +12,69 @@ AbstractTableModel { - private List corrections; - private boolean[] apply; - private int applyColumn; + private List corrections; + private boolean[] apply; + private int applyColumn; - public CorrectionTableModel(List corrections) { - super(); - this.corrections = corrections; - apply = new boolean[this.corrections.size()]; - Arrays.fill(apply, true); - applyColumn = getColumnCount() - 1; - } - - abstract public int getColumnCount(); - - abstract protected boolean isBoldCell(int row, int column); - abstract public String getCorrectionColumnName(int colIndex); - abstract public Object getCorrectionValueAt(int rowIndex, int colIndex); - - public List getCorrections() { - return corrections; - } - - public int getApplyColumn() { - return applyColumn; - } - - public boolean getApply(int i) { - return apply[i]; + public CorrectionTableModel(List corrections) { + super(); + this.corrections = corrections; + apply = new boolean[this.corrections.size()]; + Arrays.fill(apply, true); + applyColumn = getColumnCount() - 1; } - public int getRowCount() { - return corrections.size(); + abstract public int getColumnCount(); + + abstract protected boolean isBoldCell(int row, int column); + abstract public String getCorrectionColumnName(int colIndex); + abstract public Object getCorrectionValueAt(int rowIndex, int colIndex); + + public List getCorrections() { + return corrections; } - @Override - public Class getColumnClass(int columnIndex) { - if (columnIndex == applyColumn) - return Boolean.class; - return String.class; + public int getApplyColumn() { + return applyColumn; } - @Override - public String getColumnName(int columnIndex) { - if (columnIndex == applyColumn) - return tr("Apply?"); - - return getCorrectionColumnName(columnIndex); - } - - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) { - return columnIndex == applyColumn; + public boolean getApply(int i) { + return apply[i]; } - @Override + public int getRowCount() { + return corrections.size(); + } + + @Override + public Class getColumnClass(int columnIndex) { + if (columnIndex == applyColumn) + return Boolean.class; + return String.class; + } + + @Override + public String getColumnName(int columnIndex) { + if (columnIndex == applyColumn) + return tr("Apply?"); + + return getCorrectionColumnName(columnIndex); + } + + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return columnIndex == applyColumn; + } + + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - if (columnIndex == applyColumn && aValue instanceof Boolean) - apply[rowIndex] = (Boolean)aValue; + if (columnIndex == applyColumn && aValue instanceof Boolean) + apply[rowIndex] = (Boolean)aValue; } public Object getValueAt(int rowIndex, int colIndex) { - if (colIndex == applyColumn) - return apply[rowIndex]; - - return getCorrectionValueAt(rowIndex, colIndex); - } + if (colIndex == applyColumn) + return apply[rowIndex]; + + return getCorrectionValueAt(rowIndex, colIndex); + } } Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 1169) @@ -22,14 +22,14 @@ public class ReverseWayTagCorrector extends TagCorrector { - private static class PrefixSuffixSwitcher { + private static class PrefixSuffixSwitcher { - private final String a; - private final String b; - private final Pattern startPattern; - private final Pattern endPattern; + private final String a; + private final String b; + private final Pattern startPattern; + private final Pattern endPattern; - private final String SEPARATOR = "[:_]?"; - - public PrefixSuffixSwitcher(String a, String b) { + private final String SEPARATOR = "[:_]?"; + + public PrefixSuffixSwitcher(String a, String b) { this.a = a; this.b = b; @@ -40,101 +40,101 @@ SEPARATOR + "(" + a + "|" + b + ")$", Pattern.CASE_INSENSITIVE); - } + } - public String apply(String text) { - Matcher m = startPattern.matcher(text); - if (!m.lookingAt()) - m = endPattern.matcher(text); + public String apply(String text) { + Matcher m = startPattern.matcher(text); + if (!m.lookingAt()) + m = endPattern.matcher(text); - if (m.lookingAt()) { - String leftRight = m.group(1).toLowerCase(); + if (m.lookingAt()) { + String leftRight = m.group(1).toLowerCase(); - StringBuilder result = new StringBuilder(); - result.append(text.substring(0, m.start(1))); - result.append(leftRight.equals(a) ? b : a); - result.append(text.substring(m.end(1))); - - return result.toString(); - } - return text; - } - } + StringBuilder result = new StringBuilder(); + result.append(text.substring(0, m.start(1))); + result.append(leftRight.equals(a) ? b : a); + result.append(text.substring(m.end(1))); - private static PrefixSuffixSwitcher[] prefixSuffixSwitchers = - new PrefixSuffixSwitcher[] { - new PrefixSuffixSwitcher("left", "right"), - new PrefixSuffixSwitcher("forward", "backward") - }; + return result.toString(); + } + return text; + } + } - @Override - public Collection execute(Way way) throws UserCancelException { - Map> tagCorrectionsMap = - new HashMap>(); + private static PrefixSuffixSwitcher[] prefixSuffixSwitchers = + new PrefixSuffixSwitcher[] { + new PrefixSuffixSwitcher("left", "right"), + new PrefixSuffixSwitcher("forward", "backward") + }; - ArrayList primitives = new ArrayList(); - primitives.add(way); - primitives.addAll(way.nodes); + @Override + public Collection execute(Way way) throws UserCancelException { + Map> tagCorrectionsMap = + new HashMap>(); - for (OsmPrimitive primitive : primitives) { - tagCorrectionsMap.put(primitive, new ArrayList()); + ArrayList primitives = new ArrayList(); + primitives.add(way); + primitives.addAll(way.nodes); - for (String key : primitive.keySet()) { - String newKey = key; - String value = primitive.get(key); - String newValue = value; + for (OsmPrimitive primitive : primitives) { + tagCorrectionsMap.put(primitive, new ArrayList()); - if (key.equals("oneway")) { - if (value.equals("-1")) - newValue = OsmUtils.trueval; - else { - Boolean boolValue = OsmUtils.getOsmBoolean(value); - if (boolValue != null && boolValue.booleanValue()) { - newValue = "-1"; - } - } - } else { - for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) { - newKey = prefixSuffixSwitcher.apply(key); - if (!key.equals(newKey)) - break; - } - } + for (String key : primitive.keySet()) { + String newKey = key; + String value = primitive.get(key); + String newValue = value; - if (!key.equals(newKey) || !value.equals(newValue)) - tagCorrectionsMap.get(primitive).add( - new TagCorrection(key, value, newKey, newValue)); - } - } + if (key.equals("oneway")) { + if (value.equals("-1")) + newValue = OsmUtils.trueval; + else { + Boolean boolValue = OsmUtils.getOsmBoolean(value); + if (boolValue != null && boolValue.booleanValue()) { + newValue = "-1"; + } + } + } else { + for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) { + newKey = prefixSuffixSwitcher.apply(key); + if (!key.equals(newKey)) + break; + } + } - Map> roleCorrectionMap = - new HashMap>(); - roleCorrectionMap.put(way, new ArrayList()); + if (!key.equals(newKey) || !value.equals(newValue)) + tagCorrectionsMap.get(primitive).add( + new TagCorrection(key, value, newKey, newValue)); + } + } - for (Relation relation : Main.ds.relations) { - for (RelationMember member : relation.members) { - if (!member.member.realEqual(way, true) - || member.role.length() == 0) - continue; + Map> roleCorrectionMap = + new HashMap>(); + roleCorrectionMap.put(way, new ArrayList()); - boolean found = false; - String newRole = null; - for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) { - newRole = prefixSuffixSwitcher.apply(member.role); - if (!newRole.equals(member.role)) { - found = true; - break; - } - } + for (Relation relation : Main.ds.relations) { + for (RelationMember member : relation.members) { + if (!member.member.realEqual(way, true) + || member.role.length() == 0) + continue; - if (found) - roleCorrectionMap.get(way).add( - new RoleCorrection(relation, member, newRole)); - } - } + boolean found = false; + String newRole = null; + for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) { + newRole = prefixSuffixSwitcher.apply(member.role); + if (!newRole.equals(member.role)) { + found = true; + break; + } + } - return applyCorrections(tagCorrectionsMap, roleCorrectionMap, - tr("When reverting this way, following changes to properties " - + "of the way and its nodes are suggested in order " - + "to maintain data consistency.")); - } + if (found) + roleCorrectionMap.get(way).add( + new RoleCorrection(relation, member, newRole)); + } + } + + return applyCorrections(tagCorrectionsMap, roleCorrectionMap, + tr("When reverting this way, following changes to properties " + + "of the way and its nodes are suggested in order " + + "to maintain data consistency.")); + } } Index: trunk/src/org/openstreetmap/josm/corrector/TagCorrection.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/TagCorrection.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/corrector/TagCorrection.java (revision 1169) @@ -4,23 +4,23 @@ public class TagCorrection implements Correction { - public final String oldKey; - public final String newKey; - public final String oldValue; - public final String newValue; + public final String oldKey; + public final String newKey; + public final String oldValue; + public final String newValue; - public TagCorrection(String oldKey, String oldValue, String newKey, + public TagCorrection(String oldKey, String oldValue, String newKey, String newValue) { - this.oldKey = oldKey; - this.oldValue = oldValue; - this.newKey = newKey; - this.newValue = newValue; - } + this.oldKey = oldKey; + this.oldValue = oldValue; + this.newKey = newKey; + this.newValue = newValue; + } - public boolean isKeyChanged() { - return !newKey.equals(oldKey); - } + public boolean isKeyChanged() { + return !newKey.equals(oldKey); + } - public boolean isValueChanged() { - return !newValue.equals(oldValue); - } + public boolean isValueChanged() { + return !newValue.equals(oldValue); + } } Index: trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTable.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTable.java (revision 1169) @@ -7,7 +7,7 @@ CorrectionTable { - public TagCorrectionTable(List tagCorrections) { - super(new TagCorrectionTableModel(tagCorrections)); - } + public TagCorrectionTable(List tagCorrections) { + super(new TagCorrectionTableModel(tagCorrections)); + } } Index: trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java (revision 1169) @@ -8,49 +8,49 @@ public class TagCorrectionTableModel extends CorrectionTableModel { - public TagCorrectionTableModel(List tagCorrections) { - super(tagCorrections); - } + public TagCorrectionTableModel(List tagCorrections) { + super(tagCorrections); + } - @Override - public int getColumnCount() { - return 5; - } + @Override + public int getColumnCount() { + return 5; + } - @Override - public String getCorrectionColumnName(int colIndex) { - switch (colIndex) { - case 0: - return tr("Old key"); - case 1: - return tr("Old value"); - case 2: - return tr("New key"); - case 3: - return tr("New value"); - } - return null; - } + @Override + public String getCorrectionColumnName(int colIndex) { + switch (colIndex) { + case 0: + return tr("Old key"); + case 1: + return tr("Old value"); + case 2: + return tr("New key"); + case 3: + return tr("New value"); + } + return null; + } public Object getCorrectionValueAt(int rowIndex, int colIndex) { - TagCorrection tagCorrection = getCorrections().get(rowIndex); + TagCorrection tagCorrection = getCorrections().get(rowIndex); - switch (colIndex) { - case 0: - return tagCorrection.oldKey; - case 1: - return tagCorrection.oldValue; - case 2: - return tagCorrection.newKey; - case 3: - return tagCorrection.newValue; - } - return null; - } + switch (colIndex) { + case 0: + return tagCorrection.oldKey; + case 1: + return tagCorrection.oldValue; + case 2: + return tagCorrection.newKey; + case 3: + return tagCorrection.newValue; + } + return null; + } - protected boolean isBoldCell(int row, int column) { - TagCorrection tagCorrection = getCorrections().get(row); - return (column == 2 && tagCorrection.isKeyChanged()) - || (column == 3 && tagCorrection.isValueChanged()); - } + protected boolean isBoldCell(int row, int column) { + TagCorrection tagCorrection = getCorrections().get(row); + return (column == 2 && tagCorrection.isKeyChanged()) + || (column == 3 && tagCorrection.isValueChanged()); + } } Index: trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (revision 1169) @@ -33,113 +33,113 @@ public abstract class TagCorrector

{ - public abstract Collection execute(P primitive) - throws UserCancelException; + public abstract Collection execute(P primitive) + throws UserCancelException; - private String[] applicationOptions = new String[] { - tr("Apply selected changes"), - tr("Don't apply changes"), - tr("Cancel") + private String[] applicationOptions = new String[] { + tr("Apply selected changes"), + tr("Don't apply changes"), + tr("Cancel") }; - - protected Collection applyCorrections( - Map> tagCorrectionsMap, - Map> roleCorrectionMap, - String description) throws UserCancelException { - boolean hasCorrections = false; - for (List tagCorrectionList : tagCorrectionsMap.values()) { - if (!tagCorrectionList.isEmpty()) { - hasCorrections = true; - break; - } - } + protected Collection applyCorrections( + Map> tagCorrectionsMap, + Map> roleCorrectionMap, + String description) throws UserCancelException { - if (!hasCorrections) - for (List roleCorrectionList : roleCorrectionMap - .values()) { - if (!roleCorrectionList.isEmpty()) { - hasCorrections = true; - break; - } - } + boolean hasCorrections = false; + for (List tagCorrectionList : tagCorrectionsMap.values()) { + if (!tagCorrectionList.isEmpty()) { + hasCorrections = true; + break; + } + } - if (hasCorrections) { - Collection commands = new ArrayList(); - Map tagTableMap = - new HashMap(); - Map roleTableMap = - new HashMap(); + if (!hasCorrections) + for (List roleCorrectionList : roleCorrectionMap + .values()) { + if (!roleCorrectionList.isEmpty()) { + hasCorrections = true; + break; + } + } - NameVisitor nameVisitor = new NameVisitor(); + if (hasCorrections) { + Collection commands = new ArrayList(); + Map tagTableMap = + new HashMap(); + Map roleTableMap = + new HashMap(); - final JPanel p = new JPanel(new GridBagLayout()); + NameVisitor nameVisitor = new NameVisitor(); - final JMultilineLabel label1 = new JMultilineLabel(description); - label1.setMaxWidth(400); - p.add(label1, GBC.eop()); + final JPanel p = new JPanel(new GridBagLayout()); - final JMultilineLabel label2 = new JMultilineLabel( - tr("Please select which property changes you want to apply.")); - label2.setMaxWidth(400); - p.add(label2, GBC.eop()); + final JMultilineLabel label1 = new JMultilineLabel(description); + label1.setMaxWidth(400); + p.add(label1, GBC.eop()); - for (OsmPrimitive primitive : tagCorrectionsMap.keySet()) { - final List tagCorrections = tagCorrectionsMap - .get(primitive); + final JMultilineLabel label2 = new JMultilineLabel( + tr("Please select which property changes you want to apply.")); + label2.setMaxWidth(400); + p.add(label2, GBC.eop()); - if (tagCorrections.isEmpty()) - continue; + for (OsmPrimitive primitive : tagCorrectionsMap.keySet()) { + final List tagCorrections = tagCorrectionsMap + .get(primitive); - primitive.visit(nameVisitor); + if (tagCorrections.isEmpty()) + continue; - final JLabel propertiesLabel = new JLabel(tr("Properties of ")); - p.add(propertiesLabel, GBC.std()); + primitive.visit(nameVisitor); - final JLabel primitiveLabel = new JLabel( - nameVisitor.name + ":", nameVisitor.icon, JLabel.LEFT); - p.add(primitiveLabel, GBC.eol()); + final JLabel propertiesLabel = new JLabel(tr("Properties of ")); + p.add(propertiesLabel, GBC.std()); - final TagCorrectionTable table = new TagCorrectionTable( - tagCorrections); - final JScrollPane scrollPane = new JScrollPane(table); - p.add(scrollPane, GBC.eop()); + final JLabel primitiveLabel = new JLabel( + nameVisitor.name + ":", nameVisitor.icon, JLabel.LEFT); + p.add(primitiveLabel, GBC.eol()); - tagTableMap.put(primitive, table); - } + final TagCorrectionTable table = new TagCorrectionTable( + tagCorrections); + final JScrollPane scrollPane = new JScrollPane(table); + p.add(scrollPane, GBC.eop()); - for (OsmPrimitive primitive : roleCorrectionMap.keySet()) { - final List roleCorrections = roleCorrectionMap - .get(primitive); - if (roleCorrections.isEmpty()) - continue; + tagTableMap.put(primitive, table); + } - primitive.visit(nameVisitor); + for (OsmPrimitive primitive : roleCorrectionMap.keySet()) { + final List roleCorrections = roleCorrectionMap + .get(primitive); + if (roleCorrections.isEmpty()) + continue; - final JLabel rolesLabel = new JLabel( - tr("Roles in relations referring to")); - p.add(rolesLabel, GBC.std()); + primitive.visit(nameVisitor); - final JLabel primitiveLabel = new JLabel( - nameVisitor.name + ":", nameVisitor.icon, JLabel.LEFT); - p.add(primitiveLabel, GBC.eol()); + final JLabel rolesLabel = new JLabel( + tr("Roles in relations referring to")); + p.add(rolesLabel, GBC.std()); - final RoleCorrectionTable table = new RoleCorrectionTable( - roleCorrections); - final JScrollPane scrollPane = new JScrollPane(table); - p.add(scrollPane, GBC.eop()); + final JLabel primitiveLabel = new JLabel( + nameVisitor.name + ":", nameVisitor.icon, JLabel.LEFT); + p.add(primitiveLabel, GBC.eol()); - roleTableMap.put(primitive, table); - } + final RoleCorrectionTable table = new RoleCorrectionTable( + roleCorrections); + final JScrollPane scrollPane = new JScrollPane(table); + p.add(scrollPane, GBC.eop()); - int answer = JOptionPane.showOptionDialog(Main.parent, p, + roleTableMap.put(primitive, table); + } + + int answer = JOptionPane.showOptionDialog(Main.parent, p, tr("Automatic tag correction"), JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.PLAIN_MESSAGE, null, + JOptionPane.PLAIN_MESSAGE, null, applicationOptions, applicationOptions[0]); - if (answer == JOptionPane.YES_OPTION) { - for (OsmPrimitive primitive : tagCorrectionsMap.keySet()) { - List tagCorrections = + if (answer == JOptionPane.YES_OPTION) { + for (OsmPrimitive primitive : tagCorrectionsMap.keySet()) { + List tagCorrections = tagCorrectionsMap.get(primitive); - + // create the clone OsmPrimitive clone = null; @@ -147,47 +147,47 @@ else if (primitive instanceof Node) clone = new Node((Node)primitive); else if (primitive instanceof Relation) clone = new Relation((Relation)primitive); - + // use this structure to remember keys that have been set already so that // they're not dropped by a later step Set keysChanged = new HashSet(); - + // apply all changes to this clone - for (int i = 0; i < tagCorrections.size(); i++) { - if (tagTableMap.get(primitive).getCorrectionTableModel().getApply(i)) { - TagCorrection tagCorrection = tagCorrections.get(i); - if (tagCorrection.isKeyChanged() && !keysChanged.contains(tagCorrection.oldKey)) clone.remove(tagCorrection.oldKey); - clone.put(tagCorrection.newKey, tagCorrection.newValue); - keysChanged.add(tagCorrection.newKey); - } - } - + for (int i = 0; i < tagCorrections.size(); i++) { + if (tagTableMap.get(primitive).getCorrectionTableModel().getApply(i)) { + TagCorrection tagCorrection = tagCorrections.get(i); + if (tagCorrection.isKeyChanged() && !keysChanged.contains(tagCorrection.oldKey)) clone.remove(tagCorrection.oldKey); + clone.put(tagCorrection.newKey, tagCorrection.newValue); + keysChanged.add(tagCorrection.newKey); + } + } + // save the clone if (!keysChanged.isEmpty()) commands.add(new ChangeCommand(primitive, clone)); - } - for (OsmPrimitive primitive : roleCorrectionMap.keySet()) { - List roleCorrections = roleCorrectionMap - .get(primitive); - for (int i = 0; i < roleCorrections.size(); i++) { - if (roleTableMap.get(primitive) - .getCorrectionTableModel().getApply(i)) { - RoleCorrection roleCorrection = roleCorrections - .get(i); - Relation newRelation = new Relation( - roleCorrection.relation); - for (RelationMember member : newRelation.members) - if (member.equals(roleCorrection.member)) - member.role = roleCorrection.newRole; - commands.add(new ChangeCommand( - roleCorrection.relation, newRelation)); - } - } - } - } else if (answer != JOptionPane.NO_OPTION) { - throw new UserCancelException(); - } - return commands; - } + } + for (OsmPrimitive primitive : roleCorrectionMap.keySet()) { + List roleCorrections = roleCorrectionMap + .get(primitive); + for (int i = 0; i < roleCorrections.size(); i++) { + if (roleTableMap.get(primitive) + .getCorrectionTableModel().getApply(i)) { + RoleCorrection roleCorrection = roleCorrections + .get(i); + Relation newRelation = new Relation( + roleCorrection.relation); + for (RelationMember member : newRelation.members) + if (member.equals(roleCorrection.member)) + member.role = roleCorrection.newRole; + commands.add(new ChangeCommand( + roleCorrection.relation, newRelation)); + } + } + } + } else if (answer != JOptionPane.NO_OPTION) { + throw new UserCancelException(); + } + return commands; + } - return Collections.emptyList(); - } + return Collections.emptyList(); + } } Index: trunk/src/org/openstreetmap/josm/data/Bounds.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 1169) @@ -8,72 +8,72 @@ /** - * This is a simple data class for "rectangular" areas of the world, given in + * This is a simple data class for "rectangular" areas of the world, given in * lat/lon min/max values. - * + * * @author imi */ public class Bounds { - /** - * The minimum and maximum coordinates. - */ - public LatLon min, max; + /** + * The minimum and maximum coordinates. + */ + public LatLon min, max; - /** - * Construct bounds out of two points - */ - public Bounds(LatLon min, LatLon max) { - this.min = min; - this.max = max; - } + /** + * Construct bounds out of two points + */ + public Bounds(LatLon min, LatLon max) { + this.min = min; + this.max = max; + } - /** - * Construct bounds that span the whole world. - */ - public Bounds() { - min = new LatLon(-Projection.MAX_LAT, -Projection.MAX_LON); - max = new LatLon(Projection.MAX_LAT, Projection.MAX_LON); - } - - @Override public String toString() { - return "Bounds["+min.lat()+","+min.lon()+","+max.lat()+","+max.lon()+"]"; - } + /** + * Construct bounds that span the whole world. + */ + public Bounds() { + min = new LatLon(-Projection.MAX_LAT, -Projection.MAX_LON); + max = new LatLon(Projection.MAX_LAT, Projection.MAX_LON); + } - /** - * @return Center of the bounding box. - */ - public LatLon center() { - // FIXME: not sure whether this calculation is right; maybe there is some - // more complex calculation needed to get a center of a spherical - // dimension? - return new LatLon((min.lat()+max.lat())/2, (min.lon()+max.lon())/2); - } - - /** - * Extend the bounds if necessary to include the given point. - */ - public void extend(LatLon ll) { - if (ll.lat() < min.lat() || ll.lon() < min.lon()) - min = new LatLon(Math.min(ll.lat(), min.lat()), Math.min(ll.lon(), min.lon())); - if (ll.lat() > max.lat() || ll.lon() > max.lon()) - max = new LatLon(Math.max(ll.lat(), max.lat()), Math.max(ll.lon(), max.lon())); - } - /** - * Is the given point within this bounds? - */ - public boolean contains(LatLon ll) { - if (ll.lat() < min.lat() || ll.lon() < min.lon()) - return false; - if (ll.lat() > max.lat() || ll.lon() > max.lon()) - return false; - return true; - } - - /** - * Converts the lat/lon bounding box to an object of type Rectangle2D.Double - * @return the bounding box to Rectangle2D.Double - */ - public Rectangle2D.Double asRect() { - return new Rectangle2D.Double(min.lon(), min.lat(), max.lon()-min.lon(), max.lat()-min.lat()); - } + @Override public String toString() { + return "Bounds["+min.lat()+","+min.lon()+","+max.lat()+","+max.lon()+"]"; + } + + /** + * @return Center of the bounding box. + */ + public LatLon center() { + // FIXME: not sure whether this calculation is right; maybe there is some + // more complex calculation needed to get a center of a spherical + // dimension? + return new LatLon((min.lat()+max.lat())/2, (min.lon()+max.lon())/2); + } + + /** + * Extend the bounds if necessary to include the given point. + */ + public void extend(LatLon ll) { + if (ll.lat() < min.lat() || ll.lon() < min.lon()) + min = new LatLon(Math.min(ll.lat(), min.lat()), Math.min(ll.lon(), min.lon())); + if (ll.lat() > max.lat() || ll.lon() > max.lon()) + max = new LatLon(Math.max(ll.lat(), max.lat()), Math.max(ll.lon(), max.lon())); + } + /** + * Is the given point within this bounds? + */ + public boolean contains(LatLon ll) { + if (ll.lat() < min.lat() || ll.lon() < min.lon()) + return false; + if (ll.lat() > max.lat() || ll.lon() > max.lon()) + return false; + return true; + } + + /** + * Converts the lat/lon bounding box to an object of type Rectangle2D.Double + * @return the bounding box to Rectangle2D.Double + */ + public Rectangle2D.Double asRect() { + return new Rectangle2D.Double(min.lon(), min.lat(), max.lon()-min.lon(), max.lat()-min.lat()); + } } Index: trunk/src/org/openstreetmap/josm/data/DataSetChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (revision 1169) @@ -14,30 +14,30 @@ public class DataSetChecker { - public static void check() { - if (Main.map == null) - return; + public static void check() { + if (Main.map == null) + return; - Set s = new HashSet(); - for (Layer l : Main.map.mapView.getAllLayers()) { - if (l instanceof OsmDataLayer) { - for (OsmPrimitive osm : ((OsmDataLayer)l).data.allPrimitives()) { - if (s.contains(osm)) { - JOptionPane.showMessageDialog(Main.parent, "cross references"); - return; - } - s.add(osm); - } - } - } - - if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { - OsmDataLayer l = (OsmDataLayer)Main.map.mapView.getActiveLayer(); - if (l.data != Main.ds) { - JOptionPane.showMessageDialog(Main.parent, "Main.ds / active layer mismatch"); - return; - } - } + Set s = new HashSet(); + for (Layer l : Main.map.mapView.getAllLayers()) { + if (l instanceof OsmDataLayer) { + for (OsmPrimitive osm : ((OsmDataLayer)l).data.allPrimitives()) { + if (s.contains(osm)) { + JOptionPane.showMessageDialog(Main.parent, "cross references"); + return; + } + s.add(osm); + } + } + } - JOptionPane.showMessageDialog(Main.parent, "working"); - } + if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer l = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + if (l.data != Main.ds) { + JOptionPane.showMessageDialog(Main.parent, "Main.ds / active layer mismatch"); + return; + } + } + + JOptionPane.showMessageDialog(Main.parent, "working"); + } } Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 1169) @@ -35,61 +35,61 @@ */ public class Preferences { - - /** - * Internal storage for the preferenced directory. + + /** + * Internal storage for the preferenced directory. * Do not access this variable directly! * @see #getPreferencesDirFile() */ private File preferencesDirFile = null; - - public static interface PreferenceChangedListener { - void preferenceChanged(String key, String newValue); - } - - /** - * Class holding one bookmarkentry. - * @author imi - */ - public static class Bookmark implements Comparable { - public String name; - public double[] latlon = new double[4]; // minlat, minlon, maxlat, maxlon - @Override public String toString() { - return name; - } - public int compareTo(Bookmark b) { - return name.toLowerCase().compareTo(b.name.toLowerCase()); - } - } - - public final ArrayList listener = new ArrayList(); - - /** - * Map the property name to the property object. - */ - protected final SortedMap properties = new TreeMap(); - protected final SortedMap defaults = new TreeMap(); - - /** - * Override some values on read. This is intended to be used for technology previews - * where we want to temporarily modify things without changing the user's preferences - * file. - */ - protected static final SortedMap override = new TreeMap(); - static { - //override.put("osm-server.version", "0.5"); - //override.put("osm-server.additional-versions", ""); - //override.put("osm-server.url", "http://openstreetmap.gryph.de/api"); - //override.put("plugins", null); - } - - /** - * Return the location of the user defined preferences file - */ - public String getPreferencesDir() { - final String path = getPreferencesDirFile().getPath(); - if (path.endsWith(File.separator)) - return path; - return path + File.separator; - } + + public static interface PreferenceChangedListener { + void preferenceChanged(String key, String newValue); + } + + /** + * Class holding one bookmarkentry. + * @author imi + */ + public static class Bookmark implements Comparable { + public String name; + public double[] latlon = new double[4]; // minlat, minlon, maxlat, maxlon + @Override public String toString() { + return name; + } + public int compareTo(Bookmark b) { + return name.toLowerCase().compareTo(b.name.toLowerCase()); + } + } + + public final ArrayList listener = new ArrayList(); + + /** + * Map the property name to the property object. + */ + protected final SortedMap properties = new TreeMap(); + protected final SortedMap defaults = new TreeMap(); + + /** + * Override some values on read. This is intended to be used for technology previews + * where we want to temporarily modify things without changing the user's preferences + * file. + */ + protected static final SortedMap override = new TreeMap(); + static { + //override.put("osm-server.version", "0.5"); + //override.put("osm-server.additional-versions", ""); + //override.put("osm-server.url", "http://openstreetmap.gryph.de/api"); + //override.put("plugins", null); + } + + /** + * Return the location of the user defined preferences file + */ + public String getPreferencesDir() { + final String path = getPreferencesDirFile().getPath(); + if (path.endsWith(File.separator)) + return path; + return path + File.separator; + } public File getPreferencesDirFile() { @@ -110,371 +110,371 @@ return preferencesDirFile; } - - public File getPluginsDirFile() { - return new File(getPreferencesDirFile(), "plugins"); - } - - /** - * @return A list of all existing directories where resources could be stored. - */ - public Collection getAllPossiblePreferenceDirs() { - LinkedList locations = new LinkedList(); - locations.add(Main.pref.getPreferencesDir()); - String s; - if ((s = System.getenv("JOSM_RESOURCES")) != null) { - if (!s.endsWith(File.separator)) - s = s + File.separator; - locations.add(s); - } - if ((s = System.getProperty("josm.resources")) != null) { - if (!s.endsWith(File.separator)) - s = s + File.separator; - locations.add(s); - } - String appdata = System.getenv("APPDATA"); - if (System.getenv("ALLUSERSPROFILE") != null && appdata != null - && appdata.lastIndexOf(File.separator) != -1) { - appdata = appdata.substring(appdata.lastIndexOf(File.separator)); - locations.add(new File(new File(System.getenv("ALLUSERSPROFILE"), - appdata), "JOSM").getPath()); - } - locations.add("/usr/local/share/josm/"); - locations.add("/usr/local/lib/josm/"); - locations.add("/usr/share/josm/"); - locations.add("/usr/lib/josm/"); - return locations; - } - - synchronized public boolean hasKey(final String key) { - return override.containsKey(key) ? override.get(key) != null : properties.containsKey(key); - } - - synchronized public String get(final String key) { - putDefault(key, null); - if (override.containsKey(key)) - return override.get(key); - if (!properties.containsKey(key)) - return ""; - return properties.get(key); - } - - synchronized public String get(final String key, final String def) { - putDefault(key, def); - if (override.containsKey(key)) - return override.get(key); - final String prop = properties.get(key); - if (prop == null || prop.equals("")) - return def; - return prop; - } - - synchronized public Map getAllPrefix(final String prefix) { - final Map all = new TreeMap(); - for (final Entry e : properties.entrySet()) - if (e.getKey().startsWith(prefix)) - all.put(e.getKey(), e.getValue()); - for (final Entry e : override.entrySet()) - if (e.getKey().startsWith(prefix)) - if (e.getValue() == null) - all.remove(e.getKey()); - else - all.put(e.getKey(), e.getValue()); - return all; - } - - synchronized public Map getDefaults() { - return defaults; - } - - synchronized public void putDefault(final String key, final String def) { - if(!defaults.containsKey(key) || defaults.get(key) == null) - defaults.put(key, def); - else if(def != null && !defaults.get(key).equals(def)) - System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key)); - } - - synchronized public boolean getBoolean(final String key) { - putDefault(key, null); - if (override.containsKey(key)) - return override.get(key) == null ? false : Boolean.parseBoolean(override.get(key)); - return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : false; - } - - synchronized public boolean getBoolean(final String key, final boolean def) { - putDefault(key, Boolean.toString(def)); - if (override.containsKey(key)) - return override.get(key) == null ? def : Boolean.parseBoolean(override.get(key)); - return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : def; - } - - synchronized public void put(final String key, String value) { - String oldvalue = properties.get(key); - if(value != null && value.length() == 0) - value = null; - if(!((oldvalue == null && value == null) || (value != null - && oldvalue != null && oldvalue.equals(value)))) - { - if (value == null) - properties.remove(key); - else - properties.put(key, value); - save(); - firePreferenceChanged(key, value); - } - } - - synchronized public void put(final String key, final boolean value) { - put(key, Boolean.toString(value)); - } - - private final void firePreferenceChanged(final String key, final String value) { - for (final PreferenceChangedListener l : listener) - l.preferenceChanged(key, value); - } - - /** - * Called after every put. In case of a problem, do nothing but output the error - * in log. - */ - public void save() { - try { - setSystemProperties(); - final PrintWriter out = new PrintWriter(new FileWriter(getPreferencesDir() + "preferences"), false); - for (final Entry e : properties.entrySet()) { - out.println(e.getKey() + "=" + e.getValue()); - } - out.close(); - } catch (final IOException e) { - e.printStackTrace(); - // do not message anything, since this can be called from strange - // places. - } - } - - public void load() throws IOException { - properties.clear(); - final BufferedReader in = new BufferedReader(new FileReader(getPreferencesDir()+"preferences")); - int lineNumber = 0; - ArrayList errLines = new ArrayList(); - for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) { - final int i = line.indexOf('='); - if (i == -1 || i == 0) { - errLines.add(lineNumber); - continue; - } - properties.put(line.substring(0,i), line.substring(i+1)); - } - if (!errLines.isEmpty()) { - throw new IOException("Malformed config file at lines " + errLines); - } - setSystemProperties(); - } - - public final void resetToDefault() { - properties.clear(); - properties.put("projection", "org.openstreetmap.josm.data.projection.Epsg4326"); - properties.put("draw.segment.direction", "true"); - properties.put("draw.wireframe", "false"); - properties.put("layerlist.visible", "true"); - properties.put("propertiesdialog.visible", "true"); - properties.put("selectionlist.visible", "true"); - properties.put("commandstack.visible", "true"); - properties.put("osm-server.url", "http://www.openstreetmap.org/api"); - if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) { - properties.put("laf", "javax.swing.plaf.metal.MetalLookAndFeel"); - } else { - properties.put("laf", "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); - } - save(); - } - - public Collection loadBookmarks() throws IOException { - File bookmarkFile = new File(getPreferencesDir()+"bookmarks"); - if (!bookmarkFile.exists()) - bookmarkFile.createNewFile(); - BufferedReader in = new BufferedReader(new FileReader(bookmarkFile)); - - LinkedList bookmarks = new LinkedList(); - // use pattern matches to scan text, as text may contain a "," itself - for (String line = in.readLine(); line != null; line = in.readLine()) { - Matcher m = Pattern.compile("^(.+),(-?\\d+.\\d+),(-?\\d+.\\d+),(-?\\d+.\\d+),(-?\\d+.\\d+)$").matcher(line); - if(m.matches()) - { - Bookmark b = new Bookmark(); - b.name = m.group(1); - for (int i = 0; i < b.latlon.length; ++i) - b.latlon[i] = Double.parseDouble(m.group(i+2)); - bookmarks.add(b); - } - } - in.close(); - Collections.sort(bookmarks); - return bookmarks; - } - - public void saveBookmarks(Collection bookmarks) throws IOException { - File bookmarkFile = new File(Main.pref.getPreferencesDir()+"bookmarks"); - if (!bookmarkFile.exists()) - bookmarkFile.createNewFile(); - PrintWriter out = new PrintWriter(new FileWriter(bookmarkFile)); - for (Bookmark b : bookmarks) { - out.print(b.name+","); - for (int i = 0; i < b.latlon.length; ++i) - out.print(b.latlon[i]+(i getCollection(String key, Collection def) { - String s = get(key); - if(s != null && s.length() != 0) - { - /* handle old comma separated stuff - remove in future */ - if(s.indexOf(',') >= 0) - return Arrays.asList(s.split(",")); - /* handle space separated stuff - remove in future */ - else if(s.indexOf(' ') >= 0) - return Arrays.asList(s.split(",")); - else - return Arrays.asList(s.split(";")); - } - else if(def != null) - return def; - return null; - } - synchronized public void removeFromCollection(String key, String value) { - ArrayList a = new ArrayList(getCollection(key, null)); - if(a != null) - { - a.remove(value); - putCollection(key, a); - } - } - synchronized public void putCollection(String key, Collection val) { - String s = null; - if(val != null) - { - for(String a : val) - { - if(s != null) - s += ";" + a; - else - s = a; - } - } - - put(key, s); - } - - private void setSystemProperties() { - Properties sysProp = System.getProperties(); - if (getBoolean(ProxyPreferences.PROXY_ENABLE)) { - sysProp.put("proxySet", "true"); - sysProp.put("http.proxyHost", get(ProxyPreferences.PROXY_HOST)); - sysProp.put("proxyPort", get(ProxyPreferences.PROXY_PORT)); - if (!getBoolean(ProxyPreferences.PROXY_ANONYMOUS)) { - sysProp.put("proxyUser", get(ProxyPreferences.PROXY_USER)); - sysProp.put("proxyPassword", get(ProxyPreferences.PROXY_PASS)); - } - }/* else { - sysProp.put("proxySet", "false"); - sysProp.remove("http.proxyHost"); - sysProp.remove("proxyPort"); - sysProp.remove("proxyUser"); - sysProp.remove("proxyPassword"); - }*/ - System.setProperties(sysProp); - } + + public File getPluginsDirFile() { + return new File(getPreferencesDirFile(), "plugins"); + } + + /** + * @return A list of all existing directories where resources could be stored. + */ + public Collection getAllPossiblePreferenceDirs() { + LinkedList locations = new LinkedList(); + locations.add(Main.pref.getPreferencesDir()); + String s; + if ((s = System.getenv("JOSM_RESOURCES")) != null) { + if (!s.endsWith(File.separator)) + s = s + File.separator; + locations.add(s); + } + if ((s = System.getProperty("josm.resources")) != null) { + if (!s.endsWith(File.separator)) + s = s + File.separator; + locations.add(s); + } + String appdata = System.getenv("APPDATA"); + if (System.getenv("ALLUSERSPROFILE") != null && appdata != null + && appdata.lastIndexOf(File.separator) != -1) { + appdata = appdata.substring(appdata.lastIndexOf(File.separator)); + locations.add(new File(new File(System.getenv("ALLUSERSPROFILE"), + appdata), "JOSM").getPath()); + } + locations.add("/usr/local/share/josm/"); + locations.add("/usr/local/lib/josm/"); + locations.add("/usr/share/josm/"); + locations.add("/usr/lib/josm/"); + return locations; + } + + synchronized public boolean hasKey(final String key) { + return override.containsKey(key) ? override.get(key) != null : properties.containsKey(key); + } + + synchronized public String get(final String key) { + putDefault(key, null); + if (override.containsKey(key)) + return override.get(key); + if (!properties.containsKey(key)) + return ""; + return properties.get(key); + } + + synchronized public String get(final String key, final String def) { + putDefault(key, def); + if (override.containsKey(key)) + return override.get(key); + final String prop = properties.get(key); + if (prop == null || prop.equals("")) + return def; + return prop; + } + + synchronized public Map getAllPrefix(final String prefix) { + final Map all = new TreeMap(); + for (final Entry e : properties.entrySet()) + if (e.getKey().startsWith(prefix)) + all.put(e.getKey(), e.getValue()); + for (final Entry e : override.entrySet()) + if (e.getKey().startsWith(prefix)) + if (e.getValue() == null) + all.remove(e.getKey()); + else + all.put(e.getKey(), e.getValue()); + return all; + } + + synchronized public Map getDefaults() { + return defaults; + } + + synchronized public void putDefault(final String key, final String def) { + if(!defaults.containsKey(key) || defaults.get(key) == null) + defaults.put(key, def); + else if(def != null && !defaults.get(key).equals(def)) + System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key)); + } + + synchronized public boolean getBoolean(final String key) { + putDefault(key, null); + if (override.containsKey(key)) + return override.get(key) == null ? false : Boolean.parseBoolean(override.get(key)); + return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : false; + } + + synchronized public boolean getBoolean(final String key, final boolean def) { + putDefault(key, Boolean.toString(def)); + if (override.containsKey(key)) + return override.get(key) == null ? def : Boolean.parseBoolean(override.get(key)); + return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : def; + } + + synchronized public void put(final String key, String value) { + String oldvalue = properties.get(key); + if(value != null && value.length() == 0) + value = null; + if(!((oldvalue == null && value == null) || (value != null + && oldvalue != null && oldvalue.equals(value)))) + { + if (value == null) + properties.remove(key); + else + properties.put(key, value); + save(); + firePreferenceChanged(key, value); + } + } + + synchronized public void put(final String key, final boolean value) { + put(key, Boolean.toString(value)); + } + + private final void firePreferenceChanged(final String key, final String value) { + for (final PreferenceChangedListener l : listener) + l.preferenceChanged(key, value); + } + + /** + * Called after every put. In case of a problem, do nothing but output the error + * in log. + */ + public void save() { + try { + setSystemProperties(); + final PrintWriter out = new PrintWriter(new FileWriter(getPreferencesDir() + "preferences"), false); + for (final Entry e : properties.entrySet()) { + out.println(e.getKey() + "=" + e.getValue()); + } + out.close(); + } catch (final IOException e) { + e.printStackTrace(); + // do not message anything, since this can be called from strange + // places. + } + } + + public void load() throws IOException { + properties.clear(); + final BufferedReader in = new BufferedReader(new FileReader(getPreferencesDir()+"preferences")); + int lineNumber = 0; + ArrayList errLines = new ArrayList(); + for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) { + final int i = line.indexOf('='); + if (i == -1 || i == 0) { + errLines.add(lineNumber); + continue; + } + properties.put(line.substring(0,i), line.substring(i+1)); + } + if (!errLines.isEmpty()) { + throw new IOException("Malformed config file at lines " + errLines); + } + setSystemProperties(); + } + + public final void resetToDefault() { + properties.clear(); + properties.put("projection", "org.openstreetmap.josm.data.projection.Epsg4326"); + properties.put("draw.segment.direction", "true"); + properties.put("draw.wireframe", "false"); + properties.put("layerlist.visible", "true"); + properties.put("propertiesdialog.visible", "true"); + properties.put("selectionlist.visible", "true"); + properties.put("commandstack.visible", "true"); + properties.put("osm-server.url", "http://www.openstreetmap.org/api"); + if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) { + properties.put("laf", "javax.swing.plaf.metal.MetalLookAndFeel"); + } else { + properties.put("laf", "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); + } + save(); + } + + public Collection loadBookmarks() throws IOException { + File bookmarkFile = new File(getPreferencesDir()+"bookmarks"); + if (!bookmarkFile.exists()) + bookmarkFile.createNewFile(); + BufferedReader in = new BufferedReader(new FileReader(bookmarkFile)); + + LinkedList bookmarks = new LinkedList(); + // use pattern matches to scan text, as text may contain a "," itself + for (String line = in.readLine(); line != null; line = in.readLine()) { + Matcher m = Pattern.compile("^(.+),(-?\\d+.\\d+),(-?\\d+.\\d+),(-?\\d+.\\d+),(-?\\d+.\\d+)$").matcher(line); + if(m.matches()) + { + Bookmark b = new Bookmark(); + b.name = m.group(1); + for (int i = 0; i < b.latlon.length; ++i) + b.latlon[i] = Double.parseDouble(m.group(i+2)); + bookmarks.add(b); + } + } + in.close(); + Collections.sort(bookmarks); + return bookmarks; + } + + public void saveBookmarks(Collection bookmarks) throws IOException { + File bookmarkFile = new File(Main.pref.getPreferencesDir()+"bookmarks"); + if (!bookmarkFile.exists()) + bookmarkFile.createNewFile(); + PrintWriter out = new PrintWriter(new FileWriter(bookmarkFile)); + for (Bookmark b : bookmarks) { + out.print(b.name+","); + for (int i = 0; i < b.latlon.length; ++i) + out.print(b.latlon[i]+(i getCollection(String key, Collection def) { + String s = get(key); + if(s != null && s.length() != 0) + { + /* handle old comma separated stuff - remove in future */ + if(s.indexOf(',') >= 0) + return Arrays.asList(s.split(",")); + /* handle space separated stuff - remove in future */ + else if(s.indexOf(' ') >= 0) + return Arrays.asList(s.split(",")); + else + return Arrays.asList(s.split(";")); + } + else if(def != null) + return def; + return null; + } + synchronized public void removeFromCollection(String key, String value) { + ArrayList a = new ArrayList(getCollection(key, null)); + if(a != null) + { + a.remove(value); + putCollection(key, a); + } + } + synchronized public void putCollection(String key, Collection val) { + String s = null; + if(val != null) + { + for(String a : val) + { + if(s != null) + s += ";" + a; + else + s = a; + } + } + + put(key, s); + } + + private void setSystemProperties() { + Properties sysProp = System.getProperties(); + if (getBoolean(ProxyPreferences.PROXY_ENABLE)) { + sysProp.put("proxySet", "true"); + sysProp.put("http.proxyHost", get(ProxyPreferences.PROXY_HOST)); + sysProp.put("proxyPort", get(ProxyPreferences.PROXY_PORT)); + if (!getBoolean(ProxyPreferences.PROXY_ANONYMOUS)) { + sysProp.put("proxyUser", get(ProxyPreferences.PROXY_USER)); + sysProp.put("proxyPassword", get(ProxyPreferences.PROXY_PASS)); + } + }/* else { + sysProp.put("proxySet", "false"); + sysProp.remove("http.proxyHost"); + sysProp.remove("proxyPort"); + sysProp.remove("proxyUser"); + sysProp.remove("proxyPassword"); + }*/ + System.setProperties(sysProp); + } } Index: trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java (revision 1169) @@ -10,17 +10,17 @@ * a selection of any data member changes, the dataSet gets informed about this * and fires a selectionChanged event. - * + * * Note that these events are not fired immediately but are inserted in the * Swing event queue and packed together. So only one selection changed event * is issued within a one message dispatch routine. - * + * * @author imi */ public interface SelectionChangedListener { - /** - * Informs the listener that the selection in the dataset has changed. - * @param newSelection The new selection. - */ - public void selectionChanged(Collection newSelection); + /** + * Informs the listener that the selection in the dataset has changed. + * @param newSelection The new selection. + */ + public void selectionChanged(Collection newSelection); } Index: trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 1169) @@ -32,160 +32,160 @@ * This class tweak the Preferences class to provide server side preference settings, as example * used in the applet version. - * + * * @author Imi */ public class ServerSidePreferences extends Preferences { - private final Connection connection; + private final Connection connection; - private class Connection extends OsmConnection { - URL serverUrl; - public Connection(URL serverUrl) { - this.serverUrl = serverUrl; - } - public String download() { - try { - System.out.println("reading preferences from "+serverUrl); - URLConnection con = serverUrl.openConnection(); - if (con instanceof HttpURLConnection) addAuth((HttpURLConnection) con); - con.connect(); - BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream())); - StringBuilder b = new StringBuilder(); - for (String line = reader.readLine(); line != null; line = reader.readLine()) { - b.append(line); - b.append("\n"); - } - if (con instanceof HttpURLConnection) ((HttpURLConnection) con).disconnect(); - return b.toString(); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - public void upload(String s) { - try { - URL u = new URL(getPreferencesDir()); - System.out.println("uploading preferences to "+u); - HttpURLConnection con = (HttpURLConnection)u.openConnection(); - con.addRequestProperty("Authorization", "Basic "+Base64.encode(get("osm-server.username")+":"+get("osm-server.password"))); - con.setRequestMethod("POST"); - con.setDoOutput(true); - con.connect(); - PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutputStream())); - out.println(s); - out.close(); - con.getInputStream().close(); - con.disconnect(); - JOptionPane.showMessageDialog(Main.parent, tr("Preferences stored on {0}", u.getHost())); - } catch (Exception e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("Could not upload preferences. Reason: {0}", e.getMessage())); - } - } - } + private class Connection extends OsmConnection { + URL serverUrl; + public Connection(URL serverUrl) { + this.serverUrl = serverUrl; + } + public String download() { + try { + System.out.println("reading preferences from "+serverUrl); + URLConnection con = serverUrl.openConnection(); + if (con instanceof HttpURLConnection) addAuth((HttpURLConnection) con); + con.connect(); + BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream())); + StringBuilder b = new StringBuilder(); + for (String line = reader.readLine(); line != null; line = reader.readLine()) { + b.append(line); + b.append("\n"); + } + if (con instanceof HttpURLConnection) ((HttpURLConnection) con).disconnect(); + return b.toString(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + public void upload(String s) { + try { + URL u = new URL(getPreferencesDir()); + System.out.println("uploading preferences to "+u); + HttpURLConnection con = (HttpURLConnection)u.openConnection(); + con.addRequestProperty("Authorization", "Basic "+Base64.encode(get("osm-server.username")+":"+get("osm-server.password"))); + con.setRequestMethod("POST"); + con.setDoOutput(true); + con.connect(); + PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutputStream())); + out.println(s); + out.close(); + con.getInputStream().close(); + con.disconnect(); + JOptionPane.showMessageDialog(Main.parent, tr("Preferences stored on {0}", u.getHost())); + } catch (Exception e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not upload preferences. Reason: {0}", e.getMessage())); + } + } + } - public ServerSidePreferences(URL serverUrl) { - Connection connection = null; - try { - connection = new Connection(new URL(serverUrl+"user/preferences")); - } catch (MalformedURLException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("Could not load preferences from server.")); - } - this.connection = connection; - } + public ServerSidePreferences(URL serverUrl) { + Connection connection = null; + try { + connection = new Connection(new URL(serverUrl+"user/preferences")); + } catch (MalformedURLException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not load preferences from server.")); + } + this.connection = connection; + } - @Override public String getPreferencesDir() { - return connection.serverUrl.toString(); - } + @Override public String getPreferencesDir() { + return connection.serverUrl.toString(); + } - /** - * Do nothing on load. Preferences are loaded with download(). - */ - @Override public void load() { - } + /** + * Do nothing on load. Preferences are loaded with download(). + */ + @Override public void load() { + } - /** - * Do nothing on save. Preferences are uploaded using upload(). - */ - @Override public void save() { - } + /** + * Do nothing on save. Preferences are uploaded using upload(). + */ + @Override public void save() { + } - public static class Prop { - public String key; - public String value; - } + public static class Prop { + public String key; + public String value; + } - public void download(String userName, String password) { - resetToDefault(); - if (!properties.containsKey("osm-server.username") && userName != null) - properties.put("osm-server.username", userName); - if (!properties.containsKey("osm-server.password") && password != null) - properties.put("osm-server.password", password); - String cont = connection.download(); - if (cont == null) return; - Reader in = new StringReader(cont); - try { - XmlObjectParser.Uniform parser = new XmlObjectParser.Uniform(in, "tag", Prop.class); - for (Prop p : parser) - properties.put(p.key, p.value); - } catch (RuntimeException e) { - e.printStackTrace(); - } - } + public void download(String userName, String password) { + resetToDefault(); + if (!properties.containsKey("osm-server.username") && userName != null) + properties.put("osm-server.username", userName); + if (!properties.containsKey("osm-server.password") && password != null) + properties.put("osm-server.password", password); + String cont = connection.download(); + if (cont == null) return; + Reader in = new StringReader(cont); + try { + XmlObjectParser.Uniform parser = new XmlObjectParser.Uniform(in, "tag", Prop.class); + for (Prop p : parser) + properties.put(p.key, p.value); + } catch (RuntimeException e) { + e.printStackTrace(); + } + } - /** - * Use this instead of save() for the ServerSidePreferences, since uploads - * are costly while save is called often. - * - * This is triggered by an explicit menu option. - */ - public void upload() { - StringBuilder b = new StringBuilder("\n"); - for (Entry p : properties.entrySet()) { - if (p.getKey().equals("osm-server.password")) - continue; // do not upload password. It would get stored in plain! - b.append("\n"); - } - b.append(""); - connection.upload(b.toString()); - } + /** + * Use this instead of save() for the ServerSidePreferences, since uploads + * are costly while save is called often. + * + * This is triggered by an explicit menu option. + */ + public void upload() { + StringBuilder b = new StringBuilder("\n"); + for (Entry p : properties.entrySet()) { + if (p.getKey().equals("osm-server.password")) + continue; // do not upload password. It would get stored in plain! + b.append("\n"); + } + b.append(""); + connection.upload(b.toString()); + } - @Override public Collection loadBookmarks() { - try { - Collection bookmarks; - BufferedReader in = new BufferedReader(new InputStreamReader(new URL("http://"+connection.serverUrl.getHost()+"/josm/bookmarks").openStream())); - bookmarks = new LinkedList(); - for (String line = in.readLine(); line != null; line = in.readLine()) { - StringTokenizer st = new StringTokenizer(line, ","); - if (st.countTokens() < 5) - continue; - Bookmark b = new Bookmark(); - b.name = st.nextToken(); - try { - for (int i = 0; i < b.latlon.length; ++i) - b.latlon[i] = Double.parseDouble(st.nextToken()); - bookmarks.add(b); - } catch (NumberFormatException x) { - // line not parsed - } - } - in.close(); - return bookmarks; - } catch (MalformedURLException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - return Collections.emptyList(); - } + @Override public Collection loadBookmarks() { + try { + Collection bookmarks; + BufferedReader in = new BufferedReader(new InputStreamReader(new URL("http://"+connection.serverUrl.getHost()+"/josm/bookmarks").openStream())); + bookmarks = new LinkedList(); + for (String line = in.readLine(); line != null; line = in.readLine()) { + StringTokenizer st = new StringTokenizer(line, ","); + if (st.countTokens() < 5) + continue; + Bookmark b = new Bookmark(); + b.name = st.nextToken(); + try { + for (int i = 0; i < b.latlon.length; ++i) + b.latlon[i] = Double.parseDouble(st.nextToken()); + bookmarks.add(b); + } catch (NumberFormatException x) { + // line not parsed + } + } + in.close(); + return bookmarks; + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } - @Override public void saveBookmarks(Collection bookmarks) { - } + @Override public void saveBookmarks(Collection bookmarks) { + } } Index: trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 1169) @@ -15,102 +15,102 @@ public class UndoRedoHandler implements LayerChangeListener { - /** - * All commands that were made on the dataset. Don't write from outside! - */ - public final LinkedList commands = new LinkedList(); - /** - * The stack for redoing commands - */ - private final Stack redoCommands = new Stack(); + /** + * All commands that were made on the dataset. Don't write from outside! + */ + public final LinkedList commands = new LinkedList(); + /** + * The stack for redoing commands + */ + private final Stack redoCommands = new Stack(); - public final LinkedList listenerCommands = new LinkedList(); + public final LinkedList listenerCommands = new LinkedList(); - public UndoRedoHandler() { - Layer.listeners.add(this); - } + public UndoRedoHandler() { + Layer.listeners.add(this); + } - /** - * Execute the command and add it to the intern command queue. - */ - public void add(final Command c) { - c.executeCommand(); - commands.add(c); - redoCommands.clear(); - if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { - OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); - data.setModified(true); - data.fireDataChange(); - } - fireCommandsChanged(); - } + /** + * Execute the command and add it to the intern command queue. + */ + public void add(final Command c) { + c.executeCommand(); + commands.add(c); + redoCommands.clear(); + if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + data.setModified(true); + data.fireDataChange(); + } + fireCommandsChanged(); + } - /** - * Undoes the last added command. - */ - public void undo() { - if (commands.isEmpty()) - return; - final Command c = commands.removeLast(); - c.undoCommand(); - redoCommands.push(c); - if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { - OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); - data.setModified(data.uploadedModified || !commands.isEmpty()); - data.fireDataChange(); - } - fireCommandsChanged(); - Main.ds.setSelected(); - } + /** + * Undoes the last added command. + */ + public void undo() { + if (commands.isEmpty()) + return; + final Command c = commands.removeLast(); + c.undoCommand(); + redoCommands.push(c); + if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + data.setModified(data.uploadedModified || !commands.isEmpty()); + data.fireDataChange(); + } + fireCommandsChanged(); + Main.ds.setSelected(); + } - /** - * Redoes the last undoed command. - * TODO: This has to be moved to a central place in order to support multiple layers. - */ - public void redo() { - if (redoCommands.isEmpty()) - return; - final Command c = redoCommands.pop(); - c.executeCommand(); - commands.add(c); - if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { - OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); - data.setModified(true); - data.fireDataChange(); - } - fireCommandsChanged(); - } + /** + * Redoes the last undoed command. + * TODO: This has to be moved to a central place in order to support multiple layers. + */ + public void redo() { + if (redoCommands.isEmpty()) + return; + final Command c = redoCommands.pop(); + c.executeCommand(); + commands.add(c); + if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + data.setModified(true); + data.fireDataChange(); + } + fireCommandsChanged(); + } - public void fireCommandsChanged() { - for (final CommandQueueListener l : listenerCommands) - l.commandChanged(commands.size(), redoCommands.size()); - } + public void fireCommandsChanged() { + for (final CommandQueueListener l : listenerCommands) + l.commandChanged(commands.size(), redoCommands.size()); + } - public void clean() { - redoCommands.clear(); - commands.clear(); - fireCommandsChanged(); - } + public void clean() { + redoCommands.clear(); + commands.clear(); + fireCommandsChanged(); + } - public void layerRemoved(Layer oldLayer) { - boolean changed = false; - for (Iterator it = commands.iterator(); it.hasNext();) { - if (it.next().invalidBecauselayerRemoved(oldLayer)) { - it.remove(); - changed = true; - } - } - for (Iterator it = redoCommands.iterator(); it.hasNext();) { - if (it.next().invalidBecauselayerRemoved(oldLayer)) { - it.remove(); - changed = true; - } - } - if (changed) - fireCommandsChanged(); - } + public void layerRemoved(Layer oldLayer) { + boolean changed = false; + for (Iterator it = commands.iterator(); it.hasNext();) { + if (it.next().invalidBecauselayerRemoved(oldLayer)) { + it.remove(); + changed = true; + } + } + for (Iterator it = redoCommands.iterator(); it.hasNext();) { + if (it.next().invalidBecauselayerRemoved(oldLayer)) { + it.remove(); + changed = true; + } + } + if (changed) + fireCommandsChanged(); + } - public void layerAdded(Layer newLayer) {} - public void activeLayerChange(Layer oldLayer, Layer newLayer) {} + public void layerAdded(Layer newLayer) {} + public void activeLayerChange(Layer oldLayer, Layer newLayer) {} } Index: trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java (revision 1169) @@ -12,29 +12,29 @@ public abstract class ConflictItem { - public String my, their; - public Resolution resolution = null; + public String my, their; + public Resolution resolution = null; - public final void initialize(Map conflicts) { - my = collectStr(conflicts.keySet()); - their = collectStr(conflicts.values()); - } + public final void initialize(Map conflicts) { + my = collectStr(conflicts.keySet()); + their = collectStr(conflicts.values()); + } - abstract public boolean hasConflict(OsmPrimitive key, OsmPrimitive value); - abstract protected String str(OsmPrimitive osm); - abstract public String key(); - abstract public void apply(OsmPrimitive target, OsmPrimitive other); + abstract public boolean hasConflict(OsmPrimitive key, OsmPrimitive value); + abstract protected String str(OsmPrimitive osm); + abstract public String key(); + abstract public void apply(OsmPrimitive target, OsmPrimitive other); - protected final String collectStr(Collection c) { - String value = null; - for (OsmPrimitive osm : c) { - String v = str(osm); - if (value == null) - value = v; - else if (!value.equals(v)) { - value = "<"+tr("different")+">"; - break; - } - } - return value == null ? "" : value; - } + protected final String collectStr(Collection c) { + String value = null; + for (OsmPrimitive osm : c) { + String v = str(osm); + if (value == null) + value = v; + else if (!value.equals(v)) { + value = "<"+tr("different")+">"; + break; + } + } + return value == null ? "" : value; + } } Index: trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (revision 1169) @@ -8,18 +8,18 @@ public class DeleteConflict extends ConflictItem { - @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { - return key.deleted != value.deleted; - } + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + return key.deleted != value.deleted; + } - @Override public String key() { - return "deleted|"+tr("deleted"); - } + @Override public String key() { + return "deleted|"+tr("deleted"); + } - @Override protected String str(OsmPrimitive osm) { - return osm.deleted ? tr("true") : tr("false"); - } + @Override protected String str(OsmPrimitive osm) { + return osm.deleted ? tr("true") : tr("false"); + } - @Override public void apply(OsmPrimitive target, OsmPrimitive other) { - target.deleted = other.deleted; - } + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + target.deleted = other.deleted; + } } Index: trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (revision 1169) @@ -8,22 +8,22 @@ public class PositionConflict extends ConflictItem { - - @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { - return key instanceof Node && !((Node)key).coor.equals(((Node)value).coor); - } - - @Override protected String str(OsmPrimitive osm) { - return osm instanceof Node ? ((Node)osm).coor.lat()+", "+((Node)osm).coor.lon() : null; - } - - @Override public String key() { - return "node|"+tr("position"); - } - - @Override public void apply(OsmPrimitive target, OsmPrimitive other) { - if (target instanceof Node) { - ((Node)target).coor = ((Node)other).coor; - ((Node)target).eastNorth = ((Node)other).eastNorth; - } + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + return key instanceof Node && !((Node)key).coor.equals(((Node)value).coor); + } + + @Override protected String str(OsmPrimitive osm) { + return osm instanceof Node ? ((Node)osm).coor.lat()+", "+((Node)osm).coor.lon() : null; + } + + @Override public String key() { + return "node|"+tr("position"); + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + if (target instanceof Node) { + ((Node)target).coor = ((Node)other).coor; + ((Node)target).eastNorth = ((Node)other).eastNorth; + } } } Index: trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (revision 1169) @@ -5,27 +5,27 @@ public class PropertyConflict extends ConflictItem { - private String key; - - public PropertyConflict(String key) { - this.key = key; - } - - @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { - String k = key.get(this.key); - String v = value.get(this.key); - return k == null ? v!=null : !k.equals(v); - } - - @Override protected String str(OsmPrimitive osm) { - String v = osm.get(key); - return v == null ? "" : v; - } - - @Override public String key() { - return "key|"+key; - } - - @Override public void apply(OsmPrimitive target, OsmPrimitive other) { - target.put(key, other.get(key)); + private String key; + + public PropertyConflict(String key) { + this.key = key; + } + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + String k = key.get(this.key); + String v = value.get(this.key); + return k == null ? v!=null : !k.equals(v); + } + + @Override protected String str(OsmPrimitive osm) { + String v = osm.get(key); + return v == null ? "" : v; + } + + @Override public String key() { + return "key|"+key; + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + target.put(key, other.get(key)); } } Index: trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (revision 1169) @@ -7,39 +7,39 @@ /** * Base class of points of both coordinate systems. - * - * The variables are default package protected to allow routines in the + * + * The variables are default package protected to allow routines in the * data package to access them directly. - * - * As the class itself is package protected too, it is not visible - * outside of the data package. Routines there should only use LatLon or + * + * As the class itself is package protected too, it is not visible + * outside of the data package. Routines there should only use LatLon or * EastNorth. * * @author imi - */ + */ abstract class Coordinate extends Point2D implements Serializable { protected double x; protected double y; - - /** - * Construct the point with latitude / longitude values. - * - * @param x X coordinate of the point. - * @param y Y coordinate of the point. - */ - Coordinate(double x, double y) { + + /** + * Construct the point with latitude / longitude values. + * + * @param x X coordinate of the point. + * @param y Y coordinate of the point. + */ + Coordinate(double x, double y) { this.x = x; this.y = y; - } - + } + public double getX() { return x; } - + public double getY() { - return y; + return y; } - + public void setLocation (double x, double y) { - this.x = x; + this.x = x; this.y = y; } Index: trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 1169) @@ -4,49 +4,49 @@ /** * Northing, Easting of the projected coordinates. - * + * * This class is immutable. - * + * * @author Imi */ public class EastNorth extends Coordinate { - public EastNorth(double east, double north) { - super(east,north); - } - - public double east() { - return x; - } + public EastNorth(double east, double north) { + super(east,north); + } - public double north() { - return y; - } + public double east() { + return x; + } - public EastNorth add(double dx, double dy) { - return new EastNorth(x+dx, y+dy); - } - - public EastNorth interpolate(EastNorth en2, double proportion) { - return new EastNorth(this.x + proportion * (en2.x - this.x), + public double north() { + return y; + } + + public EastNorth add(double dx, double dy) { + return new EastNorth(x+dx, y+dy); + } + + public EastNorth interpolate(EastNorth en2, double proportion) { + return new EastNorth(this.x + proportion * (en2.x - this.x), this.y + proportion * (en2.y - this.y)); - } - + } + /** - * Returns the heading, in radians, that you have to use to get from + * Returns the heading, in radians, that you have to use to get from * this EastNorth to another. Heading is mapped into [0, 2pi) - * + * * @param other the "destination" position - * @return heading + * @return heading */ public double heading(EastNorth other) { double hd = Math.atan2(other.east() - east(), other.north() - north()); if(hd < 0) hd = 2 * Math.PI + hd; - return hd; + return hd; } - + public EastNorth sub(EastNorth en) { return new EastNorth(en.east() - east(), en.north() - north()); } - + /** * Returns an EastNorth representing the this EastNorth rotatedaround @@ -54,5 +54,5 @@ * @param pivot the center of the rotation * @param angle the angle of the rotation - * @return EastNorth rotated object + * @return EastNorth rotated object */ public EastNorth rotate(EastNorth pivot, double angle) { @@ -65,8 +65,8 @@ return new EastNorth(nx, ny); } - - @Override public String toString() { - return "EastNorth[e="+x+", n="+y+"]"; - } + + @Override public String toString() { + return "EastNorth[e="+x+", n="+y+"]"; + } /** Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 1169) @@ -13,7 +13,7 @@ /** * LatLon are unprojected latitude / longitude coordinates. - * + * * This class is immutable. - * + * * @author Imi */ @@ -23,14 +23,14 @@ private static DecimalFormat cDmsSecondFormatter = new DecimalFormat("00.0"); private static DecimalFormat cDdFormatter = new DecimalFormat("###0.0000"); - - /** - * Possible ways to display coordinates - */ - public enum CoordinateFormat { - DECIMAL_DEGREES {public String toString() {return tr("Decimal Degrees");}}, - DEGREES_MINUTES_SECONDS {public String toString() {return tr("Degrees Minutes Seconds");}}; - } - - public static String dms(double pCoordinate) { + + /** + * Possible ways to display coordinates + */ + public enum CoordinateFormat { + DECIMAL_DEGREES {public String toString() {return tr("Decimal Degrees");}}, + DEGREES_MINUTES_SECONDS {public String toString() {return tr("Degrees Minutes Seconds");}}; + } + + public static String dms(double pCoordinate) { double tAbsCoord = Math.abs(pCoordinate); @@ -40,7 +40,7 @@ double tSeconds = (tTmpMinutes - tMinutes) * 60; - return tDegree + "\u00B0" + cDmsMinuteFormatter.format(tMinutes) + "\'" + return tDegree + "\u00B0" + cDmsMinuteFormatter.format(tMinutes) + "\'" + cDmsSecondFormatter.format(tSeconds) + "\""; - } + } public LatLon(double lat, double lon) { @@ -51,5 +51,5 @@ return y; } - + public String latToString(CoordinateFormat d) { switch(d) { @@ -59,9 +59,9 @@ } } - + public double lon() { return x; } - + public String lonToString(CoordinateFormat d) { switch(d) { @@ -71,6 +71,6 @@ } } - - + + /** @@ -86,63 +86,63 @@ /** * @return true, if the coordinate is outside the world, compared - * by using lat/lon. - */ - public boolean isOutSideWorld() { - return lat() < -Projection.MAX_LAT || lat() > Projection.MAX_LAT || - lon() < -Projection.MAX_LON || lon() > Projection.MAX_LON; - } + * by using lat/lon. + */ + public boolean isOutSideWorld() { + return lat() < -Projection.MAX_LAT || lat() > Projection.MAX_LAT || + lon() < -Projection.MAX_LON || lon() > Projection.MAX_LON; + } - /** - * @return true if this is within the given bounding box. - */ - public boolean isWithin(Bounds b) { - return lat() >= b.min.lat() && lat() <= b.max.lat() && lon() > b.min.lon() && lon() < b.max.lon(); - } - - /** - * Computes the distance between this lat/lon and another point on the earth. - * Uses spherical law of cosines formula, not Haversine. - * @param other the other point. - * @return distance in metres. - */ - public double greatCircleDistance(LatLon other) { - return (Math.acos( - Math.sin(Math.toRadians(lat())) * Math.sin(Math.toRadians(other.lat())) + - Math.cos(Math.toRadians(lat()))*Math.cos(Math.toRadians(other.lat())) * - Math.cos(Math.toRadians(other.lon()-lon()))) * 6378135); - } - - /** - * Returns the heading, in radians, that you have to use to get from - * this lat/lon to another. - * - * @param other the "destination" position - * @return heading - */ - public double heading(LatLon other) { - double rv; - if (other.lat() == lat()) { - rv = (other.lon()>lon() ? Math.PI / 2 : Math.PI * 3 / 2); - } else { - rv = Math.atan((other.lon()-lon())/(other.lat()-lat())); - if (rv < 0) rv += Math.PI; - if (other.lon() < lon()) rv += Math.PI; - } - return rv; - } + /** + * @return true if this is within the given bounding box. + */ + public boolean isWithin(Bounds b) { + return lat() >= b.min.lat() && lat() <= b.max.lat() && lon() > b.min.lon() && lon() < b.max.lon(); + } - /** - * Returns this lat/lon pair in human-readable format. - * - * @return String in the format "lat=1.23456°, lon=2.34567°" - */ - public String toDisplayString() { - NumberFormat nf = NumberFormat.getInstance(); - nf.setMaximumFractionDigits(5); - return "lat=" + nf.format(lat()) + "°, lon=" + nf.format(lon()) + "°"; - } - - @Override public String toString() { - return "LatLon[lat="+lat()+",lon="+lon()+"]"; + /** + * Computes the distance between this lat/lon and another point on the earth. + * Uses spherical law of cosines formula, not Haversine. + * @param other the other point. + * @return distance in metres. + */ + public double greatCircleDistance(LatLon other) { + return (Math.acos( + Math.sin(Math.toRadians(lat())) * Math.sin(Math.toRadians(other.lat())) + + Math.cos(Math.toRadians(lat()))*Math.cos(Math.toRadians(other.lat())) * + Math.cos(Math.toRadians(other.lon()-lon()))) * 6378135); + } + + /** + * Returns the heading, in radians, that you have to use to get from + * this lat/lon to another. + * + * @param other the "destination" position + * @return heading + */ + public double heading(LatLon other) { + double rv; + if (other.lat() == lat()) { + rv = (other.lon()>lon() ? Math.PI / 2 : Math.PI * 3 / 2); + } else { + rv = Math.atan((other.lon()-lon())/(other.lat()-lat())); + if (rv < 0) rv += Math.PI; + if (other.lon() < lon()) rv += Math.PI; + } + return rv; + } + + /** + * Returns this lat/lon pair in human-readable format. + * + * @return String in the format "lat=1.23456°, lon=2.34567°" + */ + public String toDisplayString() { + NumberFormat nf = NumberFormat.getInstance(); + nf.setMaximumFractionDigits(5); + return "lat=" + nf.format(lat()) + "°, lon=" + nf.format(lon()) + "°"; + } + + @Override public String toString() { + return "LatLon[lat="+lat()+",lon="+lon()+"]"; } } Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 1169) @@ -15,91 +15,91 @@ * It uses GPX v1.1, see {@link the spec} * for details. - * + * * @author Raphael Mack */ public class GpxData extends WithAttributes { - public File storageFile; - public boolean fromServer; + public File storageFile; + public boolean fromServer; - public Collection tracks = new LinkedList(); - public Collection routes = new LinkedList(); - public Collection waypoints = new LinkedList(); + public Collection tracks = new LinkedList(); + public Collection routes = new LinkedList(); + public Collection waypoints = new LinkedList(); - public Bounds bounds; + public Bounds bounds; - public void mergeFrom(GpxData other) { - if (storageFile == null && other.storageFile != null) { - storageFile = other.storageFile; - } - fromServer = fromServer && other.fromServer; + public void mergeFrom(GpxData other) { + if (storageFile == null && other.storageFile != null) { + storageFile = other.storageFile; + } + fromServer = fromServer && other.fromServer; - for (Map.Entry ent : other.attr.entrySet()) { - // TODO: Detect conflicts. - String k = ent.getKey(); - if (k.equals("link") && attr.containsKey("link")) { - ((Collection) attr.get("link")).addAll( - (Collection) ent.getValue()); - } else { - attr.put(k, ent.getValue()); - } - } - tracks.addAll(other.tracks); - routes.addAll(other.routes); - waypoints.addAll(other.waypoints); - } + for (Map.Entry ent : other.attr.entrySet()) { + // TODO: Detect conflicts. + String k = ent.getKey(); + if (k.equals("link") && attr.containsKey("link")) { + ((Collection) attr.get("link")).addAll( + (Collection) ent.getValue()); + } else { + attr.put(k, ent.getValue()); + } + } + tracks.addAll(other.tracks); + routes.addAll(other.routes); + waypoints.addAll(other.waypoints); + } - public boolean hasTrackPoints() { - for (GpxTrack trk : tracks) { - for (Collection trkseg : trk.trackSegs) { - if (!trkseg.isEmpty()) - return true; - } - } - return false; - } + public boolean hasTrackPoints() { + for (GpxTrack trk : tracks) { + for (Collection trkseg : trk.trackSegs) { + if (!trkseg.isEmpty()) + return true; + } + } + return false; + } - public boolean hasRoutePoints() { - for (GpxRoute rte : routes) { - if (!rte.routePoints.isEmpty()) - return true; - } - return false; - } + public boolean hasRoutePoints() { + for (GpxRoute rte : routes) { + if (!rte.routePoints.isEmpty()) + return true; + } + return false; + } - // FIXME might perhaps use visitor pattern? - public void recalculateBounds() { - bounds = null; - for (WayPoint wpt : waypoints) { - if (bounds == null) { - bounds = new Bounds(wpt.latlon, wpt.latlon); - } else { - bounds.extend(wpt.latlon); - } - } - for (GpxRoute rte : routes) { - for (WayPoint wpt : rte.routePoints) { - if (bounds == null) { - bounds = new Bounds(wpt.latlon, wpt.latlon); - } else { - bounds.extend(wpt.latlon); - } - } - } - for (GpxTrack trk : tracks) { - for (Collection trkseg : trk.trackSegs) { - for (WayPoint wpt : trkseg) { - if (bounds == null) { - bounds = new Bounds(wpt.latlon, wpt.latlon); - } else { - bounds.extend(wpt.latlon); - } - } - } - } - if (bounds == null) { - bounds = new Bounds(); - } - } - + // FIXME might perhaps use visitor pattern? + public void recalculateBounds() { + bounds = null; + for (WayPoint wpt : waypoints) { + if (bounds == null) { + bounds = new Bounds(wpt.latlon, wpt.latlon); + } else { + bounds.extend(wpt.latlon); + } + } + for (GpxRoute rte : routes) { + for (WayPoint wpt : rte.routePoints) { + if (bounds == null) { + bounds = new Bounds(wpt.latlon, wpt.latlon); + } else { + bounds.extend(wpt.latlon); + } + } + } + for (GpxTrack trk : tracks) { + for (Collection trkseg : trk.trackSegs) { + for (WayPoint wpt : trkseg) { + if (bounds == null) { + bounds = new Bounds(wpt.latlon, wpt.latlon); + } else { + bounds.extend(wpt.latlon); + } + } + } + } + if (bounds == null) { + bounds = new Bounds(); + } + } + /** * calculates the sum of the lengths of all track segments @@ -108,5 +108,5 @@ double result = 0.0; // in meters WayPoint last = null; - + for (GpxTrack trk : tracks) { for (Collection trkseg : trk.trackSegs) { @@ -129,5 +129,5 @@ double lat1, lon1, lat2, lon2; double dlon, dlat; - + lat1 = p1.lat() * Math.PI / 180.0; lon1 = p1.lon() * Math.PI / 180.0; Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxLink.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxLink.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxLink.java (revision 1169) @@ -5,10 +5,10 @@ public class GpxLink { - public String uri; - public String text; - public String type; + public String uri; + public String text; + public String type; - public GpxLink(String uri) { - this.uri = uri; - } + public GpxLink(String uri) { + this.uri = uri; + } } Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java (revision 1169) @@ -8,4 +8,4 @@ public class GpxRoute extends WithAttributes { - public Collection routePoints = new LinkedList(); + public Collection routePoints = new LinkedList(); } Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java (revision 1169) @@ -8,5 +8,5 @@ public class GpxTrack extends WithAttributes { - public Collection> trackSegs - = new LinkedList>(); + public Collection> trackSegs + = new LinkedList>(); } Index: trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 1168) +++ trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 1169) @@ -15,65 +15,65 @@ public class WayPoint extends WithAttributes implements Comparable { - public final LatLon latlon; - public final EastNorth eastNorth; - public double time; - public Color speedLineColor; - public boolean drawLine; - public int dir; + public final LatLon latlon; + public final EastNorth eastNorth; + public double time; + public Color speedLineColor; + public boolean drawLine; + public int dir; - public WayPoint(LatLon ll) { - latlon = ll; - eastNorth = Main.proj.latlon2eastNorth(ll); - } + public WayPoint(LatLon ll) { + latlon = ll; + eastNorth = Main.proj.latlon2eastNorth(ll); + } - @Override - public String toString() { - return "WayPoint (" + (attr.containsKey("name") ? attr.get("name") + ", " :"") + latlon.toString() + ", " + attr + ")"; - } - - /** - * Convert the time stamp of the waypoint into seconds from the epoch - */ - public final static SimpleDateFormat GPXTIMEFMT = - new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); // ignore timezone - - public void setTime() { - if (! attr.containsKey("time")) { - return; - } - Date d = GPXTIMEFMT.parse(attr.get("time").toString(), new ParsePosition(0)); - if (d != null /* parsing ok */) { - time = d.getTime() / 1000.0; /* ms => seconds */ - } - } + @Override + public String toString() { + return "WayPoint (" + (attr.containsKey("name") ? attr.get("name") + ", " :"") + latlon.toString() + ", " + attr + ")"; + } - /** - * Convert a time stamp of the waypoint from the or field - * into seconds from the epoch. Handles the date format as it is used by - * Garmin handhelds. Does not overwrite an existing timestamp (!= 0.0). - * A value of