Changeset 20765 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2010-04-01T02:04:01+02:00 (15 years ago)

Author:

pieren

Message:

minor fixes

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CadastreInterface.java (modified) (1 diff)
• WMSLayer.java (modified) (1 diff)

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

@@ -68 +68 @@
         if (wmsLayer.getName().equals(""))
             return false;
-        if (wmsLayer.getName().equals(lastWMSLayerName))
+        boolean isCookieExpired = isCookieExpired();
+        if (wmsLayer.getName().equals(lastWMSLayerName) && !isCookieExpired)
             return true;
         // open the session with the French Cadastre web front end
         downloadCancelled = false;
         try {
-            if (cookie == null || isCookieExpired())
+            if (cookie == null || isCookieExpired) {
                 getCookie();
+                interfaceRef = null;
+            }
             if (cookie == null)
                 throw new WMSException(tr("Cannot open a new client session.\nServer in maintenance or temporary overloaded."));

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

@@ -188 +188 @@
             Main.map.mapView.repaint();
         }
-        if (buildingsOnly)
-            joinBufferedImages();
-        for (int i=lastSavedImage; i < images.size(); i++)
-            saveToCache(images.get(i));
+        if (!cancelled) {
+            if (buildingsOnly)
+                joinBufferedImages();
+            for (int i=lastSavedImage; i < images.size(); i++)
+                saveToCache(images.get(i));
+        }
     }