Changeset 1799 in josm

Timestamp:

2009-07-16T19:23:24+02:00 (15 years ago)

Author:

Gubaer

Message:

#2963 : applied patch by plaicy - DownloadOsmTask.Task does not need number of datalayers

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (5 diffs)

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

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
@@ -41 +40 @@
         private String msg = "";
 
-        public Task(boolean newLayer, OsmServerReader reader, boolean silent,
-                int numLayers, String msg) {
+        public Task(boolean newLayer, OsmServerReader reader, boolean silent, String msg) {
             super(tr("Downloading data"));
             this.msg = msg;
@@ -113 +111 @@
                 new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon),
                 silent,
-                getDataLayersCount(),
                 message);
         currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
@@ -135 +132 @@
                 new OsmServerLocationReader(url),
                 false,
-                getDataLayersCount(),
         "");
         task = Main.worker.submit(t, t);
@@ -146 +142 @@
     public String getPreferencesSuffix() {
         return "osm";
-    }
-
-    /**
-     * Finds the number of data layers currently opened
-     * @return Number of data layers
-     */
-    private int getDataLayersCount() {
-        if(Main.map == null || Main.map.mapView == null)
-            return 0;
-        int num = 0;
-        for(Layer l : Main.map.mapView.getAllLayers())
-            if(l instanceof OsmDataLayer) {
-                num++;
-            }
-        return num;
     }