Changeset 20412 in osm for applications/editors

Timestamp:

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

Author:

pieren

Message:

improve download cancellation

Location:

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

Files:

• CadastreInterface.java (modified) (2 diffs)
• CadastrePlugin.java (modified) (2 diffs)
• DownloadSVGBuilding.java (modified) (4 diffs)
• DownloadSVGTask.java (modified) (4 diffs)
• DownloadWMSPlanImage.java (modified) (4 diffs)
• DownloadWMSVectorImage.java (modified) (6 diffs)
• WMSLayer.java (modified) (3 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();

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

@@ -90 +90 @@
  * 1.6 28-Nov-2009 - Fix minor issues if Grab is called without layer (possible since projection rework)
  * 1.7 12-Dec-2009 - Change URL's changes for cookie and downgrade imgs resolution due to WMS changes
- * 1.8 09-Mar-2010 - filter the mouse button 1 during georeferencing
+ * 1.8 11-Mar-2010 - filter the mouse button 1 during georeferencing
  *                 - retry if getting a new cookie failed (10 times during 30 seconds)
  *                 - cookie expiration automatically detected and renewed (after 30 minutes)
@@ -101 +101 @@
  *                 - image resolution configurable (high, medium, low) like the online interface
  *                 - layer selection configurable for vectorized images
+ *                 - improved download cancellation
  *                 - from Erik Amzallag:
  *                 -     possibility to modify the auto-sourcing text just before upload 
  *                 - from Clément Ménier:
  *                 -     new option allowing an auto-selection of the first cadastre layer for grab
- *                 -     non-modal JDialog in MenuActionGrabPlanImage  
+ *                 -     non-modal JDialog in MenuActionGrabPlanImage
+ *                 -     new options in the image filter (bilinear, bicubic)
  */
 public class CadastrePlugin extends Plugin {

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

@@ -42 +42 @@
     private static EastNorthBound currentView = null;
     private EastNorthBound viewBox = null;
+    private static String errorMessage;
+
 
     public DownloadSVGBuilding(WMSLayer wmsLayer) {
@@ -53 +55 @@
     public void realRun() throws IOException, OsmTransferException {
         progressMonitor.indeterminateSubTask(tr("Contacting WMS Server..."));
+        errorMessage = null;
         try {
             if (wmsInterface.retrieveInterface(wmsLayer)) {
@@ -65 +68 @@
         } catch (DuplicateLayerException e) {
             System.err.println("removed a duplicated layer");
+        } catch (WMSException e) {
+            errorMessage = e.getMessage();
+            grabber.getWmsInterface().resetCookie();
         }
     }
@@ -272 +278 @@
         }
         Main.worker.execute(new DownloadSVGBuilding(wmsLayer));
+        if (errorMessage != null)
+            JOptionPane.showMessageDialog(Main.parent, errorMessage);
     }
 

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);
     }
 

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

@@ -21 +21 @@
     private Bounds bounds;
     private boolean dontGeoreference = false;
+    private static String errorMessage;
     
     private class Task extends PleaseWaitRunnable {
@@ -31 +32 @@
         public void realRun() throws IOException {
             progressMonitor.indeterminateSubTask(tr("Contacting cadastre WMS ..."));
+            errorMessage = null;
             try {
                 if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
@@ -85 +87 @@
                 // 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();
             }
         }
@@ -108 +113 @@
         this.bounds = bounds;
         task = Main.worker.submit(t, t);
+        if (errorMessage != null)
+            JOptionPane.showMessageDialog(Main.parent, errorMessage);
     }
 

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);
     }
 }

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

@@ -72 +72 @@
     public EastNorthBound communeBBox = new EastNorthBound(new EastNorth(0,0), new EastNorth(0,0));
 
+    public boolean cancelled;
+
     private boolean isRaster = false;
     private boolean isAlreadyGeoreferenced = false;
@@ -132 +134 @@
     
     public void grab(CadastreGrabber grabber, Bounds b, boolean useFactor) throws IOException {
+        cancelled = false;
         if (useFactor) {
             if (isRaster) {
@@ -146 +149 @@
         int lastSavedImage = images.size();
         for (EastNorthBound n : dividedBbox) {
+            if (cancelled)
+                return;
             GeorefImage newImage;
             try {