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

Timestamp:

27.10.2009 01:21:32 (3 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

File:

• trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (6 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 {