Changeset 16791 in osm for applications/editors

Timestamp:

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

Author:

guggis

Message:

Updated to JOSM release 1893

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/cadastre_fr/CadastreInterface.java (modified) (2 diffs)
• src/cadastre_fr/WMSLayer.java (modified) (5 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="A special handler for the French land registry WMS server."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
-                <attribute name="Plugin-Mainversion" value="1815"/>
+                <attribute name="Plugin-Mainversion" value="1893"/>
                 <attribute name="Plugin-Stage" value="60"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

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

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

@@ -174 +174 @@
     @Override
     public String getToolTipText() {
-        String str = tr("WMS layer ({0}), {1} tile(s) loaded", name, images.size());
+        String str = tr("WMS layer ({0}), {1} tile(s) loaded", getName(), images.size());
         if (isRaster) {
             str += "\n"+tr("Is not vectorized.");
@@ -215 +215 @@
     @Override
     public Component[] getMenuEntries() {
-        component = new Component[] { new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
-                new JMenuItem(new LayerListDialog.DeleteLayerAction(this)), new JMenuItem(new MenuActionLoadFromCache()),
+        component = new Component[] { new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
+                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)), new JMenuItem(new MenuActionLoadFromCache()),
                 new JMenuItem(new LayerListPopup.InfoAction(this)) };
         return component;
@@ -285 +285 @@
     public void setLocation(String location) {
         this.location = location;
-        this.name = rebuildName();
-        repaintLayerListDialog();
+        setName(rebuildName());
     }
 
@@ -295 +294 @@
     public void setCodeCommune(String codeCommune) {
         this.codeCommune = codeCommune;
-        this.name = rebuildName();
-        repaintLayerListDialog();
+        setName(rebuildName());
     }
 
@@ -350 +348 @@
         for (GeorefImage img : images)
             img.rotate(rasterCenter, angle);
-    }
-
-    /**
-     * Repaint the LayerList dialog.
-     * This is the only way I found to refresh the layer name in the layer list when it changes
-     * later (after the construction).
-     */
-    private void repaintLayerListDialog() {
-        if (Main.map != null) {
-            for (Component c : Main.map.toggleDialogs.getComponents()) {
-                if (c instanceof LayerListDialog) {
-                    c.repaint();
-                }
-            }
-        }
     }