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

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

@@ -46 +46 @@
     private String svg = null;
     private EastNorthBound viewBox = null;
+    private static String errorMessage;
 
     public DownloadSVGTask(WMSLayer wmsLayer) {
@@ -57 +58 @@
     public void realRun() throws IOException, OsmTransferException {
         progressMonitor.indeterminateSubTask(tr("Contacting WMS Server..."));
+        errorMessage = null;
         try {
             if (wmsInterface.retrieveInterface(wmsLayer)) {
@@ -71 +73 @@
         } catch (DuplicateLayerException e) {
             System.err.println("removed a duplicated layer");
+        } catch (WMSException e) {
+            errorMessage = e.getMessage();
+            grabber.getWmsInterface().resetCookie();
         }
     }
@@ -218 +223 @@
         }
         Main.worker.execute(new DownloadSVGTask(wmsLayer));
+        if (errorMessage != null)
+            JOptionPane.showMessageDialog(Main.parent, errorMessage);
     }