Changeset 2328 in josm for trunk/src/org

Timestamp:

2009-10-27T01:27:50+01:00 (14 years ago)

Author:

Gubaer

Message:

More cleanup in download logic (less globals, more encapsulation)

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/DownloadAction.java (modified) (3 diffs)
• actions/downloadtasks/DownloadGpsTask.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• actions/downloadtasks/DownloadOsmTaskList.java (modified) (1 diff)
• actions/downloadtasks/DownloadTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -424 +424 @@
                 //DownloadTask osmTask = main.menu.download.downloadTasks.get(0);
                 DownloadTask osmTask = new DownloadOsmTask();
-                Future<?> future = osmTask.download(main.menu.download, b, null);
+                Future<?> future = osmTask.download(true, b, null);
                 Main.worker.submit(new PostDownloadHandler(osmTask, future));
             }
@@ -475 +475 @@
                 DownloadTask task = rawGps ? new DownloadGpsTask() : new DownloadOsmTask();
                 // asynchronously launch the download task ...
-                Future<?> future = task.download(main.menu.download, b, null);
+                Future<?> future = task.download(true, b, null);
                 // ... and the continuation when the download is finished (this will wait for the download to finish)
                 Main.worker.execute(new PostDownloadHandler(task, future));

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

@@ -34 +34 @@
     
 
-    public DownloadDialog dialog;
+    private DownloadDialog dialog;
     private ExtendedDialog downloadDialog;
 
@@ -78 +78 @@
                 if (dialog.isDownloadOsmData()) {
                     DownloadOsmTask task = new DownloadOsmTask();
-                    Future<?> future = task.download(this, dialog.getSelectedDownloadArea(), null);
+                    Future<?> future = task.download(dialog.isNewLayerRequired(), dialog.getSelectedDownloadArea(), null);
                     Main.worker.submit(new PostDownloadHandler(task, future));
                     finish = true;
@@ -84 +84 @@
                 if (dialog.isDownloadGpxData()) {
                     DownloadGpsTask task = new DownloadGpsTask();
-                    Future<?> future = task.download(this,dialog.getSelectedDownloadArea(), null);
+                    Future<?> future = task.download(dialog.isNewLayerRequired(),dialog.getSelectedDownloadArea(), null);
                     Main.worker.submit(new PostDownloadHandler(task, future));
                     finish = true;

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -23 +22 @@
     private DownloadTask downloadTask;
 
-    public Future<?> download(DownloadAction action, Bounds downloadArea, ProgressMonitor progressMonitor) {
-        downloadTask = new DownloadTask(action.dialog.isNewLayerRequired(),
+    public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
+        downloadTask = new DownloadTask(newLayer,
                 new BoundingBoxDownloader(downloadArea), progressMonitor);
         // We need submit instead of execute so we can wait for it to finish and get the error

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

@@ -44 +44 @@
     }
 
-    public Future<?> download(DownloadAction action, Bounds downloadArea, ProgressMonitor progressMonitor) {
+    public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
        
-        boolean newLayer = action != null
-        && (action.dialog == null || action.dialog.isNewLayerRequired());
-
         downloadTask = new DownloadTask(newLayer,
                 new BoundingBoxDownloader(downloadArea), progressMonitor);

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

@@ -66 +66 @@
             childProgress.setSilent(true);
             childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, rects.size(), rects.size() - i));
-            Future<?> future = dt.download(null, new Bounds(td), childProgress);
+            Future<?> future = dt.download(false, 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 org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -15 +14 @@
      * if no error messages should be popped up.
      */
-    Future<?> download(DownloadAction action, Bounds downloadArea, ProgressMonitor progressMonitor);
+    Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor);
 
     /**