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

Timestamp:

2017-04-12T00:46:52+02:00 (7 years ago)

Author:

donvip

Message:

update JOSM + fix #josm13693 + fix #josm13863

File:

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

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

@@ -18 +18 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -34 +33 @@
     private static EastNorth[] croppedRaster = new EastNorth[5];;
 
-    public WMSAdjustAction(MapFrame mapFrame) {
+    /**
+     * Constructs a new {@code WMSAdjustAction} map mode.
+     */
+    public WMSAdjustAction() {
         super(tr("Adjust WMS"), "adjustxywms",
-                        tr("Adjust the position of the WMS layer (saved for raster images only)"), mapFrame,
+                        tr("Adjust the position of the WMS layer (saved for raster images only)"),
                         ImageProvider.getCursor("normal", "move"));
     }
@@ -50 +52 @@
                 modifiedLayer.adjustModeEnabled = true;
             } else {
-//                JOptionPane.showMessageDialog(Main.parent,tr("This mode works only if active layer is\n"
-//                        +"a cadastre layer"));
-                exitMode();
+                // This mode works only if active layer is a cadastre layer
+                if (Boolean.TRUE.equals(getValue("active"))) {
+                    exitMode();
+                }
                 Main.map.selectMapMode((MapMode) Main.map.getDefaultButtonAction());
             }