Changeset 5735 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

Timestamp:

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

Author:

Don-vip

Message:

fix #8116 (forgot the other cases)

File:

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

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

@@ -12 +12 @@
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
@@ -50 +52 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
@@ -440 +443 @@
             selectPrims(NavigatableComponent.asColl(toSelect), false, false);
             useLastMoveCommandIfPossible();
+            // Schedule a timer to update status line "initialMoveDelay+1" ms in the future
+            GuiHelper.scheduleTimer(initialMoveDelay+1, new ActionListener() {
+                public void actionPerformed(ActionEvent evt) {
+                    updateStatusLine();
+                }
+            }, false);
             break;
         case select:
@@ -853 +862 @@
     @Override
     public String getModeHelpText() {
-        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) {
-            final boolean canMerge = getCurrentDataSet()!=null && !getCurrentDataSet().getSelectedNodes().isEmpty();
-            final String mergeHelp = canMerge ? (" " + tr("Ctrl to merge with nearest node.")) : "";
-            return tr("Release the mouse button to stop moving.") + mergeHelp;
-        } else if (mode == Mode.rotate)
-            return tr("Release the mouse button to stop rotating.");
-        else if (mode == Mode.scale)
-            return tr("Release the mouse button to stop scaling.");
-        else
-            return tr("Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection");
+        if (mouseDownButton == MouseEvent.BUTTON1 && mouseReleaseTime < mouseDownTime) {
+            if (mode == Mode.select)
+                return tr("Release the mouse button to select the objects in the rectangle.");
+            else if (mode == Mode.move && (System.currentTimeMillis() - mouseDownTime >= initialMoveDelay)) {
+                final boolean canMerge = getCurrentDataSet()!=null && !getCurrentDataSet().getSelectedNodes().isEmpty();
+                final String mergeHelp = canMerge ? (" " + tr("Ctrl to merge with nearest node.")) : "";
+                return tr("Release the mouse button to stop moving.") + mergeHelp;
+            } else if (mode == Mode.rotate)
+                return tr("Release the mouse button to stop rotating.");
+            else if (mode == Mode.scale)
+                return tr("Release the mouse button to stop scaling.");
+        }
+        return tr("Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection");
     }