Changeset 7400 in josm for trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

Timestamp:

2014-08-15T16:13:44+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10316 - use N as a new shortcut for "Move Node onto Way" action

File:

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

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -1 +1 @@
 //License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import org.openstreetmap.josm.Main;
@@ -17 +33 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.util.Comparator;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
+/**
+ * Action allowing to join a node to a nearby way, operating on two modes:<ul>
+ * <li><b>Join Node to Way</b>: Include a node into the nearest way segments. The node does not move</li>
+ * <li><b>Move Node onto Way</b>: Move the node onto the nearest way segments and include it</li>
+ * </ul>
+ */
 public class JoinNodeWayAction extends JosmAction {
 
@@ -44 +50 @@
     /**
      * Constructs a Join Node to Way action.
+     * @return the Join Node to Way action
      */
     public static JoinNodeWayAction createJoinNodeToWayAction() {
@@ -55 +62 @@
     /**
      * Constructs a Move Node onto Way action.
+     * @return the Move Node onto Way action
      */
     public static JoinNodeWayAction createMoveNodeOntoWayAction() {
         JoinNodeWayAction action = new JoinNodeWayAction(true,
                 tr("Move Node onto Way"), "movenodeontoway", tr("Move the node onto the nearest way segments and include it"),
-                Shortcut.registerShortcut("tools:movenodeontoway", tr("Tool: {0}", tr("Move Node onto Way")), KeyEvent.VK_J, Shortcut.NONE), true);
+                Shortcut.registerShortcut("tools:movenodeontoway", tr("Tool: {0}", tr("Move Node onto Way")), KeyEvent.VK_N, Shortcut.DIRECT), true);
         return action;
     }
@@ -159 +167 @@
         private EastNorth refPoint2;
         private final boolean projectToSegment;
-        NodeDistanceToRefNodeComparator(Node referenceNode) {
-            refPoint = referenceNode.getEastNorth();
-            projectToSegment = false;
-        }
         NodeDistanceToRefNodeComparator(Node referenceNode, Node referenceNode2, boolean projectFirst) {
             refPoint = referenceNode.getEastNorth();