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

Timestamp:

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

Author:

pieren

Message:

Improve renaming after municipality selection

File:

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

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

@@ -175 +175 @@
                     // commune unknown, prompt the list of communes from
                     // server and try with codeCommune
-                    wmsLayer.setCodeCommune(selectCommuneDialog());
+                    String selected = selectMunicipalityDialog(wmsLayer);
+                    if (selected != null) {
+                        String newCodeCommune = selected.substring(1, selected.indexOf(">")-2);
+                        String newLocation = selected.substring(selected.indexOf(">")+1, selected.lastIndexOf(" - "));
+                        wmsLayer.setCodeCommune(newCodeCommune);
+                        wmsLayer.setLocation(newLocation);
+                        Main.pref.put("cadastrewms.codeCommune", newCodeCommune);
+                        Main.pref.put("cadastrewms.location", newLocation);
+                    }
                     checkLayerDuplicates(wmsLayer);
                     interfaceRef = postForm(wmsLayer, wmsLayer.getCodeCommune());
@@ -381 +389 @@
     }
     
-    private String selectCommuneDialog() {
+    private String selectMunicipalityDialog(WMSLayer wmsLayer) {
         JPanel p = new JPanel(new GridBagLayout());
         String[] communeList = new String[listOfCommunes.size() + 1];
@@ -401 +409 @@
         if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue()))
             return null;
-        String result = listOfCommunes.elementAt(inputCommuneList.getSelectedIndex()-1);
-        return result.substring(1, result.indexOf(">")-2);
+        return listOfCommunes.elementAt(inputCommuneList.getSelectedIndex()-1);
     }