Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.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/downloadtasks/DownloadOsmTask.java (modified) (4 diffs)

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";
     }