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

Timestamp:

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

Author:

donvip

Message:

update JOSM + fix #josm13693 + fix #josm13863

File:

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

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