Changeset 5734 in josm for trunk

Timestamp:

2013-02-20T21:00:39+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8116 - Update status line message when mouse button is released in select mode

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (5 diffs)

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

@@ -45 +45 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.SelectionManager;
 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded;
@@ -437 +438 @@
             }
             OsmPrimitive toSelect = cycleManager.cycleSetup(nearestPrimitive, e.getPoint());
-            selectPrims(mv.asColl(toSelect), false, false);
+            selectPrims(NavigatableComponent.asColl(toSelect), false, false);
             useLastMoveCommandIfPossible();
             break;
@@ -573 +574 @@
             if (getCurrentDataSet().getSelected().isEmpty() && !cancelDrawMode) {
                 Main.map.selectDrawTool(true);
+                updateStatusLine();
                 return;
             }
@@ -851 +853 @@
     @Override
     public String getModeHelpText() {
-        if (mode == Mode.select)
+        if (mode == Mode.select && mouseDownButton == MouseEvent.BUTTON1 && mouseReleaseTime < mouseDownTime)
             return tr("Release the mouse button to select the objects in the rectangle.");
         else if (mode == Mode.move) {
@@ -870 +872 @@
     }
 
+    /**
+     * Enable or diable the lasso mode
+     * @param lassoMode true to enable the lasso mode, false otherwise
+     */
     public void setLassoMode(boolean lassoMode) {
         this.selectionManager.setLassoMode(lassoMode);