Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-27T01:21:32+01:00 (16 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DownloadAction.java (modified) (6 diffs)
• downloadtasks/DownloadGpsTask.java (modified) (2 diffs)
• downloadtasks/DownloadOsmTask.java (modified) (4 diffs)
• downloadtasks/DownloadOsmTaskList.java (modified) (2 diffs)
• downloadtasks/DownloadTask.java (modified) (3 diffs)
• downloadtasks/PostDownloadHandler.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.BorderLayout;
@@ -15 +15 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -31 +32 @@
  */
 public class DownloadAction extends JosmAction {
+    
 
     public DownloadDialog dialog;
+    private ExtendedDialog downloadDialog;
 
     public DownloadAction() {
@@ -45 +48 @@
      */
     protected ExtendedDialog createUploadDialog() {
-        dialog = new DownloadDialog();
+        if (dialog == null)
+            dialog = new DownloadDialog();
+        dialog.restoreSettings();
         JPanel downPanel = new JPanel(new BorderLayout());
         downPanel.add(dialog, BorderLayout.CENTER);
@@ -53 +58 @@
                 new Dimension(1000,600));
 
-        ExtendedDialog dialog = new ExtendedDialog(Main.parent,
+        if (downloadDialog == null) {
+            downloadDialog= new ExtendedDialog(Main.parent,
                 tr("Download"),
                 new String[] {tr("OK"), tr("Cancel")});
-        dialog.setContent(downPanel, false /* don't use a scroll pane inside the dialog */);
-        dialog.setButtonIcons(new String[] {"ok", "cancel"});
-        dialog.setRememberWindowGeometry(prefName, wg);
-        return dialog;
+            downloadDialog.setContent(downPanel, false /* don't use a scroll pane inside the dialog */);
+            downloadDialog.setButtonIcons(new String[] {"ok", "cancel"});
+            downloadDialog.setRememberWindowGeometry(prefName, wg);
+        }
+        return downloadDialog;
     }
 
@@ -65 +72 @@
         ExtendedDialog dlg = createUploadDialog();
         boolean finish = false;
-        while (!finish) {
+        while (!finish) {            
             dlg.showDialog();
-            Main.pref.put("download.newlayer", dialog.newLayer.isSelected());
             if (dlg.getValue() == 1 /* OK */) {
-                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()) {
-                        // asynchronously launch the download task ...
-                        Future<?> future = task.download(this, dialog.minlat, dialog.minlon, dialog.maxlat, dialog.maxlon, null);
-                        // ... and the continuation when the download task is finished
-                        Main.worker.submit(new PostDownloadHandler(task, future));
-                        finish = true;
-                    }
+                dialog.rememberSettings();
+                if (dialog.isDownloadOsmData()) {
+                    DownloadOsmTask task = new DownloadOsmTask();
+                    Future<?> future = task.download(this, dialog.getSelectedDownloadArea(), null);
+                    Main.worker.submit(new PostDownloadHandler(task, future));
+                    finish = true;
+                }
+                if (dialog.isDownloadGpxData()) {
+                    DownloadGpsTask task = new DownloadGpsTask();
+                    Future<?> future = task.download(this,dialog.getSelectedDownloadArea(), null);
+                    Main.worker.submit(new PostDownloadHandler(task, future));
+                    finish = true;
                 }
             } else {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -7 +7 @@
 import java.util.concurrent.Future;
 
-import javax.swing.JCheckBox;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DownloadAction;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -22 +21 @@
 public class DownloadGpsTask extends AbstractDownloadTask {
 
-    private JCheckBox checkBox = new JCheckBox(tr("Raw GPS data"));
     private DownloadTask downloadTask;
 
-    public Future<?> download(DownloadAction action, double minlat, double minlon,
-            double maxlat, double maxlon, ProgressMonitor progressMonitor) {
-        downloadTask = new DownloadTask(action.dialog.newLayer.isSelected(),
-                new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), progressMonitor);
+    public Future<?> download(DownloadAction action, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        downloadTask = new DownloadTask(action.dialog.isNewLayerRequired(),
+                new BoundingBoxDownloader(downloadArea), progressMonitor);
         // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
         return Main.worker.submit(downloadTask);
     }
-
-    public JCheckBox getCheckBox() {
-        return checkBox;
-    }
-
-    public String getPreferencesSuffix() {
-        return "gps";
-    }
-
+    
     public Future<?> loadUrl(boolean a,java.lang.String b,  ProgressMonitor progressMonitor) {
         return null;

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -8 +8 @@
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
-
-import javax.swing.JCheckBox;
 
 import org.openstreetmap.josm.Main;
@@ -38 +36 @@
     private DownloadTask downloadTask;
 
-    private JCheckBox checkBox = new JCheckBox(tr("OpenStreetMap data"), true);
-
     private void rememberDownloadedData(DataSet ds) {
         this.downloadedData = ds;
@@ -48 +44 @@
     }
 
-    public Future<?> download(DownloadAction action, double minlat, double minlon,
-            double maxlat, double maxlon, ProgressMonitor progressMonitor) {
-        // 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;
-        }
-
+    public Future<?> download(DownloadAction action, Bounds downloadArea, ProgressMonitor progressMonitor) {
+       
         boolean newLayer = action != null
-        && (action.dialog == null || action.dialog.newLayer.isSelected());
+        && (action.dialog == null || action.dialog.isNewLayerRequired());
 
         downloadTask = new DownloadTask(newLayer,
-                new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), progressMonitor);
-        currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
+                new BoundingBoxDownloader(downloadArea), progressMonitor);
+        currentBounds = new Bounds(downloadArea);
         // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
@@ -82 +68 @@
         currentBounds = new Bounds(new LatLon(0,0), new LatLon(0,0));
         return Main.worker.submit(downloadTask);
-    }
-
-    public JCheckBox getCheckBox() {
-        return checkBox;
-    }
-
-    public String getPreferencesSuffix() {
-        return "osm";
     }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.UpdateSelectionAction;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -65 +66 @@
             childProgress.setSilent(true);
             childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, rects.size(), rects.size() - i));
-            Future<?> future = dt.download(null, td.getMinY(), td.getMinX(), td.getMaxY(), td.getMaxX(), childProgress);
+            Future<?> future = dt.download(null, new Bounds(td), childProgress);
             osmTaskFutures.add(future);
             osmTasks.add(dt);

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java

@@ -5 +5 @@
 import java.util.concurrent.Future;
 
-import javax.swing.JCheckBox;
-
 import org.openstreetmap.josm.actions.DownloadAction;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -16 +15 @@
      * if no error messages should be popped up.
      */
-    Future<?> download(DownloadAction action, double minlat, double minlon,
-            double maxlat, double maxlon, ProgressMonitor progressMonitor);
+    Future<?> download(DownloadAction action, Bounds downloadArea, ProgressMonitor progressMonitor);
 
     /**
@@ -25 +23 @@
      */
     Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor);
-
-    /**
-     * @return The checkbox presented to the user
-     */
-    JCheckBox getCheckBox();
-
-    /**
-     * @return The name of the preferences suffix to use for storing the
-     * selection state.
-     */
-    String getPreferencesSuffix();
 
     /**

trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.concurrent.Future;
 
@@ -16 +18 @@
 public class PostDownloadHandler implements Runnable {
     private DownloadTask task;
-    private Future<?> future;
+    private List<Future<?>> futures;
 
     /**
@@ -25 +27 @@
     public PostDownloadHandler(DownloadTask task, Future<?> future) {
         this.task = task;
-        this.future = future;
+        this.futures = new ArrayList<Future<?>>();
+        if (future != null) {
+            this.futures.add(future);
+        }
     }
 
+    /**
+     * constructor
+     * @param task the asynchronous download task
+     * @param future the future on which the completion of the download task can be synchronized
+     */
+    public PostDownloadHandler(DownloadTask task, Future<?> ... futures) {
+        this.task = task;
+        this.futures = new ArrayList<Future<?>>();
+        if (futures == null) return;
+        for (Future<?> future: futures) {
+            this.futures.add(future);
+        }
+    }
+    
+
+    /**
+     * constructor
+     * @param task the asynchronous download task
+     * @param future the future on which the completion of the download task can be synchronized
+     */
+    public PostDownloadHandler(DownloadTask task, List<Future<?>> futures) {
+        this.task = task;
+        this.futures = new ArrayList<Future<?>>();
+        if (futures == null) return;
+        this.futures.addAll(futures);
+    }
+    
     public void run() {
-        // wait for the download task to complete
+        // wait for all downloads task to finish (by waiting for the futures
+        // to return a value)
         //
-        try {
-            future.get();
-        } catch(Exception e) {
-            e.printStackTrace();
-            return;
+        for (Future<?> future: futures) {
+            try {
+                future.get();
+            } catch(Exception e) {
+                e.printStackTrace();
+                return;
+            }
         }