Changeset 33226 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

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

Author:

donvip

Message:

update JOSM + fix #josm13693 + fix #josm13863

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/cadastre_fr/Address.java (modified) (5 diffs)
• src/cadastre_fr/CadastrePlugin.java (modified) (1 diff)
• src/cadastre_fr/WMSAdjustAction.java (modified) (3 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="Changed constructor for Plugin"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="11713"/>
     
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -56 +56 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.GBC;
@@ -91 +90 @@
     private boolean ctrl;
 
-    public Address(MapFrame mapFrame) {
+    /**
+     * Constructs a new {@code Address} map mode.
+     */
+    public Address() {
         super(tr("Add address"), "buildings",
                 tr("Helping tool for tag address"),
@@ -97 +99 @@
                 Shortcut.registerShortcut("mapmode:cadastre-fr-buildings", tr("Mode: {0}", tr("CadastreFR - Buildings")), KeyEvent.VK_E, Shortcut.DIRECT),
                 // CHECKSTYLE.ON: LineLength
-                mapFrame, getCursor());
+                getCursor());
     }
 
@@ -114 +116 @@
             Main.map.mapView.removeMouseListener(this);
         }
-//        dialog.setVisible(false);
         // kill the window completely to fix an issue on some linux distro and full screen mode.
         if (dialog != null) {
@@ -510 +511 @@
             @Override
             public void windowClosing(WindowEvent arg) {
-                exitMode();
+                if (Boolean.TRUE.equals(getValue("active"))) {
+                    exitMode();
+                }
                 Main.map.selectMapMode((MapMode) Main.map.getDefaultButtonAction());
             }

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

@@ -376 +376 @@
             if (oldFrame == null && newFrame != null) {
                 setEnabledAll(true);
-                Main.map.addMapMode(new IconToggleButton(new WMSAdjustAction(Main.map)));
-                Main.map.addMapMode(new IconToggleButton(new Address(Main.map)));
+                Main.map.addMapMode(new IconToggleButton(new WMSAdjustAction()));
+                Main.map.addMapMode(new IconToggleButton(new Address()));
             } else if (oldFrame != null && newFrame == null) {
                 setEnabledAll(false);

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