Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 4395) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 4396) @@ -12,5 +12,4 @@ import java.awt.Toolkit; import java.awt.event.AWTEventListener; -import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -70,7 +69,6 @@ enum Mode { move, rotate, scale, select } - // contains all possible cases the cursor can be in the SelectAction except the - // the move pointer (latter is a system one and not an image) - private enum SelectActionCursor { + // contains all possible cases the cursor can be in the SelectAction + static private enum SelectActionCursor { rect("normal", "selection"), rect_add("normal", "select_add"), @@ -84,9 +82,15 @@ virtual_node("normal", "addnode"), scale("scale", null), - rotate("rotate", null); + rotate("rotate", null), + merge("crosshair", null), + merge_to_node("crosshair", "joinnode"), + move(Cursor.MOVE_CURSOR); private final Cursor c; private SelectActionCursor(String main, String sub) { c = ImageProvider.getCursor(main, sub); + } + private SelectActionCursor(int systemCursor) { + c = Cursor.getPredefinedCursor(systemCursor); } public Cursor cursor() { @@ -154,10 +158,4 @@ initialMoveThreshold = Main.pref.getInteger("edit.initial-move-threshold", 5); drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true); - // This is required to update the cursors when ctrl/shift/alt is pressed - try { - Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); - } catch (SecurityException ex) { - System.out.println(ex); - } } @@ -169,4 +167,8 @@ mv.setVirtualNodesEnabled( Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0); + // This is required to update the cursors when ctrl/shift/alt is pressed + try { + Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); + } catch (SecurityException ex) {} } @@ -178,4 +180,7 @@ mv.removeMouseMotionListener(this); mv.setVirtualNodesEnabled(false); + try { + Toolkit.getDefaultToolkit().removeAWTEventListener(this); + } catch (SecurityException ex) {} removeHighlighting(); } @@ -196,12 +201,17 @@ break; } - - // nearbyStuff cannot be empty as otherwise we would be in - // Move.select and not Move.move - OsmPrimitive osm = nearbyStuff.iterator().next(); + final Iterator it = nearbyStuff.iterator(); + final OsmPrimitive osm = it.hasNext() ? it.next() : null; + + if(dragInProgress()) { + c = ctrl ? "merge" : "move"; + if(osm != null && osm instanceof Node) { + c += "_to_node"; + } + break; + } c = (osm instanceof Node) ? "node" : c; c = (osm instanceof Way) ? "way" : c; - if(shift) { c += "_add"; @@ -246,4 +256,5 @@ /** * handles adding highlights and updating the cursor for the given mouse event. + * Please note that the highlighting for merging while moving is handled via mouseDragged. * @param MouseEvent which should be used as base for the feedback * @return true if repaint is required @@ -255,4 +266,5 @@ /** * handles adding highlights and updating the cursor for the given mouse event. + * Please note that the highlighting for merging while moving is handled via mouseDragged. * @param MouseEvent which should be used as base for the feedback * @param define custom keyboard modifiers if the ones from MouseEvent are outdated or similar @@ -310,5 +322,7 @@ // We don't have a mouse event, so we pass the old mouse event but the // new modifiers. - giveUserFeedback(oldEvent, ((InputEvent) e).getModifiers()); + if(giveUserFeedback(oldEvent, ((InputEvent) e).getModifiers())) { + mv.repaint(); + } } @@ -338,5 +352,17 @@ if (mode == Mode.move) { - mv.setNewCursor(Cursor.MOVE_CURSOR, this); + // If ctrl is pressed we are in merge mode. Look for a nearby node, + // highlight it and adjust the cursor accordingly. + final OsmPrimitive p = ctrl ? (OsmPrimitive)findNodeToMergeTo(e) : null; + boolean needsRepaint = removeHighlighting(); + if(p != null) { + p.setHighlighted(true); + oldHighlights.add(p); + needsRepaint = true; + } + mv.setNewCursor(getCursor(MapView.asColl(p)), this); + if(needsRepaint) { + mv.repaint(); + } } @@ -463,4 +489,12 @@ mv.repaint(); } + } + + /** returns true whenever elements have been grabbed and moved (i.e. the initial + * thresholds have been exceeded) and is still in progress (i.e. mouse button + * still pressed) + */ + final private boolean dragInProgress() { + return didMouseDrag && startingDraggingPos != null; } @@ -595,5 +629,5 @@ } else if (alt && ctrl) { mode = Mode.scale; - } else if (hasSelectionNearby) { + } else if (hasSelectionNearby || dragInProgress()) { mode = Mode.move; } else { @@ -731,5 +765,5 @@ } } else { - mergePrims(getCurrentDataSet().getSelectedNodes(), e); + mergePrims(e); } getCurrentDataSet().fireSelectionChanged(); @@ -815,20 +849,33 @@ } - private void mergePrims(Collection affectedNodes, MouseEvent e) { - boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; - - if (ctrl && !affectedNodes.isEmpty()) { - Collection target = mv.getNearestNodes(e.getPoint(), affectedNodes, OsmPrimitive.isSelectablePredicate); - if (!target.isEmpty()) { - Collection nodesToMerge = new LinkedList(affectedNodes); - Node t = target.iterator().next(); - nodesToMerge.add(t); - Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodesToMerge, t); - if (cmd != null) { - Main.main.undoRedo.add(cmd); - getCurrentDataSet().setSelected(t); - } - } - } + /** Merges the selected nodes to the one closest to the given mouse position iff the control + * key is pressed. If there is no such node, no action will be done and no error will be + * reported. If there is, it will execute the merge and add it to the undo buffer. */ + final private void mergePrims(MouseEvent e) { + updateKeyModifiers(e); + Collection selNodes = getCurrentDataSet().getSelectedNodes(); + if (!ctrl || selNodes.isEmpty()) + return; + + Node target = findNodeToMergeTo(e); + if (target == null) + return; + + Collection nodesToMerge = new LinkedList(selNodes); + nodesToMerge.add(target); + Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodesToMerge, target); + if (cmd != null) { + Main.main.undoRedo.add(cmd); + getCurrentDataSet().setSelected(target); + } + } + + /** tries to find a node to merge to when in move-merge mode for the current mouse + * position. Either returns the node or null, if no suitable one is nearby. */ + final private Node findNodeToMergeTo(MouseEvent e) { + Collection target = mv.getNearestNodes(e.getPoint(), + getCurrentDataSet().getSelectedNodes(), + OsmPrimitive.isSelectablePredicate); + return target.isEmpty() ? null : target.iterator().next(); }