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

Timestamp:

2009-08-03T11:47:01+02:00 (17 years ago)

Author:

guggis

Message:

Updated to JOSM release 1893

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

@@ -50 +50 @@
 
     public boolean retrieveInterface(WMSLayer wmsLayer) throws DuplicateLayerException {
-        if (wmsLayer.name.equals(""))
+        if (wmsLayer.getName().equals(""))
             return false;
         // open the session with the French Cadastre web front end
         downloadCancelled = false;
         try {
-            if (cookie == null || !wmsLayer.name.equals(cadastreGrabber.getLastWMSLayerName())) {
+            if (cookie == null || !wmsLayer.getName().equals(cadastreGrabber.getLastWMSLayerName())) {
                 getCookie();
                 getInterface(wmsLayer);
-                cadastreGrabber.setLastWMSLayerName(wmsLayer.name);
+                cadastreGrabber.setLastWMSLayerName(wmsLayer.getName());
             }
             openInterface();
@@ -360 +360 @@
         if (Main.map != null) {
             for (Layer l : Main.map.mapView.getAllLayers()) {
-                if (l instanceof WMSLayer && l.name.equals(wmsLayer.name) && (l != wmsLayer)) {
-                    System.out.println("Try to grab into a new layer when "+wmsLayer.name+" is already opened.");
+                if (l instanceof WMSLayer && l.getName().equals(wmsLayer.getName()) && (l != wmsLayer)) {
+                    System.out.println("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
                     // remove the duplicated layer
                     Main.map.mapView.removeLayer(wmsLayer);