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

Timestamp:

2010-05-28T21:22:49+02:00 (16 years ago)

Author:

pieren

Message:

Improve renaming after municipality selection

File:

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

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

@@ -64 +64 @@
     public void actionInterrupted() {
         actionCompleted();
-        wmsLayer = null;
+        if (wmsLayer != null) {
+            Main.map.mapView.removeLayer(wmsLayer);
+            wmsLayer = null;
+        }
     }
 
@@ -101 +104 @@
         // wait until plan image is fully loaded and joined into one single image
         boolean loadedFromCache = downloadWMSPlanImage.waitFinished();
-        if (wmsLayer.images.size() == 1 && !loadedFromCache) {
+        if (loadedFromCache) {
+            Main.map.repaint();
+        } else if (wmsLayer.images.size() == 0) {
+            // action cancelled or image loaded from cache (and already georeferenced)
+            actionInterrupted();
+        } else {
             int reply = JOptionPane.CANCEL_OPTION;
             if (wmsLayer.isAlreadyGeoreferenced()) {
@@ -120 +128 @@
                     startGeoreferencing();
             }
-        } else // action cancelled or image loaded from cache (and already georeferenced)
-            Main.map.repaint();
+        }
     }
 
@@ -270 +277 @@
                         JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE,
                         null, options, options[0]);
+        countMouseClicked = 0;
         if (selectedValue == 0) { // "Cancel"
                 // remove layer
@@ -275 +283 @@
             wmsLayer = null;
             Main.map.mapView.removeMouseListener(this);
-                return false;
-        } else
-            countMouseClicked = 0;
+            return false;
+        }
         return true;
     }