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

Timestamp:

2006-04-05T00:31:57+02:00 (20 years ago)

Author:

imi

Message:

• fixed Exception when downloading empty data and auto-open dialogs
• fixed Exception when download finished before "Please Wait" appeared
• added new selection modificator options to search dialog
• added upload of timestamp

File:

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

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

@@ -10 +10 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -41 +41 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.RawGpsDataLayer;
+import org.openstreetmap.josm.gui.layer.RawGpsDataLayer.GpsPoint;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.tools.GBC;
@@ -55 +56 @@
 public class DownloadAction extends JosmAction {
 
-    /**
+        /**
+         * Open the download dialog and download the data.
+         * Run in the worker thread.
+         */
+    private final class DownloadOsmTask extends PleaseWaitRunnable {
+            private final OsmServerReader reader;
+                private DataSet dataSet;
+
+            private DownloadOsmTask(OsmServerReader reader) {
+                    super("Downloading data");
+                    this.reader = reader;
+            }
+
+            @Override
+            public void realRun() throws IOException, SAXException {
+                dataSet = reader.parseOsm();
+                if (dataSet.nodes.isEmpty())
+                        JOptionPane.showMessageDialog(Main.main, "No data imported.");
+            }
+
+                @Override
+        protected void finish() {
+                        if (dataSet == null)
+                                return; // user cancelled download or error occoured
+                        Layer layer = new OsmDataLayer(dataSet, "Data Layer", false);
+                if (Main.main.getMapFrame() == null)
+                        Main.main.setMapFrame(new MapFrame(layer));
+                else
+                        Main.main.getMapFrame().mapView.addLayer(layer);
+                }
+            
+    }
+
+
+    private final class DownloadGpsTask extends PleaseWaitRunnable {
+            private final OsmServerReader reader;
+                private Collection<Collection<GpsPoint>> rawData;
+
+            private DownloadGpsTask(OsmServerReader reader) {
+                    super("Downloading GPS data");
+                    this.reader = reader;
+            }
+
+            @Override
+            public void realRun() throws IOException, JDOMException {
+                rawData = reader.parseRawGps();
+            }
+
+                @Override
+        protected void finish() {
+                        if (rawData == null)
+                                return;
+                        String name = latlon[0].getText() + " " + latlon[1].getText() + " x " + latlon[2].getText() + " " + latlon[3].getText();
+                        Layer layer = new RawGpsDataLayer(rawData, name);
+                if (Main.main.getMapFrame() == null)
+                        Main.main.setMapFrame(new MapFrame(layer));
+                else
+                        Main.main.getMapFrame().mapView.addLayer(layer);
+                }
+            
+    }
+    
+    
+        /**
      * minlat, minlon, maxlat, maxlon
      */
@@ -231 +295 @@
                 
                 // Finally: the dialog
-                while(true) {
+                Bookmark b;
+                do {
                         int r = JOptionPane.showConfirmDialog(Main.main, dlg, "Choose an area", 
                                         JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
                         if (r != JOptionPane.OK_OPTION)
                                 return;
-                        if (startDownload()) 
-                                break;
-                }
-        }
-
-        /**
-         * Read the values from the edit fields and from the download.
-         * @return <code>true</code> for a success, <code>false</code> redisplay
-         */
-        private boolean startDownload() {
-                Bookmark b = readBookmark();
-                if (b == null) {
-                        JOptionPane.showMessageDialog(Main.main, "Please enter the desired coordinates or click on a bookmark.");
-                        return false;
-                }
+                        b = readBookmark();
+                        if (b == null)
+                                JOptionPane.showMessageDialog(Main.main, "Please enter the desired coordinates or click on a bookmark.");
+                } while (b == null);
 
                 double minlon = b.latlon[0];
@@ -257 +311 @@
                 double maxlat = b.latlon[3];
                 download(rawGps.isSelected(), minlon, minlat, maxlon, maxlat);
-                return true;
-        }
-        
+        }
+
         /**
          * Read a bookmark from the current set edit fields. If one of the fields is
@@ -325 +378 @@
          * Do the download for the given area.
          */
-        public void download(final boolean rawGps, double minlat, double minlon, double maxlat, double maxlon) {
-                final OsmServerReader osmReader = new OsmServerReader(minlat, minlon, maxlat, maxlon);
-                new Thread(new PleaseWaitRunnable("Downloading data"){
-                        @Override
-                        public void realRun() {
-                                try {
-                                        String name = latlon[0].getText() + " " + latlon[1].getText() + " x " + latlon[2].getText() + " " + latlon[3].getText();
-
-                                        Layer layer = null;
-                                        if (rawGps) {
-                                                layer = new RawGpsDataLayer(osmReader.parseRawGps(), name);
-                                        } else {
-                                                DataSet dataSet = osmReader.parseOsm();
-                                                if (dataSet == null)
-                                                        return; // user cancelled download
-                                                if (dataSet.nodes.isEmpty()) {
-                                                        closeDialog();
-                                                        JOptionPane.showMessageDialog(Main.main,
-                                                        "No data imported.");
-                                                }
-
-                                                layer = new OsmDataLayer(dataSet, "Data Layer", false);
-                                        }
-
-                                        if (Main.main.getMapFrame() == null)
-                                                Main.main.setMapFrame(new MapFrame(layer));
-                                        else
-                                                Main.main.getMapFrame().mapView.addLayer(layer);
-                                } catch (SAXException x) {
-                                        closeDialog();
-                                        x.printStackTrace();
-                                        JOptionPane.showMessageDialog(Main.main, "Error while parsing: "+x.getMessage());
-                                } catch (JDOMException x) {
-                                        closeDialog();
-                                        x.printStackTrace();
-                                        JOptionPane.showMessageDialog(Main.main, "Error while parsing: "+x.getMessage());
-                                } catch (FileNotFoundException x) {
-                                        closeDialog();
-                                        x.printStackTrace();
-                                        JOptionPane.showMessageDialog(Main.main, "URL not found: " + x.getMessage());
-                                } catch (IOException x) {
-                                        closeDialog();
-                                        x.printStackTrace();
-                                        JOptionPane.showMessageDialog(Main.main, x.getMessage());
-                                }
-                        }
-                }).start();
+        public void download(boolean rawGps, double minlat, double minlon, double maxlat, double maxlon) {
+                OsmServerReader reader = new OsmServerReader(minlat, minlon, maxlat, maxlon);
+                PleaseWaitRunnable task = rawGps ? new DownloadGpsTask(reader) : new DownloadOsmTask(reader);
+                Main.worker.execute(task);
+                task.pleaseWaitDlg.setVisible(true);
         }
 }