Ticket #2963: dont-count-layers.patch

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

@@ -40 +40 @@
         private boolean newLayer;
         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;
             this.reader = reader;
@@ -112 +111 @@
         Task t = new Task(newLayer,
                 new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon),
                 silent,
-                getDataLayersCount(),
                 message);
         currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
         // We need submit instead of execute so we can wait for it to finish and get the error
@@ -134 +132 @@
         Task t = new Task(new_layer,
                 new OsmServerLocationReader(url),
                 false,
-                getDataLayersCount(),
         "");
         task = Main.worker.submit(t, t);
     }
@@ -147 +144 @@
         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;
-    }
-
     /*
      * (non-Javadoc)
      * @see org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask#getErrorMessage()