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

Timestamp:

2010-03-11T00:58:51+01:00 (16 years ago)

Author:

pieren

Message:

improve download cancellation

File:

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

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

@@ -5 +5 @@
 
 import java.io.IOException;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -14 +16 @@
 
     private WMSLayer wmsLayer;
-
-    private Bounds bounds;
-    
-    private CadastreGrabber grabber = CadastrePlugin.cadastreGrabber;
+    private Bounds bounds;    
+    private CadastreGrabber grabber = CadastrePlugin.cadastreGrabber;    
+    private static String errorMessage;
 
     public DownloadWMSVectorImage(WMSLayer wmsLayer, Bounds bounds, boolean buildingsOnly) {
@@ -30 +31 @@
     public void realRun() throws IOException {
         progressMonitor.indeterminateSubTask(tr("Contacting WMS Server..."));
+        errorMessage = null;
         try {
             if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
@@ -62 +64 @@
             // we tried to grab onto a duplicated layer (removed)
             System.err.println("removed a duplicated layer");
+        } catch (WMSException e) {
+            errorMessage = e.getMessage();
+            grabber.getWmsInterface().resetCookie();
         }
     }
@@ -68 +73 @@
     protected void cancel() {
         grabber.getWmsInterface().cancel();
+        if (wmsLayer != null)
+            wmsLayer.cancelled = true;
     }
 
@@ -79 +86 @@
 
         Main.worker.execute(new DownloadWMSVectorImage(wmsLayer, bounds, buildingsOnly));
-
+        if (errorMessage != null)
+            JOptionPane.showMessageDialog(Main.parent, errorMessage);
     }
 }