Changeset 25045 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java

Timestamp:

2011-01-13T23:27:42+01:00 (15 years ago)

Author:

pieren

Message:

Move the grabber single instance from CadastrePlugin singleton to each WMSLayer instance to allow several municipalities grabbing in parallel.

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java (modified) (6 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java

@@ -24 +24 @@
     
     private class Task extends PleaseWaitRunnable {
-        private CadastreGrabber grabber = CadastrePlugin.cadastreGrabber;
         public Task(WMSLayer wmsLayer, Bounds bounds) {
             super(tr("Downloading {0}", wmsLayer.getName()));
@@ -34 +33 @@
             errorMessage = null;
             try {
-                if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
+                if (wmsLayer.grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
                     if (!wmsLayer.getImages().isEmpty()) {
                         //JOptionPane.showMessageDialog(Main.parent,tr("Image already loaded"));
@@ -46 +45 @@
                         // till here
                         dontGeoreference = true;
-                    } else if (grabber.getWmsInterface().downloadCancelled){
+                    } else if (wmsLayer.grabber.getWmsInterface().downloadCancelled){
                         // do nothing
                     } else {
@@ -59 +58 @@
                         if (wmsLayer.isRaster()) {
                             // set raster image commune bounding box based on current view (before adjustment)
-                            grabber.getWmsInterface().retrieveCommuneBBox(wmsLayer);
+                            wmsLayer.grabber.getWmsInterface().retrieveCommuneBBox(wmsLayer);
                             wmsLayer.setRasterBounds(bounds);
                             // grab new images from wms server into active layer
-                            wmsLayer.grab(grabber, bounds);
-                            if (grabber.getWmsInterface().downloadCancelled) {
+                            wmsLayer.grab(bounds);
+                            if (wmsLayer.grabber.getWmsInterface().downloadCancelled) {
                                 wmsLayer.clearImages();
                                 Main.map.mapView.repaint();
@@ -89 +88 @@
             } catch (WMSException e) {
                 errorMessage = e.getMessage();
-                grabber.getWmsInterface().resetCookie();
+                wmsLayer.grabber.getWmsInterface().resetCookie();
             }
         }
@@ -95 +94 @@
         @Override
         protected void cancel() {
-            grabber.getWmsInterface().cancel();
+            wmsLayer.grabber.getWmsInterface().cancel();
             dontGeoreference = true;
         }