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

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

@@ -65 +65 @@
     final  int cRetriesGetCookie = 10; // 10 times every 3 seconds means 30 seconds trying to get a cookie
 
-    public boolean retrieveInterface(WMSLayer wmsLayer) throws DuplicateLayerException {
+    public boolean retrieveInterface(WMSLayer wmsLayer) throws DuplicateLayerException, WMSException {
         if (wmsLayer.getName().equals(""))
             return false;
@@ -75 +75 @@
             if (cookie == null || isCookieExpired())
                 getCookie();
-            if (cookie != null && interfaceRef == null) {
+            if (cookie == null)
+                throw new WMSException(tr("Cannot open a new client session.\nServer in maintenance or temporary overloaded."));
+            if (interfaceRef == null) {
                     getInterface(wmsLayer);
                     this.lastWMSLayerName = wmsLayer.getName();
-            } else {
-                JOptionPane.showMessageDialog(Main.parent,
-                        tr("Cannot open a new client session.\nServer in maintenance or temporary overloaded."));
-                return false;
             }
             openInterface();