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

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

@@ -42 +42 @@
 
     private WMSLayer wmsLayer;
-    private CadastreGrabber grabber = CadastrePlugin.cadastreGrabber;
     private CadastreInterface wmsInterface;
     private String svg = null;
@@ -52 +51 @@
 
         this.wmsLayer = wmsLayer;
-        this.wmsInterface = grabber.getWmsInterface();
+        this.wmsInterface = wmsLayer.grabber.getWmsInterface();
     }
 
@@ -75 +74 @@
         } catch (WMSException e) {
             errorMessage = e.getMessage();
-            grabber.getWmsInterface().resetCookie();
+            wmsLayer.grabber.getWmsInterface().resetCookie();
         }
     }
@@ -81 +80 @@
     @Override
     protected void cancel() {
-        grabber.getWmsInterface().cancel();
+        wmsLayer.grabber.getWmsInterface().cancel();
     }