Ticket #3910: lassoOnS-5389.patch

src/org/openstreetmap/josm/gui/MapFrame.java

@@ -112 +112 @@
     public final SelectAction mapModeSelect;
     private final MapMode mapModeDraw;
     private final MapMode mapModeZoom;
+    public final MapMode mapModeLassoSelect;
 
     /**
      * The panel list of all toggle dialog icons. To add new toggle dialog actions, use addToggleDialog
@@ -159 +160 @@
         // toolbar
         toolBarActions.setFloatable(false);
         addMapMode(new IconToggleButton(mapModeSelect = new SelectAction(this)));
-        addMapMode(new IconToggleButton(new LassoModeAction(), true));
+        addMapMode(new IconToggleButton(mapModeLassoSelect = new LassoModeAction(), true));
         addMapMode(new IconToggleButton(mapModeDraw = new DrawAction(this)));
         addMapMode(new IconToggleButton(mapModeZoom = new ZoomAction(this)));
         addMapMode(new IconToggleButton(new DeleteAction(this), true));
@@ -361 +362 @@
             return false;
 
         MapMode oldMapMode = this.mapMode;
-        if (newMapMode == oldMapMode)
+        if (newMapMode == oldMapMode) {
+            newMapMode.reenterMode();
             return true;
+        }
         if (oldMapMode != null) {
             oldMapMode.exitMode();
         }

src/org/openstreetmap/josm/actions/LassoModeAction.java

@@ -31 +31 @@
         Main.map.mapModeSelect.exitMode();
         super.exitMode();
     }
+    
+    @Override
+    public void reenterMode() {
+        if (Main.map!=null)  Main.map.selectMapMode(Main.map.mapModeSelect);
+    }
 }

src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -195 +195 @@
         removeHighlighting();
     }
 
+    @Override
+    public void reenterMode() {
+        if (Main.map!=null)  Main.map.selectMapMode(Main.map.mapModeLassoSelect);
+    }
+    
      /**
      * This is called whenever the keyboard modifier status changes
      */

src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -58 +58 @@
         Main.map.mapView.resetCursor(this);
     }
 
+    /**
+     * For optionlal overloading - called when action is repeated while mapmode is already active
+     */
+    public void reenterMode() {
+    }
+
     protected void updateStatusLine() {
         Main.map.statusLine.setHelpText(getModeHelpText());
         Main.map.statusLine.repaint();