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

Timestamp:

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

Author:

Gubaer

Message:

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

File:

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

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;