Changeset 104 in josm for src/org/openstreetmap/josm/actions/DownloadAction.java

Timestamp:

2006-07-03T00:31:24+02:00 (18 years ago)

Author:

imi

Message:

• started i18n
• started "download incomplete ways" action
• added straight line selection mode

File:

• src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (15 diffs)

src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -1 +1 @@
 package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Dimension;
@@ -42 +44 @@
 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 +57 @@
  */
 public class DownloadAction extends JosmAction {
-
         /**
          * Open the download dialog and download the data.
@@ -61 +62 @@
          */
         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 +78 @@
                         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 +90 @@
 
         private final class DownloadGpsTask extends PleaseWaitRunnable {
-                private final OsmServerReader reader;
+                private final BoundingBoxDownloader reader;
                 private Collection<Collection<GpsPoint>> 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 +124 @@
                         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 +140 @@
                 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 +162 @@
 
                 // 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 +215 @@
 
                 // 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 +232 @@
 
                 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 +248 @@
                 });
                 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 +271 @@
                 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 +286 @@
                         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 +366 @@
          */
         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);