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

Timestamp:

2009-08-19T22:54:02+02:00 (16 years ago)

Author:

pieren

Message:

better handling of dialogs cancellations

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

@@ -72 +72 @@
         } catch (IOException e) {
             /*JOptionPane.showMessageDialog(Main.parent,
-                    tr("Town/city {0} not found or not available in WMS.\n" +
-                            "Please check its availibility on www.cadastre.gouv.fr", wmsLayer.getLocation()));*/
+                    tr("Town/city {0} not found or not available\n" +
+                            "or action canceled", wmsLayer.getLocation()));*/
             JOptionPane pane = new JOptionPane(
-                    tr("Town/city {0} not found or not available in WMS.\n" +
-                            "Please check its availibility on www.cadastre.gouv.fr", wmsLayer.getLocation()),
+                    tr("Town/city {0} not found or not available\n" +
+                            "or action canceled", wmsLayer.getLocation()),
                             JOptionPane.INFORMATION_MESSAGE);
             // this below is a temporary workaround to fix the "always on top" issue
@@ -260 +260 @@
                 // list of values parsed in listOfFeuilles (list all non-georeferenced images)
                 lines = getFeuillesList();
-                parseFeuillesList(lines);
-                if (listOfFeuilles.size() > 0) {
-                    int res = selectFeuilleDialog();
-                    if (res != -1) {
-                        wmsLayer.setCodeCommune(listOfFeuilles.elementAt(res).name);
-                        checkLayerDuplicates(wmsLayer);
-                        interfaceRef = buildRasterFeuilleInterfaceRef(wmsLayer.getCodeCommune());
-                        wmsLayer.setCodeCommune(listOfFeuilles.elementAt(res).ref);
-                        lines = buildRasterFeuilleInterfaceRef(listOfFeuilles.elementAt(res).ref);
-                        System.out.println("interface ref.:"+lines);
-                        return lines;
-                    }
+                if (!downloadCancelled) {
+                        parseFeuillesList(lines);
+                        if (listOfFeuilles.size() > 0) {
+                            int res = selectFeuilleDialog();
+                            if (res != -1) {
+                                wmsLayer.setCodeCommune(listOfFeuilles.elementAt(res).name);
+                                checkLayerDuplicates(wmsLayer);
+                                interfaceRef = buildRasterFeuilleInterfaceRef(wmsLayer.getCodeCommune());
+                                wmsLayer.setCodeCommune(listOfFeuilles.elementAt(res).ref);
+                                lines = buildRasterFeuilleInterfaceRef(listOfFeuilles.elementAt(res).ref);
+                                System.out.println("interface ref.:"+lines);
+                                return lines;
+                            }
+                        }
                 }
                 return null;