Changeset 25045 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.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/DownloadWMSVectorImage.java (modified) (5 diffs)

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

@@ -17 +17 @@
     private WMSLayer wmsLayer;
     private Bounds bounds;
-    private CadastreGrabber grabber = CadastrePlugin.cadastreGrabber;
     private static String errorMessage;
 
@@ -32 +31 @@
         errorMessage = null;
         try {
-            if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
+            if (wmsLayer.grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
                 if (wmsLayer.getImages().isEmpty()) {
                     // first time we grab an image for this layer
@@ -50 +49 @@
                     } else {
                         // set vectorized commune bounding box by opening the standard web window
-                        grabber.getWmsInterface().retrieveCommuneBBox(wmsLayer);
+                        wmsLayer.grabber.getWmsInterface().retrieveCommuneBBox(wmsLayer);
                     }
                 }
                 // grab new images from wms server into active layer
-                wmsLayer.grab(grabber, bounds);
+                wmsLayer.grab(bounds);
             }
         } catch (DuplicateLayerException e) {
@@ -61 +60 @@
         } catch (WMSException e) {
             errorMessage = e.getMessage();
-            grabber.getWmsInterface().resetCookie();
+            wmsLayer.grabber.getWmsInterface().resetCookie();
         }
     }
@@ -67 +66 @@
     @Override
     protected void cancel() {
-        grabber.getWmsInterface().cancel();
+        wmsLayer.grabber.getWmsInterface().cancel();
         if (wmsLayer != null)
             wmsLayer.grabThread.setCancelled(true);