Index: src/org/openstreetmap/josm/Main.java =================================================================== --- src/org/openstreetmap/josm/Main.java (revision 103) +++ src/org/openstreetmap/josm/Main.java (revision 104) @@ -1,3 +1,4 @@ package org.openstreetmap.josm; +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.BorderLayout; @@ -149,5 +150,5 @@ final Action aboutAction = new AboutAction(); - final JMenu fileMenu = new JMenu("Files"); + final JMenu fileMenu = new JMenu(tr("Files")); fileMenu.setMnemonic('F'); fileMenu.add(openAction); @@ -159,16 +160,17 @@ - final JMenu connectionMenu = new JMenu("Connection"); + final JMenu connectionMenu = new JMenu(tr("Connection")); connectionMenu.setMnemonic('C'); connectionMenu.add(downloadAction); + //connectionMenu.add(new DownloadIncompleteAction()); connectionMenu.add(uploadAction); mainMenu.add(connectionMenu); - layerMenu = new JMenu("Layer"); + layerMenu = new JMenu(tr("Layer")); layerMenu.setMnemonic('L'); mainMenu.add(layerMenu); layerMenu.setVisible(false); - final JMenu editMenu = new JMenu("Edit"); + final JMenu editMenu = new JMenu(tr("Edit")); editMenu.setMnemonic('E'); editMenu.add(undoAction); @@ -179,5 +181,5 @@ mainMenu.add(new JSeparator()); - final JMenu helpMenu = new JMenu("Help"); + final JMenu helpMenu = new JMenu(tr("Help")); helpMenu.setMnemonic('H'); helpMenu.add(aboutAction); @@ -220,5 +222,5 @@ public final OsmDataLayer editLayer() { if (map == null || map.mapView.editLayer == null) - addLayer(new OsmDataLayer(ds, "unnamed", false)); + addLayer(new OsmDataLayer(ds, tr("unnamed"), false)); return map.mapView.editLayer; } @@ -270,5 +272,6 @@ } catch (final IOException e1) { e1.printStackTrace(); - errMsg = "Preferences could not be loaded. Write default preference file to '"+pref.getPreferencesDir()+"preferences'."; + errMsg = tr("Preferences could not be loaded. Write default preference file to '{0}'.", + pref.getPreferencesDir() + "preferences"); Main.pref.resetToDefault(); } @@ -280,5 +283,5 @@ } catch (final Exception e) { e.printStackTrace(); - JOptionPane.showMessageDialog(null, "The projection could not be read from preferences. Using EPSG:4263."); + JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using EPSG:4263.")); Main.proj = new Epsg4326(); } @@ -336,5 +339,5 @@ final Bounds b = DownloadAction.osmurl2bounds(s); if (b == null) - JOptionPane.showMessageDialog(Main.parent, "Ignoring malformed url: '"+s+"'"); + JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed url: '{0}'", s)); else main.downloadAction.download(false, b.min.lat(), b.min.lon(), b.max.lat(), b.max.lon()); @@ -346,5 +349,5 @@ main.openAction.openFile(new File(new URI(s))); } catch (URISyntaxException e) { - JOptionPane.showMessageDialog(Main.parent, "Ignoring malformed file url: '"+s+"'"); + JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed file url: '{0}", s)); } return; Index: src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AboutAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/AboutAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Dimension; @@ -34,7 +36,7 @@ */ public class AboutAction extends JosmAction { - + public AboutAction() { - super("About", "about", "Display the about screen.", KeyEvent.VK_A); + super(tr("About"), "about",tr("Display the about screen."), KeyEvent.VK_A); } @@ -54,18 +56,20 @@ JPanel info = new JPanel(new GridBagLayout()); - info.add(new JLabel("Java OpenStreetMap Editor Version "+version), GBC.eop()); - info.add(new JLabel("last change at "+time), GBC.eop()); - info.add(new JLabel("Homepage"), GBC.std().insets(0,0,10,0)); + info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eop()); + info.add(new JLabel(tr("last change at {0}",time)), GBC.eop()); + info.add(new JLabel(tr("Homepage")), GBC.std().insets(0,0,10,0)); info.add(new UrlLabel("http://wiki.eigenheimstrasse.de/wiki/JOSM"), GBC.eol()); + info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(0,0,10,0)); + info.add(new UrlLabel("http://trac.openstreetmap.org"), GBC.eol()); - about.addTab("Info", info); - about.addTab("Readme", new JScrollPane(readme)); - about.addTab("Revision", new JScrollPane(revision)); + about.addTab(tr("Info"), info); + about.addTab(tr("Readme"), new JScrollPane(readme)); + about.addTab(tr("Revision"), new JScrollPane(revision)); about.setPreferredSize(new Dimension(500,300)); - JOptionPane.showMessageDialog(Main.parent, about, "About JOSM...", + JOptionPane.showMessageDialog(Main.parent, about, tr("About JOSM..."), JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo")); } @@ -77,5 +81,5 @@ */ private JTextArea loadFile(URL resource) { - JTextArea area = new JTextArea("File could not be found."); + JTextArea area = new JTextArea(tr("File could not be found.")); area.setEditable(false); Font font = Font.getFont("monospaced"); Index: src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -30,6 +32,6 @@ private final AutoScaleMode mode; public Action(AutoScaleMode mode) { - super("Auto Scale: "+mode, ImageProvider.get("dialogs/autoscale/"+mode)); - putValue(SHORT_DESCRIPTION, "Auto zoom the view to "+mode+". Disabled if the view is moved."); + super(tr("Auto Scale"+": "+tr(mode.toString())), ImageProvider.get("dialogs/autoscale/"+mode)); + putValue(SHORT_DESCRIPTION, tr("Auto zoom the view")+tr("(to "+mode+")")+tr(". Disabled if the view is moved.")); this.mode = mode; } Index: src/org/openstreetmap/josm/actions/DiskAccessAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.io.File; @@ -54,5 +56,5 @@ File file = fc.getSelectedFile(); if (file == null || (file.exists() && JOptionPane.YES_OPTION != - JOptionPane.showConfirmDialog(Main.parent, "File exists. Overwrite?", "Overwrite", JOptionPane.YES_NO_OPTION))) + JOptionPane.showConfirmDialog(Main.parent, tr("File exists. Overwrite?"), tr("Overwrite"), JOptionPane.YES_NO_OPTION))) return null; } Index: src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/DownloadAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Dimension; @@ -42,5 +44,5 @@ import org.openstreetmap.josm.gui.layer.RawGpsLayer; import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint; -import org.openstreetmap.josm.io.OsmServerReader; +import org.openstreetmap.josm.io.BoundingBoxDownloader; import org.openstreetmap.josm.tools.GBC; import org.xml.sax.SAXException; @@ -55,5 +57,4 @@ */ public class DownloadAction extends JosmAction { - /** * Open the download dialog and download the data. @@ -61,9 +62,9 @@ */ private final class DownloadOsmTask extends PleaseWaitRunnable { - private final OsmServerReader reader; + private final BoundingBoxDownloader reader; private DataSet dataSet; - private DownloadOsmTask(OsmServerReader reader) { - super("Downloading data"); + private DownloadOsmTask(BoundingBoxDownloader reader) { + super(tr("Downloading data")); this.reader = reader; reader.setProgressInformation(currentAction, progress); @@ -77,7 +78,7 @@ if (dataSet == null) return; // user cancelled download or error occoured - if (dataSet.nodes.isEmpty()) - errorMessage = "No data imported."; - Main.main.addLayer(new OsmDataLayer(dataSet, "Data Layer", false)); + if (dataSet.allPrimitives().isEmpty()) + errorMessage = tr("No data imported."); + Main.main.addLayer(new OsmDataLayer(dataSet, tr("Data Layer"), false)); } @@ -89,9 +90,9 @@ private final class DownloadGpsTask extends PleaseWaitRunnable { - private final OsmServerReader reader; + private final BoundingBoxDownloader reader; private Collection> rawData; - private DownloadGpsTask(OsmServerReader reader) { - super("Downloading GPS data"); + private DownloadGpsTask(BoundingBoxDownloader reader) { + super(tr("Downloading GPS data")); this.reader = reader; reader.setProgressInformation(currentAction, progress); @@ -123,8 +124,8 @@ new JTextField(9), new JTextField(9)}; - JCheckBox rawGps = new JCheckBox("Open as raw gps data", false); + JCheckBox rawGps = new JCheckBox(tr("Open as raw gps data"), false); public DownloadAction() { - super("Download from OSM", "download", "Download map data from the OSM server.", "Ctrl-Shift-D", + super(tr("Download from OSM"), "download", tr("Download map data from the OSM server."), tr("Ctrl-Shift-D"), KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); // TODO remove when bug in Java6 is fixed @@ -139,15 +140,15 @@ WorldChooser wc = new WorldChooser(); dlg.add(wc, GBC.eop()); - wc.setToolTipText("Move and zoom the image like the main map. Select an area to download by dragging."); + wc.setToolTipText(tr("Move and zoom the image like the main map. Select an area to download by dragging.")); // Bounding box edits - dlg.add(new JLabel("Bounding box"), GBC.eol()); - dlg.add(new JLabel("min lat"), GBC.std().insets(10,0,5,0)); + dlg.add(new JLabel(tr("Bounding box")), GBC.eol()); + dlg.add(new JLabel(tr("min lat")), GBC.std().insets(10,0,5,0)); dlg.add(latlon[0], GBC.std()); - dlg.add(new JLabel("min lon"), GBC.std().insets(10,0,5,0)); + dlg.add(new JLabel(tr("min lon")), GBC.std().insets(10,0,5,0)); dlg.add(latlon[1], GBC.eol()); - dlg.add(new JLabel("max lat"), GBC.std().insets(10,0,5,0)); + dlg.add(new JLabel(tr("max lat")), GBC.std().insets(10,0,5,0)); dlg.add(latlon[2], GBC.std()); - dlg.add(new JLabel("max lon"), GBC.std().insets(10,0,5,0)); + dlg.add(new JLabel(tr("max lon")), GBC.std().insets(10,0,5,0)); dlg.add(latlon[3], GBC.eol()); if (Main.map != null) { @@ -161,5 +162,5 @@ // OSM url edit - dlg.add(new JLabel("URL from www.openstreetmap.org"), GBC.eol()); + dlg.add(new JLabel(tr("URL from www.openstreetmap.org")), GBC.eol()); final JTextField osmUrl = new JTextField(); dlg.add(osmUrl, GBC.eop().fill(GBC.HORIZONTAL)); @@ -214,5 +215,5 @@ // Bookmarks - dlg.add(new JLabel("Bookmarks"), GBC.eol()); + dlg.add(new JLabel(tr("Bookmarks")), GBC.eol()); final BookmarkList bookmarks = new BookmarkList(); bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ @@ -231,13 +232,13 @@ JPanel buttons = new JPanel(new GridLayout(1,2)); - JButton add = new JButton("Add"); + JButton add = new JButton(tr("Add")); add.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { Bookmark b = readBookmark(); if (b == null) { - JOptionPane.showMessageDialog(Main.parent, "Please enter the desired coordinates first."); + JOptionPane.showMessageDialog(Main.parent, tr("Please enter the desired coordinates first.")); return; } - b.name = JOptionPane.showInputDialog(Main.parent, "Please enter a name for the location."); + b.name = JOptionPane.showInputDialog(Main.parent,tr("Please enter a name for the location.")); if (b.name != null && !b.name.equals("")) { ((DefaultListModel)bookmarks.getModel()).addElement(b); @@ -247,10 +248,10 @@ }); buttons.add(add); - JButton remove = new JButton("Remove"); + JButton remove = new JButton(tr("Remove")); remove.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { Object sel = bookmarks.getSelectedValue(); if (sel == null) { - JOptionPane.showMessageDialog(Main.parent, "Select a bookmark first."); + JOptionPane.showMessageDialog(Main.parent,tr("Select a bookmark first.")); return; } @@ -270,5 +271,5 @@ do { final JOptionPane pane = new JOptionPane(dlg, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); - final JDialog panedlg = pane.createDialog(Main.parent, "Choose an area"); + final JDialog panedlg = pane.createDialog(Main.parent, tr("Choose an area")); bookmarks.addMouseListener(new MouseAdapter(){ @Override public void mouseClicked(MouseEvent e) { @@ -285,5 +286,5 @@ b = readBookmark(); if (b == null) - JOptionPane.showMessageDialog(Main.parent, "Please enter the desired coordinates or click on a bookmark."); + JOptionPane.showMessageDialog(Main.parent,tr("Please enter the desired coordinates or click on a bookmark.")); } while (b == null); @@ -365,5 +366,5 @@ */ public void download(boolean rawGps, double minlat, double minlon, double maxlat, double maxlon) { - OsmServerReader reader = new OsmServerReader(minlat, minlon, maxlat, maxlon); + BoundingBoxDownloader reader = new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon); PleaseWaitRunnable task = rawGps ? new DownloadGpsTask(reader) : new DownloadOsmTask(reader); Main.worker.execute(task); Index: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java (revision 104) +++ src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java (revision 104) @@ -0,0 +1,110 @@ +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.io.IOException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.io.ObjectListDownloader; +import org.xml.sax.SAXException; + +/** + * Action that opens a connection to the osm server and download map data. + * + * An dialog is displayed asking the user to specify a rectangle to grab. + * The url and account settings from the preferences are used. + * + * @author imi + */ +public class DownloadIncompleteAction extends JosmAction { + + /** + * Open the download dialog and download the data. + * Run in the worker thread. + */ + private final class DownloadTask extends PleaseWaitRunnable { + private ObjectListDownloader reader; + private DataSet dataSet; + private boolean nodesLoaded = false; + + private DownloadTask(Collection toDownload) { + super(tr("Downloading {0} segments", toDownload.size())); + reader = new ObjectListDownloader(toDownload); + reader.setProgressInformation(currentAction, progress); + } + + @Override public void realRun() throws IOException, SAXException { + dataSet = reader.parse(); + } + + @Override protected void finish() { + if (dataSet == null) + return; // user cancelled download or error occoured + if (dataSet.allPrimitives().isEmpty()) + errorMessage = tr("No data imported."); + if (errorMessage == null && nodesLoaded == false) + startDownloadNodes(); + else if (errorMessage == null) + Main.main.addLayer(new OsmDataLayer(dataSet, tr("Data Layer"), false)); + } + + private void startDownloadNodes() { + Collection nodes = new HashSet(); + for (Segment s : dataSet.segments) { + nodes.add(s.from); + nodes.add(s.to); + } + reader = new ObjectListDownloader(nodes); + reader.setProgressInformation(currentAction, progress); + nodesLoaded = true; + Main.worker.execute(this); + pleaseWaitDlg.setVisible(true); + } + + @Override protected void cancel() { + reader.cancel(); + } + } + + public DownloadIncompleteAction() { + super(tr("Download incomplete objects"), "downloadincomplete", tr("Download all (selected) incomplete ways from the OSM server."), tr("Ctrl-Shift-Alt-D"), + KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK)); + } + + public void actionPerformed(ActionEvent e) { + Collection ways = new HashSet(); + boolean sel = false; + for (Way w : Main.ds.ways) { + if (w.isIncomplete()) + ways.add(w); + sel = sel || w.selected; + } + if (sel) + for (Iterator it = ways.iterator(); it.hasNext();) + if (!it.next().selected) + it.remove(); + Collection toDownload = new HashSet(); + for (Way w : ways) + toDownload.addAll(w.segments); + if (JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(Main.parent, tr("Download {0} ways containing a total of {1} segments?", ways.size(), toDownload.size()), tr("Download?"), JOptionPane.YES_NO_OPTION)) + return; + PleaseWaitRunnable task = new DownloadTask(toDownload); + Main.worker.execute(task); + task.pleaseWaitDlg.setVisible(true); + } +} Index: src/org/openstreetmap/josm/actions/ExitAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ExitAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/ExitAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -10,16 +12,13 @@ */ public class ExitAction extends JosmAction { - /** * Construct the action with "Exit" as label */ public ExitAction() { - super("Exit", "exit", "Exit the application.", KeyEvent.VK_X); + super(tr("Exit"), "exit", tr("Exit the application."), KeyEvent.VK_X); } public void actionPerformed(ActionEvent e) { - // todo: check for modified windows before exiting System.exit(0); } - } Index: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 103) +++ src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.io.File; @@ -12,5 +14,4 @@ */ public class ExtensionFileFilter extends FileFilter { - private final String extension; private final String description; @@ -22,7 +23,7 @@ public static ExtensionFileFilter[] filters = { - new ExtensionFileFilter("osm,xml", "osm", "OSM Server Version 0.2 (.osm .xml)"), - new ExtensionFileFilter("gpx", "gpx", "GPX Files Version 0.1 (.gpx)"), - new ExtensionFileFilter("csv,txt", "csv", "CSV Files Version 0.1 (.csv .txt)"), + new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (.osm .xml)")), + new ExtensionFileFilter("gpx", "gpx", tr("GPX Files (.gpx)")), + new ExtensionFileFilter("csv,txt", "csv", tr("CSV Files (.csv .txt)")), }; Index: src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.GridBagLayout; @@ -36,10 +38,10 @@ public class GpxExportAction extends DiskAccessAction { - private final static String warningGpl = "Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks"; + private final static String warningGpl = tr("Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks"); private final Layer layer; public GpxExportAction(Layer layer) { - super("Export to GPX", "exportgpx", "Export the data to GPX file.", "Ctrl-E", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK)); + super(tr("Export to GPX"), "exportgpx", tr("Export the data to GPX file."), tr("Ctrl-E"), KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK)); this.layer = layer; } @@ -47,5 +49,5 @@ public void actionPerformed(ActionEvent e) { if (layer == null && Main.map == null) { - JOptionPane.showMessageDialog(Main.parent, "Nothing to export. Get some data first."); + JOptionPane.showMessageDialog(Main.parent, tr("Nothing to export. Get some data first.")); return; } @@ -71,5 +73,5 @@ JPanel p = new JPanel(new GridBagLayout()); - p.add(new JLabel("gps track description"), GBC.eol()); + p.add(new JLabel(tr("gps track description")), GBC.eol()); JTextArea desc = new JTextArea(3,40); desc.setWrapStyleWord(true); @@ -77,22 +79,22 @@ p.add(new JScrollPane(desc), GBC.eop().fill(GBC.BOTH)); - JCheckBox author = new JCheckBox("Add author information", Main.pref.getBoolean("lastAddAuthor", true)); + 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("Real name"); + 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("Email"); + 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("Copyright (URL)"); + 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("Predefined"); + JButton predefined = new JButton(tr("Predefined")); p.add(predefined, GBC.eol().insets(5,0,0,0)); - JLabel copyrightYearLabel = new JLabel("Copyright year"); + JLabel copyrightYearLabel = new JLabel(tr("Copyright year")); p.add(copyrightYearLabel, GBC.std().insets(10,0,5,5)); JTextField copyrightYear = new JTextField(""); @@ -102,9 +104,9 @@ addDependencies(author, authorName, email, copyright, predefined, copyrightYear, nameLabel, emailLabel, copyrightLabel, copyrightYearLabel, warning); - p.add(new JLabel("Keywords"), GBC.eol()); + p.add(new JLabel(tr("Keywords")), GBC.eol()); JTextField keywords = new JTextField(); p.add(keywords, GBC.eop().fill(GBC.HORIZONTAL)); - int answer = JOptionPane.showConfirmDialog(Main.parent, p, "Export options", JOptionPane.OK_CANCEL_OPTION); + int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Export options"), JOptionPane.OK_CANCEL_OPTION); if (answer != JOptionPane.OK_OPTION) return; @@ -127,5 +129,5 @@ } catch (IOException x) { x.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, "Error while exporting "+fn+":\n"+x.getMessage(), "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}", fn)+":\n"+x.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE); } } @@ -178,8 +180,8 @@ predefined.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { - JList l = new JList(new String[]{"Creative Commons By-SA", "public domain", "GNU Lesser Public License (LGPL)", "BSD License (same as MIT/X11)"}); + JList l = new JList(new String[]{"Creative Commons By-SA", "public domain", "GNU Lesser Public License (LGPL)", "BSD License (MIT/X11)"}); l.setVisibleRowCount(4); l.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - int answer = JOptionPane.showConfirmDialog(Main.parent, new JScrollPane(l), "Choose a predefined license", JOptionPane.OK_CANCEL_OPTION); + int answer = JOptionPane.showConfirmDialog(Main.parent, new JScrollPane(l),tr("Choose a predefined license"), JOptionPane.OK_CANCEL_OPTION); if (answer != JOptionPane.OK_OPTION || l.getSelectedIndex() == -1) return; Index: src/org/openstreetmap/josm/actions/OpenAction.java =================================================================== --- src/org/openstreetmap/josm/actions/OpenAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/OpenAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -32,10 +34,10 @@ */ public class OpenAction extends DiskAccessAction { - + /** * Create an open action. The name is "Open a file". */ public OpenAction() { - super("Open", "open", "Open a file.", "Ctrl-O", KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK)); + super(tr("Open"), "open", tr("Open a file."), tr("Ctrl-O"), KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK)); } @@ -70,18 +72,18 @@ dataSet = OsmReader.parseDataSet(new FileInputStream(filename), null, null); } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) { - JOptionPane.showMessageDialog(Main.parent, fn+": CSV Data import for non-GPS data is not implemented yet."); + JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("CSV Data import for non-GPS data is not implemented yet.")); return; } else { - JOptionPane.showMessageDialog(Main.parent, fn+": Unknown file extension: "+fn.substring(filename.getName().lastIndexOf('.')+1)); + JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(filename.getName().lastIndexOf('.')+1))); return; } - Main.main.addLayer(new OsmDataLayer(dataSet, "Data Layer", true)); + Main.main.addLayer(new OsmDataLayer(dataSet, tr("Data Layer"), true)); } } catch (SAXException x) { x.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, "Error while parsing "+fn+": "+x.getMessage()); + JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing {0}",fn)+": "+x.getMessage()); } catch (IOException x) { x.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, "Could not read '"+fn+"'\n"+x.getMessage()); + JOptionPane.showMessageDialog(Main.parent, tr("Could not read '{0}'",fn)+"\n"+x.getMessage()); } } Index: src/org/openstreetmap/josm/actions/PreferencesAction.java =================================================================== --- src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -19,5 +21,5 @@ */ public PreferencesAction() { - super("Preferences", "preference", "Open a preferences page for global settings.", "F12", KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0)); + super(tr("Preferences"), "preference", tr("Open a preferences page for global settings."), tr("F12"), KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0)); } Index: src/org/openstreetmap/josm/actions/RedoAction.java =================================================================== --- src/org/openstreetmap/josm/actions/RedoAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/RedoAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -21,5 +23,5 @@ */ public RedoAction() { - super("Redo", "redo", "Redo the last undone action.", "Ctrl-Shift-Z", KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); + super(tr("Redo"), "redo", tr("Redo the last undone action."), tr("Ctrl-Shift-Z"), KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); setEnabled(false); } Index: src/org/openstreetmap/josm/actions/SaveAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SaveAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/SaveAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -22,5 +24,5 @@ */ public class SaveAction extends DiskAccessAction { - + /** * Construct the action with "Save" as label. @@ -29,17 +31,17 @@ */ public SaveAction() { - super("Save", "save", "Save the current data.", "Ctrl-S", KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK)); + super(tr("Save"), "save", tr("Save the current data."), tr("Ctrl-S"), KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK)); } public void actionPerformed(ActionEvent event) { if (Main.map == null) { - JOptionPane.showMessageDialog(Main.parent, "No document open so nothing to save."); + JOptionPane.showMessageDialog(Main.parent, tr("No document open so nothing to save.")); return; } - if (isDataSetEmpty() && JOptionPane.NO_OPTION == JOptionPane.showConfirmDialog(Main.parent, "The document contains no data. Save anyway?", "Empty document", JOptionPane.YES_NO_OPTION)) + if (isDataSetEmpty() && JOptionPane.NO_OPTION == JOptionPane.showConfirmDialog(Main.parent,tr("The document contains no data. Save anyway?"), tr("Empty document"), JOptionPane.YES_NO_OPTION)) return; if (!Main.map.conflictDialog.conflicts.isEmpty()) { int answer = JOptionPane.showConfirmDialog(Main.parent, - "There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?", "Conflicts", JOptionPane.YES_NO_OPTION); + 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; @@ -70,13 +72,13 @@ Main.main.editLayer().cleanData(null, false); } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) { - JOptionPane.showMessageDialog(Main.parent, "CSV output not supported yet."); + JOptionPane.showMessageDialog(Main.parent, tr("CSV output not supported yet.")); return; } else { - JOptionPane.showMessageDialog(Main.parent, "Unknown file extension."); + JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); return; } } catch (IOException e) { e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, "An error occoured while saving.\n"+e.getMessage()); + JOptionPane.showMessageDialog(Main.parent, tr("An error occoured while saving.")+"\n"+e.getMessage()); } } Index: src/org/openstreetmap/josm/actions/UndoAction.java =================================================================== --- src/org/openstreetmap/josm/actions/UndoAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/UndoAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -21,5 +23,5 @@ */ public UndoAction() { - super("Undo", "undo", "Undo the last action.", "Ctrl-Z", KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK)); + super(tr("Undo"), "undo", tr("Undo the last action."), tr("Ctrl-Z"), KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK)); setEnabled(false); } Index: src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- src/org/openstreetmap/josm/actions/UploadAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/UploadAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.GridBagLayout; @@ -32,7 +34,6 @@ */ public class UploadAction extends JosmAction { - public UploadAction() { - super("Upload to OSM", "upload", "Upload all changes to the OSM server.", "Ctrl-Shift-U", + super(tr("Upload to OSM"), "upload", tr("Upload all changes to the OSM server."), tr("Ctrl-Shift-U"), KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); } @@ -40,10 +41,10 @@ public void actionPerformed(ActionEvent e) { if (Main.map == null) { - JOptionPane.showMessageDialog(Main.parent, "Nothing to upload. Get some data first."); + JOptionPane.showMessageDialog(Main.parent,tr("Nothing to upload. Get some data first.")); return; } if (!Main.map.conflictDialog.conflicts.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, "There are unresolved conflicts. You have to resolve these first."); + 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); @@ -72,5 +73,5 @@ all.addAll(delete); - PleaseWaitRunnable uploadTask = new PleaseWaitRunnable("Uploading data"){ + PleaseWaitRunnable uploadTask = new PleaseWaitRunnable(tr("Uploading data")){ @Override protected void realRun() throws SAXException { server.setProgressInformation(currentAction, progress); @@ -96,5 +97,5 @@ private boolean displayUploadScreen(Collection add, Collection update, Collection delete) { if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, "No changes to upload."); + JOptionPane.showMessageDialog(Main.parent,tr("No changes to upload.")); return false; } @@ -105,5 +106,5 @@ if (!add.isEmpty()) { - p.add(new JLabel("Objects to add:"), GBC.eol()); + p.add(new JLabel(tr("Objects to add:")), GBC.eol()); JList l = new JList(add.toArray()); l.setCellRenderer(renderer); @@ -113,5 +114,5 @@ if (!update.isEmpty()) { - p.add(new JLabel("Objects to modify:"), GBC.eol()); + p.add(new JLabel(tr("Objects to modify:")), GBC.eol()); JList l = new JList(update.toArray()); l.setCellRenderer(renderer); @@ -121,5 +122,5 @@ if (!delete.isEmpty()) { - p.add(new JLabel("Objects to delete:"), GBC.eol()); + p.add(new JLabel(tr("Objects to delete:")), GBC.eol()); JList l = new JList(delete.toArray()); l.setCellRenderer(renderer); @@ -128,5 +129,5 @@ } - return JOptionPane.showConfirmDialog(Main.parent, p, "Upload this changes?", + return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload this changes?"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION; } Index: src/org/openstreetmap/josm/actions/WmsServerAction.java =================================================================== --- src/org/openstreetmap/josm/actions/WmsServerAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/WmsServerAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -11,9 +13,9 @@ public WmsServerAction() { - super("Show background", "wmsserver", "Download and show landsat background images.", KeyEvent.VK_B); + super(tr("Show background"), "wmsserver", tr("Download and show landsat background images."), KeyEvent.VK_B); } public void actionPerformed(ActionEvent e) { - JOptionPane.showMessageDialog(Main.parent, "Not implemented yet."); + JOptionPane.showMessageDialog(Main.parent, tr("Not implemented yet.")); } } Index: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Cursor; @@ -42,6 +44,6 @@ public AddNodeGroup(MapFrame mf) { super(KeyEvent.VK_N,0); - actions.add(new AddNodeAction(mf, "Add node", Mode.node, "Add a new node to the map")); - actions.add(new AddNodeAction(mf, "Add node into segment", Mode.nodesegment, "Add a node into an existing segment")); + actions.add(new AddNodeAction(mf,tr("Add node"), Mode.node, tr("Add a new node to the map"))); + actions.add(new AddNodeAction(mf, tr("Add node into segment"), Mode.nodesegment,tr( "Add a node into an existing segment"))); setCurrent(0); } @@ -79,5 +81,5 @@ Node n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY())); if (n.coor.isOutSideWorld()) { - JOptionPane.showMessageDialog(Main.parent, "Can not add a node outside of the world."); + JOptionPane.showMessageDialog(Main.parent,tr("Can not add a node outside of the world.")); return; } @@ -128,5 +130,5 @@ } - c = new SequenceCommand("Add Node into Segment", cmds); + c = new SequenceCommand(tr("Add Node into Segment"), cmds); } Main.main.editLayer().add(c); Index: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Color; @@ -11,7 +13,7 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.AddCommand; -import org.openstreetmap.josm.data.osm.Segment; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.ImageProvider; @@ -47,7 +49,7 @@ */ public AddSegmentAction(MapFrame mapFrame) { - super("Add segment", + super(tr("Add segment"), "addsegment", - "Add a segment between two nodes.", + tr("Add a segment between two nodes."), "G", KeyEvent.VK_G, Index: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (revision 104) @@ -1,3 +1,6 @@ package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.awt.event.KeyEvent; @@ -48,5 +51,4 @@ */ public class AddWayAction extends MapMode implements SelectionChangedListener { - private Way way; @@ -57,5 +59,5 @@ */ public AddWayAction(MapFrame mapFrame) { - super("Add Way", "addway", "Add a new way to the data.", "W", KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way")); + super(tr("Add Way"), "addway", tr("Add a new way to the data."), "W", KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way")); Main.ds.addSelectionChangedListener(this); @@ -91,5 +93,5 @@ for (Segment seg : way.segments) { if (seg.incomplete) { - JOptionPane.showMessageDialog(Main.parent, "Warning: This way is incomplete. Try to download it, before adding segments."); + JOptionPane.showMessageDialog(Main.parent,tr("Warning: This way is incomplete. Try to download it, before adding segments.")); return; } @@ -139,5 +141,5 @@ for (Segment seg : way.segments) { if (seg.incomplete) { - JOptionPane.showMessageDialog(Main.parent, "Warning: This way is incomplete. Try to download it, before adding segments."); + JOptionPane.showMessageDialog(Main.parent, tr("Warning: This way is incomplete. Try to download it, before adding segments.")); break; } @@ -158,7 +160,5 @@ boolean reordered = false; if (numberOfSelectedWays > 0) { - String ways = "way" + (numberOfSelectedWays==1?" has":"s have"); - int answer = JOptionPane.showConfirmDialog(Main.parent, numberOfSelectedWays+" "+ways+" been selected.\n" + - "Do you wish to select all segments belonging to the "+ways+" instead?", "Add segments from ways", JOptionPane.YES_NO_OPTION); + int answer = JOptionPane.showConfirmDialog(Main.parent,trn("{0} way has been selected.\nDo you wish to select all segments belonging to the way instead?","{0} ways have been selected.\nDo you wish to select all segments belonging to the ways instead?",numberOfSelectedWays,numberOfSelectedWays),tr("Add segments from ways"), JOptionPane.YES_NO_OPTION); if (answer == JOptionPane.YES_OPTION) { for (OsmPrimitive osm : selection) @@ -166,10 +166,10 @@ segmentSet.addAll(((Way)osm).segments); } else if (numberOfSelectedWays == 1) { - answer = JOptionPane.showConfirmDialog(Main.parent, "Do you want to add all other selected segments to the one selected way?", "Add segments to way?", JOptionPane.YES_NO_OPTION); + answer = JOptionPane.showConfirmDialog(Main.parent,tr("Do you want to add all other selected segments to the one selected way?"),tr("Add segments to way?"), JOptionPane.YES_NO_OPTION); if (answer == JOptionPane.YES_OPTION) { for (OsmPrimitive osm : selection) { if (osm instanceof Way) { wayToAdd = (Way)osm; - answer = JOptionPane.showConfirmDialog(Main.parent, "Reorder all line segments?", "Reorder?", JOptionPane.YES_NO_CANCEL_OPTION); + answer = JOptionPane.showConfirmDialog(Main.parent,tr("Reorder all line segments?"), tr("Reorder?"), JOptionPane.YES_NO_CANCEL_OPTION); if (answer == JOptionPane.CANCEL_OPTION) return wayToAdd; @@ -230,5 +230,5 @@ } - if (JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(Main.parent, "Create a new way out of "+sortedSegments.size()+" segments?", "Create new way", JOptionPane.YES_NO_OPTION)) + if (JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(Main.parent,trn("Create a new way out of {0} segment?","Create a new way out of {0} segments?",sortedSegments.size(),sortedSegments.size()), tr("Create new way"), JOptionPane.YES_NO_OPTION)) return null; Index: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -51,7 +53,7 @@ */ public DeleteAction(MapFrame mapFrame) { - super("Delete", + super(tr("Delete"), "delete", - "Delete nodes, streets or segments.", + tr("Delete nodes, streets or segments."), "D", KeyEvent.VK_D, @@ -146,9 +148,9 @@ String reason = deleteNodeAndJoinSegment((Node)osm); if (reason != null && msgBox) { - JOptionPane.showMessageDialog(Main.parent, "Cannot delete node. "+reason); + JOptionPane.showMessageDialog(Main.parent,tr("Cannot delete node.")+" "+reason); return; } } else if (msgBox) { - JOptionPane.showMessageDialog(Main.parent, "This object is in use."); + JOptionPane.showMessageDialog(Main.parent, tr("This object is in use.")); return; } @@ -167,10 +169,10 @@ if (!s.deleted && (s.from == n || s.to == n)) { if (segs.size() > 1) - return "Used by more than two segments."; + return tr("Used by more than two segments."); segs.add(s); } } if (segs.size() != 2) - return "Used by only one segment."; + return tr("Used by only one segment."); Segment seg1 = segs.get(0); Segment seg2 = segs.get(1); @@ -182,10 +184,10 @@ for (Way w : Main.ds.ways) if (!w.deleted && (w.segments.contains(seg1) || w.segments.contains(seg2))) - return "Used in a way."; + return tr("Used in a way."); if (seg1.from == seg2.from || seg1.to == seg2.to) - return "Wrong direction of segments."; + return tr("Wrong direction of segments."); for (Entry e : seg1.entrySet()) if (seg2.keySet().contains(e.getKey()) && !seg2.get(e.getKey()).equals(e.getValue())) - return "Conflicting keys"; + return tr("Conflicting keys"); Segment s = new Segment(seg1); s.to = seg2.to; @@ -197,5 +199,5 @@ new ChangeCommand(seg1, s), new DeleteCommand(Arrays.asList(new OsmPrimitive[]{n, seg2}))}; - Main.main.editLayer().add(new SequenceCommand("Delete Node", Arrays.asList(cmds))); + Main.main.editLayer().add(new SequenceCommand(tr("Delete Node"), Arrays.asList(cmds))); return null; } Index: src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 104) @@ -23,5 +23,4 @@ */ abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener { - // private final Cursor cursor; // private Cursor oldCursor; Index: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Cursor; @@ -18,5 +20,4 @@ import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.ImageProvider; - /** * Move is an action that can move all kind of OsmPrimitives (except Keys for now). @@ -29,5 +30,4 @@ */ public class MoveAction extends MapMode { - /** * The old cursor before the user pressed the mouse button. @@ -49,7 +49,7 @@ */ public MoveAction(MapFrame mapFrame) { - super("Move", + super(tr("Move"), "move", - "Move selected objects around.", + tr("Move selected objects around."), "M", KeyEvent.VK_M, @@ -97,5 +97,5 @@ for (OsmPrimitive osm : affectedNodes) { if (osm instanceof Node && ((Node)osm).coor.isOutSideWorld()) { - JOptionPane.showMessageDialog(Main.parent, "Cannot move objects outside of the world."); + JOptionPane.showMessageDialog(Main.parent,tr("Cannot move objects outside of the world.")); return; } Index: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java (revision 104) @@ -1,11 +1,20 @@ package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Rectangle; import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; +import java.util.Map; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.GroupAction; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.gui.SelectionManager; @@ -55,8 +64,28 @@ public class SelectionAction extends MapMode implements SelectionEnded { + enum Mode {select, straight} + private final Mode mode; + + public static class Group extends GroupAction { + public Group(MapFrame mf) { + super(KeyEvent.VK_S,0); + actions.add(new SelectionAction(mf, tr("Selection"), Mode.select, tr("Select objects by dragging or clicking."))); + actions.add(new SelectionAction(mf, tr("Straight line"), Mode.straight, tr("Select objects in a straight line."))); + setCurrent(0); + } + } + + /** * The SelectionManager that manages the selection rectangle. */ private SelectionManager selectionManager; + + private Node straightStart = null; + private Node lastEnd = null; + private Collection oldSelection = null; + + //TODO: Implement reverse references into data objects and remove this + private final Map> reverseSegmentMap = new HashMap>(); /** @@ -64,12 +93,7 @@ * @param mapFrame The frame this action belongs to */ - public SelectionAction(MapFrame mapFrame) { - super("Selection", - "selection", - "Select objects by dragging or clicking.", - "S", - KeyEvent.VK_S, - mapFrame, - ImageProvider.getCursor("normal", "selection")); + public SelectionAction(MapFrame mapFrame, String name, Mode mode, String desc) { + super(name, "selection/"+mode, desc, "S", KeyEvent.VK_S, mapFrame, ImageProvider.getCursor("normal", "selection")); + this.mode = mode; this.selectionManager = new SelectionManager(this, false, mapFrame.mapView); } @@ -77,10 +101,34 @@ @Override public void enterMode() { super.enterMode(); - selectionManager.register(Main.map.mapView); + if (mode == Mode.select) + selectionManager.register(Main.map.mapView); + else { + Main.map.mapView.addMouseMotionListener(this); + Main.map.mapView.addMouseListener(this); + for (Segment s : Main.ds.segments) { + addBackReference(s.from, s); + addBackReference(s.to, s); + } + } + } + + private void addBackReference(Node n, Segment s) { + Collection c = reverseSegmentMap.get(n); + if (c == null) { + c = new HashSet(); + reverseSegmentMap.put(n, c); + } + c.add(s); } @Override public void exitMode() { super.exitMode(); - selectionManager.unregister(Main.map.mapView); + if (mode == Mode.select) + selectionManager.unregister(Main.map.mapView); + else { + Main.map.mapView.removeMouseMotionListener(this); + Main.map.mapView.removeMouseListener(this); + reverseSegmentMap.clear(); + } } @@ -108,3 +156,74 @@ Main.map.mapView.repaint(); } + + @Override public void mouseDragged(MouseEvent e) { + Node old = lastEnd; + lastEnd = Main.map.mapView.getNearestNode(e.getPoint()); + if (straightStart == null) + straightStart = lastEnd; + if (straightStart != null && lastEnd != null && straightStart != lastEnd && old != lastEnd) { + Collection path = new HashSet(); + Collection sel = new HashSet(); + path.add(straightStart); + calculateShortestPath(path, straightStart, lastEnd); + if ((e.getModifiers() & MouseEvent.CTRL_MASK) != 0) { + sel.addAll(oldSelection); + sel.removeAll(path); + } else if ((e.getModifiers() & MouseEvent.SHIFT_MASK) != 0) { + sel = path; + sel.addAll(oldSelection); + } else + sel = path; + Main.ds.setSelected(sel); + } + } + + @Override public void mousePressed(MouseEvent e) { + straightStart = Main.map.mapView.getNearestNode(e.getPoint()); + lastEnd = null; + oldSelection = Main.ds.getSelected(); + } + + @Override public void mouseReleased(MouseEvent e) { + straightStart = null; + lastEnd = null; + oldSelection = null; + } + + /** + * Get the shortest path by stepping through the node with a common segment with start + * and nearest to the end (greedy algorithm). + */ + private void calculateShortestPath(Collection path, Node start, Node end) { + for (Node pivot = start; pivot != null;) + pivot = addNearest(path, pivot, end); + } + + private Node addNearest(Collection path, Node start, Node end) { + Collection c = reverseSegmentMap.get(start); + double min = Double.MAX_VALUE; + Node next = null; + Segment seg = null; + for (Segment s : c) { + Node other = s.from == start ? s.to : s.from; + if (other == end) { + next = other; + seg = s; + min = 0; + break; + } + double distance = other.eastNorth.distance(end.eastNorth); + if (distance < min) { + min = distance; + next = other; + seg = s; + } + } + if (min < start.eastNorth.distance(end.eastNorth) && next != null) { + path.add(next); + path.add(seg); + return next; + } + return null; + } } Index: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 103) +++ src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Rectangle; @@ -42,5 +44,5 @@ */ public ZoomAction(MapFrame mapFrame) { - super("Zoom", "zoom", "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)", "Z", KeyEvent.VK_Z, mapFrame, ImageProvider.getCursor("normal", "zoom")); + super(tr("Zoom"), "zoom", tr("Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"), "Z", KeyEvent.VK_Z, mapFrame, ImageProvider.getCursor("normal", "zoom")); mv = mapFrame.mapView; selectionManager = new SelectionManager(this, true, mv); Index: src/org/openstreetmap/josm/command/AddCommand.java =================================================================== --- src/org/openstreetmap/josm/command/AddCommand.java (revision 103) +++ src/org/openstreetmap/josm/command/AddCommand.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.util.Collection; @@ -48,5 +50,5 @@ NameVisitor v = new NameVisitor(); osm.visit(v); - return new DefaultMutableTreeNode(new JLabel("Add "+v.className+" "+v.name, v.icon, JLabel.HORIZONTAL)); + return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+v.className+" "+v.name, v.icon, JLabel.HORIZONTAL)); } } Index: src/org/openstreetmap/josm/command/ChangeCommand.java =================================================================== --- src/org/openstreetmap/josm/command/ChangeCommand.java (revision 103) +++ src/org/openstreetmap/josm/command/ChangeCommand.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.util.Collection; @@ -33,5 +35,5 @@ NameVisitor v = new NameVisitor(); osm.visit(v); - return new DefaultMutableTreeNode(new JLabel("Change "+v.className+" "+v.name, v.icon, JLabel.HORIZONTAL)); + return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+v.className+" "+v.name, v.icon, JLabel.HORIZONTAL)); } } Index: src/org/openstreetmap/josm/command/ChangePropertyCommand.java =================================================================== --- src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 103) +++ src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 104) @@ -1,3 +1,6 @@ package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.util.Collection; @@ -20,5 +23,4 @@ */ public class ChangePropertyCommand extends Command { - /** * All primitives, that are affected with this command. @@ -62,6 +64,5 @@ @Override public MutableTreeNode description() { - String text = value == null ? "Remove '"+key+"'" : "Set '"+key+"="+value+"'"; - text += " for "; + String text = value == null ? tr( "Remove '{0}' for",key) : tr("Set {0}={1} for",key,value); if (objects.size() == 1) { NameVisitor v = new NameVisitor(); @@ -69,5 +70,5 @@ text += v.className+" "+v.name; } else - text += objects.size()+" objects"; + text += trn("{0} object","{0} objects",objects.size(),objects.size()); DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL)); if (objects.size() == 1) Index: src/org/openstreetmap/josm/command/ConflictResolveCommand.java =================================================================== --- src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 103) +++ src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.util.Collection; @@ -73,5 +75,5 @@ if (c.resolution != null) i++; - return new DefaultMutableTreeNode(new JLabel("Resolve "+i+" conflicts in "+resolved.size()+" objects", ImageProvider.get("data", "primitive"), JLabel.HORIZONTAL)); + return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "primitive"), JLabel.HORIZONTAL)); } } Index: src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- src/org/openstreetmap/josm/command/DeleteCommand.java (revision 103) +++ src/org/openstreetmap/josm/command/DeleteCommand.java (revision 104) @@ -1,3 +1,6 @@ package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.util.Collection; @@ -41,5 +44,5 @@ if (data.size() == 1) { data.iterator().next().visit(v); - return new DefaultMutableTreeNode(new JLabel("Delete "+v.className+" "+v.name, v.icon, JLabel.HORIZONTAL)); + return new DefaultMutableTreeNode(new JLabel(tr("Delete"+" "+v.className+" "+v.name), v.icon, JLabel.HORIZONTAL)); } @@ -52,5 +55,6 @@ cname = "primitive"; } - DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel("Delete "+data.size()+" "+cname+(data.size()==1?"":"s"), ImageProvider.get("data", cname), JLabel.HORIZONTAL)); + DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel( + tr("Delete")+" "+data.size()+" "+trn(cname, cname+"s", data.size()), ImageProvider.get("data", cname), JLabel.HORIZONTAL)); for (OsmPrimitive osm : data) { osm.visit(v); Index: src/org/openstreetmap/josm/command/MoveCommand.java =================================================================== --- src/org/openstreetmap/josm/command/MoveCommand.java (revision 103) +++ src/org/openstreetmap/josm/command/MoveCommand.java (revision 104) @@ -1,3 +1,6 @@ package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.util.Collection; @@ -25,5 +28,4 @@ */ public class MoveCommand extends Command { - /** * The objects that should be moved. @@ -113,5 +115,5 @@ @Override public MutableTreeNode description() { - return new DefaultMutableTreeNode(new JLabel("Move "+objects.size()+" Node"+(objects.size()==1?"":"s"), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); + return new DefaultMutableTreeNode(new JLabel(tr("Move")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); } } Index: src/org/openstreetmap/josm/command/SequenceCommand.java =================================================================== --- src/org/openstreetmap/josm/command/SequenceCommand.java (revision 103) +++ src/org/openstreetmap/josm/command/SequenceCommand.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.util.Collection; @@ -47,5 +49,5 @@ @Override public MutableTreeNode description() { - DefaultMutableTreeNode root = new DefaultMutableTreeNode("Sequence: "+name); + DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Sequence")+": "+name); for (Command c : sequence) root.add(c.description()); Index: src/org/openstreetmap/josm/data/conflict/ConflictItem.java =================================================================== --- src/org/openstreetmap/josm/data/conflict/ConflictItem.java (revision 103) +++ src/org/openstreetmap/josm/data/conflict/ConflictItem.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.util.Collection; @@ -29,5 +31,5 @@ value = v; else if (!value.equals(v)) { - value = "<different>"; + value = "<"+tr("different")+">"; break; } Index: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java =================================================================== --- src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (revision 103) +++ src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -10,9 +12,9 @@ @Override public String key() { - return "deleted|deleted"; + return "deleted|"+tr("deleted"); } @Override protected String str(OsmPrimitive osm) { - return osm.deleted ? "true" : "false"; + return osm.deleted ? tr("true") : tr("false"); } Index: src/org/openstreetmap/josm/data/conflict/FromConflict.java =================================================================== --- src/org/openstreetmap/josm/data/conflict/FromConflict.java (revision 103) +++ src/org/openstreetmap/josm/data/conflict/FromConflict.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -15,5 +17,5 @@ @Override public String key() { - return "segment|from"; + return "segment|"+tr("from"); } Index: src/org/openstreetmap/josm/data/conflict/PositionConflict.java =================================================================== --- src/org/openstreetmap/josm/data/conflict/PositionConflict.java (revision 103) +++ src/org/openstreetmap/josm/data/conflict/PositionConflict.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.data.osm.Node; @@ -15,5 +17,5 @@ @Override public String key() { - return "node|position"; + return "node|"+tr("position"); } Index: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java =================================================================== --- src/org/openstreetmap/josm/data/conflict/SegmentConflict.java (revision 103) +++ src/org/openstreetmap/josm/data/conflict/SegmentConflict.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -17,9 +19,9 @@ for (Segment ls : ((Way)osm).segments) s += ls.id + ","; - return s.equals("") ? "<none>" : s.substring(0, s.length()-1); + return s.equals("") ? "<"+tr("none")+">" : s.substring(0, s.length()-1); } @Override public String key() { - return "way|segments"; + return "way|"+tr("segments"); } Index: src/org/openstreetmap/josm/data/conflict/ToConflict.java =================================================================== --- src/org/openstreetmap/josm/data/conflict/ToConflict.java (revision 103) +++ src/org/openstreetmap/josm/data/conflict/ToConflict.java (revision 104) @@ -1,6 +1,5 @@ -/** - * - */ package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -18,5 +17,5 @@ @Override public String key() { - return "segment|to"; + return "segment|"+tr("to"); } Index: src/org/openstreetmap/josm/data/osm/Way.java =================================================================== --- src/org/openstreetmap/josm/data/osm/Way.java (revision 103) +++ src/org/openstreetmap/josm/data/osm/Way.java (revision 104) @@ -50,3 +50,10 @@ return o instanceof Way ? Long.valueOf(id).compareTo(o.id) : -1; } + + public boolean isIncomplete() { + for (Segment s : segments) + if (s.incomplete) + return true; + return false; + } } Index: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (revision 103) +++ src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (revision 104) @@ -1,4 +1,7 @@ package org.openstreetmap.josm.data.osm.visitor; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.util.HashSet; @@ -8,6 +11,6 @@ import javax.swing.JLabel; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Segment; -import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.tools.ImageProvider; @@ -43,5 +46,5 @@ if (name == null) { if (ls.incomplete) - name = ls.id == 0 ? "new" : ""+ls.id+" (unknown)"; + name = ls.id == 0 ? tr("new") : tr("{0} (unknown)", ls.id); else name = (ls.id==0?"":ls.id+" ")+"("+ls.from.coor.lat()+","+ls.from.coor.lon()+") -> ("+ls.to.coor.lat()+","+ls.to.coor.lon()+")"; @@ -80,7 +83,7 @@ incomplete = true; } - name = nodes.size()+" nodes"; + name = trn("{0} node", "{0} nodes", nodes.size(), nodes.size()); if (incomplete) - name += " (incomplete)"; + name += " ("+tr("incomplete")+")"; } icon = ImageProvider.get("data", "way"); Index: src/org/openstreetmap/josm/gui/BookmarkList.java =================================================================== --- src/org/openstreetmap/josm/gui/BookmarkList.java (revision 103) +++ src/org/openstreetmap/josm/gui/BookmarkList.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Component; @@ -86,5 +88,5 @@ in.close(); } catch (IOException e) { - JOptionPane.showMessageDialog(Main.parent, "Could not read bookmarks.\n"+e.getMessage()); + JOptionPane.showMessageDialog(Main.parent, tr("Could not read bookmarks.")+"\n"+e.getMessage()); } } @@ -110,5 +112,5 @@ out.close(); } catch (IOException e) { - JOptionPane.showMessageDialog(Main.parent, "Could not write bookmark.\n"+e.getMessage()); + JOptionPane.showMessageDialog(Main.parent,tr("Could not write bookmark.")+"\n"+e.getMessage()); } } Index: src/org/openstreetmap/josm/gui/ConflictResolver.java =================================================================== --- src/org/openstreetmap/josm/gui/ConflictResolver.java (revision 103) +++ src/org/openstreetmap/josm/gui/ConflictResolver.java (revision 104) @@ -1,3 +1,6 @@ package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; import java.awt.Component; @@ -76,5 +79,5 @@ } - public String getColumnName(int columnIndex) {return columnIndex == 0 ? "Key" : "Value";} + public String getColumnName(int columnIndex) {return columnIndex == 0 ? tr("Key") : tr("Value");} public int getColumnCount() {return 2;} public boolean isCellEditable(int row, int column) {return false;} @@ -158,5 +161,5 @@ if (this.conflicts.isEmpty()) - throw new RuntimeException("No conflicts but in conflict list:\n" + Arrays.toString(conflicts.entrySet().toArray())); + throw new RuntimeException(tr("No conflicts but in conflict list:\n{0}" , Arrays.toString(conflicts.entrySet().toArray()))); // have to initialize the JTables here and not in the declaration, because its constructor @@ -227,8 +230,8 @@ resolveTable.addMouseListener(new DblClickListener(null)); - add(new JLabel(conflicts.size()+" object"+(conflicts.size()==1?" has":"s have")+" conflicts:"), GBC.eol().insets(0,0,0,10)); + add(new JLabel(trn("{0} object has conflicts:","{0} objects have conflicts:",conflicts.size(),conflicts.size())), GBC.eol().insets(0,0,0,10)); JPanel p = new JPanel(new GridBagLayout()); - p.add(new JLabel("my version:"), GBC.eol()); + p.add(new JLabel(tr("my version:")), GBC.eol()); p.add(new JScrollPane(myTable), GBC.eol().fill(GBC.BOTH)); p.add(new JButton(new ResolveAction("down", Resolution.MY)), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,0)); @@ -236,5 +239,5 @@ p = new JPanel(new GridBagLayout()); - p.add(new JLabel("their version:"), GBC.eol()); + p.add(new JLabel(tr("their version:")), GBC.eol()); p.add(new JScrollPane(theirTable), GBC.eol().fill(GBC.BOTH)); p.add(new JButton(new ResolveAction("down", Resolution.THEIR)), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,0)); @@ -242,5 +245,5 @@ add(new JButton(new ResolveAction("up", null)), GBC.eol().anchor(GBC.CENTER)); - add(new JLabel("resolved version:"), GBC.eol().insets(0,5,0,0)); + add(new JLabel(tr("resolved version:")), GBC.eol().insets(0,5,0,0)); add(new JScrollPane(resolveTable), GBC.eol().anchor(GBC.CENTER).fill(GBC.BOTH)); } Index: src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- src/org/openstreetmap/josm/gui/MainApplet.java (revision 103) +++ src/org/openstreetmap/josm/gui/MainApplet.java (revision 104) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.GridBagLayout; @@ -30,11 +32,11 @@ private final static String[][] paramInfo = { - {"username", "string", "Name of the user."}, - {"password", "string", "OSM Password."}, - {"geometry", "string", "Size the applet to the given geometry (format: WIDTHxHEIGHT)"}, - {"download", "string;string;...", "Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename"}, - {"downloadgps", "string;string;...", "Download each as raw gps. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename"}, - {"selection", "string;string;...", "Add each to the initial selection. Can be a google-like search string or an url which returns osm-xml"}, - {"reset-preferences", "any", "If specified, reset the configuration instead of reading it."} + {"username", tr("string"), tr("Name of the user.")}, + {"password", tr("string"), tr("OSM Password.")}, + {"geometry", tr("string"), tr("Size the applet to the given geometry (format: WIDTHxHEIGHT)")}, + {"download", tr("string;string;..."), tr("Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename")}, + {"downloadgps", tr("string;string;..."), tr("Download each as raw gps. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename")}, + {"selection", tr("string;string;..."), tr("Add each to the initial selection. Can be a google-like search string or an url which returns osm-xml")}, + {"reset-preferences", tr("any"),tr("If specified, reset the configuration instead of reading it.")} }; @@ -61,8 +63,8 @@ if (username == null || password == null) { JPanel p = new JPanel(new GridBagLayout()); - p.add(new JLabel("Username"), GBC.std().insets(0,0,20,0)); + p.add(new JLabel(tr("Username")), GBC.std().insets(0,0,20,0)); JTextField user = new JTextField(username == null ? "" : username); p.add(user, GBC.eol().fill(GBC.HORIZONTAL)); - p.add(new JLabel("Password"), GBC.std().insets(0,0,20,0)); + p.add(new JLabel(tr("Password")), GBC.std().insets(0,0,20,0)); JPasswordField pass = new JPasswordField(password == null ? "" : password); p.add(pass, GBC.eol().fill(GBC.HORIZONTAL)); Index: src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- src/org/openstreetmap/josm/gui/MainApplication.java (revision 103) +++ src/org/openstreetmap/josm/gui/MainApplication.java (revision 104) @@ -1,4 +1,6 @@ //Licence: GPL package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Toolkit; @@ -20,5 +22,4 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.tools.BugReportExceptionHandler; - /** * Main window class application. @@ -27,5 +28,4 @@ */ public class MainApplication extends Main { - /** * Construct an main frame, ready sized and operating. Does not @@ -49,8 +49,8 @@ } if (modified) { - final String msg = uploadedModified ? "\nHint: Some changes came from uploading new data to the server." : ""; + final String msg = uploadedModified ? tr("\nHint: Some changes came from uploading new data to the server.") : ""; final int answer = JOptionPane.showConfirmDialog( - Main.parent, "There are unsaved changes. Really quit?"+msg, - "Unsaved Changes", JOptionPane.YES_NO_OPTION); + Main.parent, tr("There are unsaved changes. Really quit?")+msg, + tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION); if (answer != JOptionPane.YES_OPTION) return; @@ -72,30 +72,26 @@ List argList = Arrays.asList(argArray); if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) { - System.out.println("Java OpenStreetMap Editor"); - System.out.println(); - System.out.println("usage:"); - System.out.println("\tjava -jar josm.jar