Ticket #2411: patch_v2_not_cleaned_up.patch

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

@@ -5 +5 @@
 
 import java.awt.AWTEvent;
 import java.awt.Cursor;
-import java.awt.EventQueue;
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
 import java.awt.event.ActionEvent;
@@ -13 +12 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -44 +46 @@
  *
  * @author imi
  */
-
-/**
- * This class contains stubs for highlighting affected primitives when affected.
- * However, way segments can be deleted as well, but cannot be highlighted
- * alone. If the highlight feature for this delete action is to be implemented
- * properly, highlighting way segments must be possible first. --xeen, 2009-09-02
- */
 public class DeleteAction extends MapMode implements AWTEventListener {
     // Cache previous mouse event (needed when only the modifier keys are
     // pressed but the mouse isn't moved)
     private MouseEvent oldEvent = null;
 
+    /**
+     * elements that have been highlighted in the previous iteration. Used
+     * to remove the highlight from them again as otherwise the whole data
+     * set would have to be checked.
+     */
+    private Set<OsmPrimitive> oldHighlights = new HashSet<OsmPrimitive>();
+
+    private boolean drawTargetHighlight;
+
     private enum DeleteMode {
         none("delete"),
         segment("delete_segment"),
@@ -100 +104 @@
         if (!isEnabled())
             return;
 
+        drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
+
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
         // This is required to update the cursors when ctrl/shift/alt is pressed
@@ -119 +125 @@
         } catch (SecurityException ex) {
             System.out.println(ex);
         }
+        removeHighlighting();
     }
 
     @Override public void actionPerformed(ActionEvent e) {
@@ -156 +163 @@
      */
     @Override public void mouseMoved(MouseEvent e) {
         oldEvent = e;
-        updateCursor(e, e.getModifiers());
+        giveUserFeedback(e);
     }
 
     /**
+     * removes any highlighting that may have been set beforehand.
+     */
+    private void removeHighlighting() {
+        for(OsmPrimitive prim : oldHighlights) {
+            prim.setHighlighted(false);
+        }
+        oldHighlights = new HashSet<OsmPrimitive>();
+        DataSet ds = getCurrentDataSet();
+        if(ds != null) {
+            ds.clearHighlightedWaySegments();
+        }
+    }
+
+    /**
+     * handles everything related to highlighting primitives and way
+     * segments for the given pointer position (via MouseEvent) and
+     * modifiers.
+     * @param e
+     * @param modifiers
+     */
+    private void addHighlighting(MouseEvent e, int modifiers) {
+        if(!drawTargetHighlight)
+            return;
+        removeHighlighting();
+
+        Command delCmd = buildDeleteCommands(e, modifiers, true);
+        if(delCmd == null) {
+            Main.map.mapView.repaint();
+            return;
+        }
+
+        DeleteParameters parameters = getDeleteParameters(e, modifiers);
+
+        if(parameters.mode == DeleteMode.segment) {
+            // deleting segments is the only action not working on OsmPrimitives
+            // so we have to handle them separately.
+            DataSet ds = getCurrentDataSet();
+            if(ds != null) {
+                ds.setHighlightedWaySegments(Collections.singleton(parameters.nearestSegment));
+            }
+        } else {
+            // all other cases delete OsmPrimitives directly, so we can
+            // safely do the following
+            for(OsmPrimitive osm : delCmd.getParticipatingPrimitives()) {
+                osm.setHighlighted(true);
+                oldHighlights.add(osm);
+            }
+        }
+        Main.map.mapView.repaint();
+    }
+
+    /**
      * This function handles all work related to updating the cursor and
-     * highlights. For now, only the cursor is enabled because highlighting
-     * requires WaySegment to be highlightable.
+     * highlights
      *
-     * Normally the mouse event also contains the modifiers. However, when the
-     * mouse is not moved and only modifier keys are pressed, no mouse event
-     * occurs. We can use AWTEvent to catch those but still lack a proper
-     * mouseevent. Instead we copy the previous event and only update the
-     * modifiers.
-     *
      * @param MouseEvent
      * @param int modifiers
      */
@@ -182 +234 @@
         DeleteParameters parameters = getDeleteParameters(e, modifiers);
         Main.map.mapView.setNewCursor(parameters.mode.cursor(), this);
     }
+    /**
+     * Gives the user feedback for the action he/she is about to do. Currently
+     * calls the cursor and target highlighting routines. Allows for modifiers
+     * not taken from the given mouse event.
+     * 
+     * Normally the mouse event also contains the modifiers. However, when the
+     * mouse is not moved and only modifier keys are pressed, no mouse event
+     * occurs. We can use AWTEvent to catch those but still lack a proper
+     * mouseevent. Instead we copy the previous event and only update the
+     * modifiers.
+     */
+    private void giveUserFeedback(MouseEvent e, int modifiers) {
+        updateCursor(e, modifiers);
+        addHighlighting(e, modifiers);
+    }
 
     /**
+     * Gives the user feedback for the action he/she is about to do. Currently
+     * calls the cursor and target highlighting routines. Extracts modifiers
+     * from mouse event.
+     */
+    private void giveUserFeedback(MouseEvent e) {
+        giveUserFeedback(e, e.getModifiers());
+    }
+
+    /**
      * If user clicked with the left button, delete the nearest object.
      * position.
      */
@@ -203 +279 @@
         }
 
         getCurrentDataSet().setSelected();
+        giveUserFeedback(e);
         Main.map.mapView.repaint();
     }
 
@@ -241 +318 @@
     }
 
     private DeleteParameters getDeleteParameters(MouseEvent e, int modifiers) {
-        // Note: CTRL is the only modifier that is checked in MouseMove, don't
-        // forget updating it there
-        boolean ctrl = (modifiers & ActionEvent.CTRL_MASK) != 0;
-        boolean shift = (modifiers & ActionEvent.SHIFT_MASK) != 0;
-        boolean alt = (modifiers & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
+        updateKeyModifiers(modifiers);
 
         DeleteParameters result = new DeleteParameters();
 
@@ -287 +360 @@
         case node:
             return DeleteCommand.delete(getEditLayer(),Collections.singleton(parameters.nearestNode), false, silent);
         case node_with_references:
-            return DeleteCommand.deleteWithReferences(getEditLayer(),Collections.singleton(parameters.nearestNode));
+            return DeleteCommand.deleteWithReferences(getEditLayer(),Collections.singleton(parameters.nearestNode), silent);
         case segment:
             return DeleteCommand.deleteWaySegment(getEditLayer(), parameters.nearestSegment);
         case way:
@@ -295 +368 @@
         case way_with_nodes:
             return DeleteCommand.delete(getEditLayer(), Collections.singleton(parameters.nearestSegment.way), true, silent);
         case way_with_references:
-            return DeleteCommand.deleteWithReferences(getEditLayer(),Collections.singleton(parameters.nearestSegment.way),true);
+            return DeleteCommand.deleteWithReferences(getEditLayer(), Collections.singleton(parameters.nearestSegment.way), true);
         default:
             return null;
         }
@@ -305 +378 @@
      * This is required to update the cursors when ctrl/shift/alt is pressed
      */
     public void eventDispatched(AWTEvent e) {
+        if(e == null)
+            return;
         // We don't have a mouse event, so we pass the old mouse event but the
         // new modifiers.
-        updateCursor(oldEvent, ((InputEvent)e).getModifiers());
+        giveUserFeedback(oldEvent, ((InputEvent) e).getModifiers());
     }
 }

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

@@ -3 +3 @@
 
 import java.awt.Cursor;
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -24 +25 @@
  */
 abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener {
     protected final Cursor cursor;
+    protected boolean ctrl;
+    protected boolean alt;
+    protected boolean shift;
 
     /**
      * Constructor for mapmodes without an menu
@@ -76 +80 @@
         return true;
     }
 
+    protected void updateKeyModifiers(InputEvent e) {
+        updateKeyModifiers(e.getModifiers());
+    }
+
+    protected void updateKeyModifiers(MouseEvent e) {
+        updateKeyModifiers(e.getModifiers());
+    }
+
+    protected void updateKeyModifiers(int modifiers) {
+        ctrl = (modifiers & ActionEvent.CTRL_MASK) != 0;
+        alt = (modifiers & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
+        shift = (modifiers & ActionEvent.SHIFT_MASK) != 0;
+    }
+
     public void mouseReleased(MouseEvent e) {}
     public void mouseExited(MouseEvent e) {}
     public void mousePressed(MouseEvent e) {}

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

@@ -5 +5 @@
 
 import java.awt.Cursor;
 import java.awt.Point;
-import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
 
 import org.openstreetmap.josm.Main;
@@ -27 +26 @@
 
     public PlayHeadDragMode(PlayHeadMarker m) {
         super(tr("Drag play head"), "playheaddrag", tr("Drag play head"), null,
-        Main.map, Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+                Main.map, Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
         playHeadMarker = m;
     }
 
@@ -67 +66 @@
         mouseStart = null;
         if (ev.getButton() != MouseEvent.BUTTON1 || p == null || ! dragging)
             return;
-        boolean shift = (ev.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+
+        updateKeyModifiers(ev);
+
         EastNorth en = Main.map.mapView.getEastNorth(ev.getX(), ev.getY());
         if (! shift) {
             playHeadMarker.reposition(en);

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

@@ -8 +8 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Cursor;
-import java.awt.EventQueue;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
-import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -65 +63 @@
     private Node lastUsedNode = null;
     private double PHI=Math.toRadians(90);
 
-    private boolean ctrl;
-    private boolean alt;
-    private boolean shift;
     private Node mouseOnExistingNode;
     private Set<Way> mouseOnExistingWays = new HashSet<Way>();
     private Set<OsmPrimitive> oldHighlights = new HashSet<OsmPrimitive>();
@@ -512 +507 @@
 
         getCurrentDataSet().setSelected(newSelection);
 
-        // "viewport following" mode for tracing long features 
-        // from aerial imagery or GPS tracks. 
+        // "viewport following" mode for tracing long features
+        // from aerial imagery or GPS tracks.
         if (n != null && Main.map.mapView.viewportFollowing) {
             Main.map.mapView.smoothScrollTo(n.getEastNorth());
         };
@@ -601 +596 @@
         redrawIfRequired();
     }
 
-    private void updateKeyModifiers(InputEvent e) {
-        ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-        alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
-        shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
-    }
-
-    private void updateKeyModifiers(MouseEvent e) {
-        ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-        alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
-        shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
-    }
-
     /**
      * This method prepares data required for painting the "helper line" from
      * the last used position to the mouse cursor. It duplicates some code from

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

@@ -13 +13 @@
 import java.awt.Stroke;
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
-import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -108 +107 @@
 
     private final MapView mv;
 
-    private boolean ctrl;
-    private boolean alt;
-    private boolean shift;
-
     // Mouse tracking state
     private Point mousePressedPos;
     private boolean mouseIsDown;
@@ -232 +227 @@
 
     private boolean updateModifiersState(InputEvent e) {
         boolean oldAlt = alt, oldShift = shift, oldCtrl = ctrl;
-        alt = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
-        ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-        shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+        updateKeyModifiers(e);
         boolean changed = (oldAlt != alt || oldShift != shift || oldCtrl != ctrl);
         return changed;
     }
@@ -393 +386 @@
             // event can come quite late
             if (!isModifiersValidForDragMode())
                 return;
-            if (!initParallelWays(mousePressedPos, copyTags)) {
+            if (!initParallelWays(mousePressedPos, copyTags))
                 return;
-            }
             setMode(Mode.dragging);
         }
 
@@ -408 +400 @@
         double d = enp.distance(nearestPointOnRefLine);
         double realD = mv.getProjection().eastNorth2latlon(enp).greatCircleDistance(mv.getProjection().eastNorth2latlon(nearestPointOnRefLine));
         double snappedRealD = realD;
-        
+
         // TODO: abuse of isToTheRightSideOfLine function.
         boolean toTheRight = Geometry.isToTheRightSideOfLine(referenceSegment.getFirstNode(),
                 referenceSegment.getFirstNode(), referenceSegment.getSecondNode(), new Node(enp));
@@ -430 +422 @@
             d = -d;
         }
         pWays.changeOffset(d);
-        
+
         Main.map.statusLine.setDist(Math.abs(snappedRealD));
         Main.map.statusLine.repaint();
         mv.repaint();

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.AWTEvent;
 import java.awt.Cursor;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.event.AWTEventListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
@@ -15 +18 @@
 import java.awt.geom.Point2D;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
 
@@ -59 +64 @@
  *
  * @author imi
  */
-public class SelectAction extends MapMode implements SelectionEnded {
+public class SelectAction extends MapMode implements AWTEventListener, SelectionEnded {
+    // "select" means the selection rectangle and "move" means either dragging
+    // or select if no mouse movement occurs (i.e. just clicking)
     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 {
+        rect("normal", "selection"),
+        rect_add("normal", "select_add"),
+        rect_rm("normal", "select_remove"),
+        way("normal", "select_way"),
+        way_add("normal", "select_way_add"),
+        way_rm("normal", "select_way_remove"),
+        node("normal", "select_node"),
+        node_add("normal", "select_node_add"),
+        node_rm("normal", "select_node_remove"),
+        virtual_node("normal", "addnode"),
+        scale("scale", null),
+        rotate("rotate", null);
+
+        private final Cursor c;
+        private SelectActionCursor(String main, String sub) {
+            c = ImageProvider.getCursor(main, sub);
+        }
+        public Cursor cursor() {
+            return c;
+        }
+    }
+
+    // Cache previous mouse event (needed when only the modifier keys are
+    // pressed but the mouse isn't moved)
+    private MouseEvent oldEvent = null;
+
     private Mode mode = null;
     private SelectionManager selectionManager;
     private boolean cancelDrawMode = false;
+    private boolean drawTargetHighlight;
     private boolean didMouseDrag = false;
     /**
      * The component this SelectAction is associated with.
@@ -95 +132 @@
     private boolean initialMoveThresholdExceeded = false;
 
     /**
+     * elements that have been highlighted in the previous iteration. Used
+     * to remove the highlight from them again as otherwise the whole data
+     * set would have to be checked.
+     */
+    private Set<OsmPrimitive> oldHighlights = new HashSet<OsmPrimitive>();
+
+    /**
      * Create a new SelectAction
      * @param mapFrame The MapFrame this action belongs to.
      */
@@ -108 +152 @@
         selectionManager = new SelectionManager(this, false, mv);
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200);
         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);
+        }
     }
 
     @Override
@@ -126 +177 @@
         mv.removeMouseListener(this);
         mv.removeMouseMotionListener(this);
         mv.setVirtualNodesEnabled(false);
+        removeHighlighting();
     }
 
     /**
+     * works out which cursor should be displayed for most of SelectAction's
+     * features. The only exception is the "move" cursor when actually dragging
+     * primitives.
+     * @param nearbyStuff  primitives near the cursor
+     * @return the cursor that should be displayed
+     */
+    private Cursor getCursor(Collection<OsmPrimitive> nearbyStuff) {
+        String c = "rect";
+        switch(mode) {
+        case move:
+            if(virtualNode != null) {
+                c = "virtual_node";
+                break;
+            }
+
+            // nearbyStuff cannot be empty as otherwise we would be in
+            // Move.select and not Move.move
+            OsmPrimitive osm = nearbyStuff.iterator().next();
+
+            c = (osm instanceof Node) ? "node" : c;
+            c = (osm instanceof Way) ? "way" : c;
+
+            if(shift) {
+                c += "_add";
+            } else if(ctrl) {
+                c += osm.isSelected() ? "_rm" : "_add";
+            }
+            break;
+        case rotate:
+            c = "rotate";
+            break;
+        case scale:
+            c = "scale";
+            break;
+        case select:
+            c = "rect" + (shift ? "_add" : (ctrl ? "_rm" : ""));
+            break;
+        }
+        return SelectActionCursor.valueOf(c).cursor();
+    }
+
+    /**
+     * Removes all existing highlights.
+     * @return true if a repaint is required
+     */
+    private boolean removeHighlighting() {
+        boolean needsRepaint = false;
+        DataSet ds = getCurrentDataSet();
+        if(ds != null && !ds.getHighlightedVirtualNodes().isEmpty()) {
+            needsRepaint = true;
+            ds.clearHighlightedVirtualNodes();
+        }
+        if(oldHighlights.isEmpty())
+            return needsRepaint;
+
+        for(OsmPrimitive prim : oldHighlights) {
+            prim.setHighlighted(false);
+        }
+        oldHighlights = new HashSet<OsmPrimitive>();
+        return true;
+    }
+
+    /**
+     * handles adding highlights and updating the cursor for the given mouse event.
+     * @param MouseEvent which should be used as base for the feedback
+     * @return true if repaint is required
+     */
+    private boolean giveUserFeedback(MouseEvent e) {
+        return giveUserFeedback(e, e.getModifiers());
+    }
+
+    /**
+     * handles adding highlights and updating the cursor for the given mouse event.
+     * @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
+     * @return true if repaint is required
+     */
+    private boolean giveUserFeedback(MouseEvent e, int modifiers) {
+        boolean needsRepaints = false;
+
+        Collection<OsmPrimitive> c = MapView.asColl(
+                mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true));
+
+        updateKeyModifiers(modifiers);
+        determineMapMode(!c.isEmpty());
+
+        if(drawTargetHighlight) {
+            needsRepaints = removeHighlighting();
+        }
+
+        virtualWays.clear();
+        virtualNode = null;
+        if(mode == Mode.move && setupVirtual(e)) {
+            DataSet ds = getCurrentDataSet();
+            if (ds != null) {
+                ds.setHighlightedVirtualNodes(virtualWays);
+            }
+            mv.setNewCursor(SelectActionCursor.virtual_node.cursor(), this);
+            // don't highlight anything else if a virtual node will be
+            return true;
+        }
+
+        mv.setNewCursor(getCursor(c), this);
+
+        // return early if there can't be any highlights
+        if(!drawTargetHighlight || mode != Mode.move || c.isEmpty())
+            return needsRepaints;
+
+        oldHighlights = (Set<OsmPrimitive>) c;
+        for(OsmPrimitive x : c) {
+            // only highlight primitives that will change the selection
+            // when clicked. I.e. don't highlight selected elements unless
+            // we are in toggle mode.
+            if(ctrl || !x.isSelected()) {
+                x.setHighlighted(true);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * This is called whenever the keyboard modifier status changes
+     */
+    public void eventDispatched(AWTEvent e) {
+        if(e == null)
+            return;
+        // We don't have a mouse event, so we pass the old mouse event but the
+        // new modifiers.
+        giveUserFeedback(oldEvent, ((InputEvent) e).getModifiers());
+    }
+
+    /**
      * If the left mouse button is pressed, move all currently selected
      * objects (if one of them is under the mouse) or the current one under the
      * mouse (which will become selected).
@@ -210 +394 @@
                 return;
 
             Command c = !Main.main.undoRedo.commands.isEmpty()
-                    ? Main.main.undoRedo.commands.getLast() : null;
+            ? Main.main.undoRedo.commands.getLast() : null;
             if (c instanceof SequenceCommand) {
                 c = ((SequenceCommand) c).getLastCommand();
             }
@@ -263 +447 @@
     @Override
     public void mouseMoved(MouseEvent e) {
         // Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.
-        //
         if ((Main.platform instanceof PlatformHookOsx) && (mode == Mode.rotate || mode == Mode.scale)) {
             mouseDragged(e);
+            return;
         }
+        oldEvent = e;
+        if(giveUserFeedback(e)) {
+            mv.repaint();
+        }
     }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+        if(removeHighlighting()) {
+            mv.repaint();
+        }
+    }
+
     private Node virtualNode = null;
     private Collection<WaySegment> virtualWays = new LinkedList<WaySegment>();
 
@@ -338 +534 @@
 
             Point p = e.getPoint();
             boolean waitForMouseUp = Main.pref.getBoolean("mappaint.select.waits-for-mouse-up", false);
-            boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-            boolean alt = ((e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0 || Main.pref.getBoolean("selectaction.cycles.multiple.matches", false));
+            updateKeyModifiers(e);
+            alt = alt || Main.pref.getBoolean("selectaction.cycles.multiple.matches", false);
 
             if (!alt) {
                 cycleList = MapView.asColl(osm);
@@ -388 +584 @@
     }
 
     /**
+     * sets the mapmode according to key modifiers and if there are any
+     * selectables nearby. Everything has to be pre-determined for this
+     * function; its main purpose is to centralize what the modifiers do.
+     * @param nearSelectables
+     */
+    private void determineMapMode(boolean hasSelectionNearby) {
+        if (shift && ctrl) {
+            mode = Mode.rotate;
+        } else if (alt && ctrl) {
+            mode = Mode.scale;
+        } else if (hasSelectionNearby) {
+            mode = Mode.move;
+        } else {
+            mode = Mode.select;
+        }
+    }
+
+    /**
      * Look, whether any object is selected. If not, select the nearest node.
      * If there are no nodes in the dataset, do nothing.
      *
@@ -399 +613 @@
     @Override
     public void mousePressed(MouseEvent e) {
         // return early
-        if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || e.getButton() != MouseEvent.BUTTON1) {
+        if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || e.getButton() != MouseEvent.BUTTON1)
             return;
-        }
 
         // request focus in order to enable the expected keyboard shortcuts
         mv.requestFocus();
 
-        boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-        boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
-        boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
+        // update which modifiers are pressed (shift, alt, ctrl)
+        updateKeyModifiers(e);
 
         // We don't want to change to draw tool if the user tries to (de)select
         // stuff but accidentally clicks in an empty area when selection is empty
@@ -421 +633 @@
         Collection<OsmPrimitive> c = MapView.asColl(
                 mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true));
 
-        if (shift && ctrl) {
-            mode = Mode.rotate;
-
+        determineMapMode(!c.isEmpty());
+        switch(mode) {
+        case rotate:
+        case scale:
             if (getCurrentDataSet().getSelected().isEmpty()) {
                 getCurrentDataSet().setSelected(c);
             }
@@ -431 +644 @@
             // Mode.select redraws when selectPrims is called
             // Mode.move   redraws when mouseDragged is called
             // Mode.rotate redraws here
-            mv.setNewCursor(ImageProvider.getCursor("rotate", null), this);
-            mv.repaint();
-        } else if (alt && ctrl) {
-            mode = Mode.scale;
-
-            if (getCurrentDataSet().getSelected().isEmpty()) {
-                getCurrentDataSet().setSelected(c);
-            }
-
-            // Mode.select redraws when selectPrims is called
-            // Mode.move   redraws when mouseDragged is called
             // Mode.scale redraws here
-            mv.setNewCursor(ImageProvider.getCursor("scale", null), this);
-            mv.repaint();
-        } else if (!c.isEmpty()) {
-            mode = Mode.move;
-
+            break;
+        case move:
             if (!cancelDrawMode && c.iterator().next() instanceof Way) {
                 setupVirtual(e);
             }
 
             selectPrims(cycleSetup(c, e), e, false, false);
-        } else {
-            mode = Mode.select;
-
+            break;
+        case select:
+        default:
             selectionManager.register(mv);
             selectionManager.mousePressed(e);
+            break;
         }
-
+        // this doesn't require repainting since the mouse was only pressed
+        // but not moved, therefore the highlighted elements will still be
+        // the same
+        giveUserFeedback(e);
+        mv.repaint();
         updateStatusLine();
     }
 
     @Override
     public void mouseReleased(MouseEvent e) {
-        if (!mv.isActiveLayerVisible()) {
+        if (!mv.isActiveLayerVisible())
             return;
-        }
 
         startingDraggingPos = null;
 
-        mv.setNewCursor(cursor, this);
         if (mode == Mode.select) {
             selectionManager.unregister(mv);
 
@@ -488 +690 @@
                 virtualWays.clear();
                 virtualNode = null;
 
-                // do nothing if the click was to short to be recognized as a drag,
+                // do nothing if the click was to short too be recognized as a drag,
                 // but the release position is farther than 10px away from the press position
                 if (lastMousePos.distanceSq(e.getPoint()) < 100) {
                     selectPrims(cyclePrims(cycleList, e), e, true, false);
@@ -499 +701 @@
                         // We need to do it like this as otherwise drawAction will see a double
                         // click and switch back to SelectMode
                         Main.worker.execute(new Runnable() {
-
                             public void run() {
                                 Main.map.selectDrawTool(true);
                             }
@@ -538 +739 @@
             }
         }
 
-        // I don't see why we need this.
-        //updateStatusLine();
         mode = null;
+        giveUserFeedback(e);
         updateStatusLine();
     }
 
     public void selectionEnded(Rectangle r, MouseEvent e) {
-        boolean alt = (e.getModifiersEx() & (MouseEvent.ALT_DOWN_MASK | MouseEvent.ALT_GRAPH_DOWN_MASK)) != 0;
+        updateKeyModifiers(e);
         selectPrims(selectionManager.getObjectsInRectangle(r, alt), e, true, true);
     }
 
@@ -553 +753 @@
      * Modifies current selection state and returns the next element in a
      * selection cycle given by <code>prims</code>.
      * @param prims the primitives that form the selection cycle
-     * @param shift whether shift is pressed
-     * @param ctrl whether ctrl is pressed
+     * @param mouse event
      * @return the next element of cycle list <code>prims</code>.
      */
     private Collection<OsmPrimitive> cyclePrims(Collection<OsmPrimitive> prims, MouseEvent e) {
         OsmPrimitive nxt = null;
 
         if (prims.size() > 1) {
-            boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-            boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+            updateKeyModifiers(e);
 
             DataSet ds = getCurrentDataSet();
             OsmPrimitive first = prims.iterator().next(), foundInDS = null;
@@ -629 +827 @@
     }
 
     private void selectPrims(Collection<OsmPrimitive> prims, MouseEvent e, boolean released, boolean area) {
-        boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-        boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+        updateKeyModifiers(e);
         DataSet ds = getCurrentDataSet();
 
         // not allowed together: do not change dataset selection, return early
-        if ((shift && ctrl) || (ctrl && !released) || (!virtualWays.isEmpty())) {
+        if ((shift && ctrl) || (ctrl && !released) || (!virtualWays.isEmpty()))
             return;
-        }
 
         if (!released) {
             // Don't replace the selection if the user clicked on a
@@ -665 +861 @@
 
     @Override
     public String getModeHelpText() {
-        if (mode == Mode.select) {
+        if (mode == Mode.select)
             return tr("Release the mouse button to select the objects in the rectangle.");
-        } else if (mode == Mode.move) {
+        else if (mode == Mode.move)
             return tr("Release the mouse button to stop moving. Ctrl to merge with nearest node.");
-        } else if (mode == Mode.rotate) {
+        else if (mode == Mode.rotate)
             return tr("Release the mouse button to stop rotating.");
-        } else if (mode == Mode.scale) {
+        else if (mode == Mode.scale)
             return tr("Release the mouse button to stop scaling.");
-        } else {
+        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");
-        }
     }
 
     @Override

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

@@ -184 +184 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
 
+        updateKeyModifiers(e);
+
         selectedSegment = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive.isSelectablePredicate);
 
         if (selectedSegment == null) {
@@ -191 +193 @@
         } else {
             // Otherwise switch to another mode
 
-            if ((e.getModifiers() & ActionEvent.CTRL_MASK) != 0) {
+            if (ctrl) {
                 mode = Mode.translate;
-            } else if ((e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0) {
+            } else if (alt) {
                 mode = Mode.create_new;
                 // create a new segment and then select and extrude the new segment
                 getCurrentDataSet().setSelected(selectedSegment.way);
@@ -201 +203 @@
             } else {
                 mode = Mode.extrude;
                 getCurrentDataSet().setSelected(selectedSegment.way);
-                alwaysCreateNodes = ((e.getModifiers() & ActionEvent.SHIFT_MASK) != 0);
+                alwaysCreateNodes = shift;
             }
 
             // remember initial positions for segment nodes.

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

@@ -66 +66 @@
      */
     private Component renderer(Component def, OsmPrimitive value) {
         if (def != null && value != null && def instanceof JLabel) {
+            System.out.println();
+            System.out.println(value);
+            System.out.println(getComponentText(value));
             ((JLabel)def).setText(getComponentText(value));
             ((JLabel)def).setIcon(ImageProvider.get(value.getDisplayType()));
             ((JLabel)def).setToolTipText(getComponentToolTipText(value));

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

@@ -56 +56 @@
         }
         return instance;
     }
-    
+
     /**
      * Registers a format hook. Adds the hook at the first position of the format hooks.
      * (for plugins)
@@ -165 +165 @@
             if (name == null) {
                 name = node.isNew() ? tr("node") : ""+ node.getId();
             }
-            name += " (" + node.getCoor().latToString(CoordinateFormat.getDefaultFormat()) + ", " + node.getCoor().lonToString(CoordinateFormat.getDefaultFormat()) + ")";
+            name += " \u200E(" + node.getCoor().latToString(CoordinateFormat.getDefaultFormat()) + ", " + node.getCoor().lonToString(CoordinateFormat.getDefaultFormat()) + ")";
         }
         name = decorateNameWithId(name, node);
 
@@ -252 +252 @@
             name += (name.length() > 0) ? " ("+nodes+")" : nodes;
         }
         name = decorateNameWithId(name, way);
-        
+
         for (NameFormatterHook hook: formatHooks) {
             String hookResult = hook.checkFormat(way, name);
-            if (hookResult != null) {
+            if (hookResult != null)
                 return hookResult;
-            }
         }
 
         return name;
@@ -310 +309 @@
 
         for (NameFormatterHook hook: formatHooks) {
             String hookResult = hook.checkFormat(relation, name);
-            if (hookResult != null) {
+            if (hookResult != null)
                 return hookResult;
-            }
         }
 
         return name;
@@ -407 +405 @@
         if (admin_level != null) {
             name += "["+admin_level+"]";
         }
-        
+
         for (NameFormatterHook hook: formatHooks) {
             String hookResult = hook.checkRelationTypeName(relation, name);
-            if (hookResult != null) {
+            if (hookResult != null)
                 return hookResult;
-            }
         }
 
         return name;

src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -29 +29 @@
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import javax.swing.AbstractAction;
@@ -466 +468 @@
                                 }
                                 if (oldWp != null && trkPnt.time > oldWp.time) {
                                     double vel = c.greatCircleDistance(oldWp.getCoor())
-                                            / (trkPnt.time - oldWp.time);
+                                    / (trkPnt.time - oldWp.time);
                                     if(vel > maxval) {
                                         maxval = vel;
                                     }
@@ -657 +659 @@
                     // skip points that are on the same screenposition
                     if (old != null
                             && (oldA == null || screen.x < oldA.x - delta || screen.x > oldA.x + delta
-                            || screen.y < oldA.y - delta || screen.y > oldA.y + delta)) {
+                                    || screen.y < oldA.y - delta || screen.y > oldA.y + delta)) {
                         g.setColor(trkPnt.customColoring);
                         double t = Math.atan2(screen.y - old.y, screen.x - old.x) + Math.PI;
                         g.drawLine(screen.x, screen.y, (int) (screen.x + 10 * Math.cos(t - PHI)),
@@ -687 +689 @@
                     // skip points that are on the same screenposition
                     if (old != null
                             && (oldA == null || screen.x < oldA.x - delta || screen.x > oldA.x + delta
-                            || screen.y < oldA.y - delta || screen.y > oldA.y + delta)) {
+                                    || screen.y < oldA.y - delta || screen.y > oldA.y + delta)) {
                         g.setColor(trkPnt.customColoring);
                         g.drawLine(screen.x, screen.y, screen.x + dir[trkPnt.dir][0], screen.y
                                 + dir[trkPnt.dir][1]);
@@ -857 +859 @@
 
             msg.add(new JLabel(tr("Download near:")), GBC.eol());
             JList downloadNear = new JList(new String[] { tr("track only"), tr("waypoints only"), tr("track and waypoints") });
-            int NEAR_TRACK=0;
-            int NEAR_WAYPOINTS=1;
-            int NEAR_BOTH=2;
+            final int NEAR_TRACK=0;
+            final int NEAR_WAYPOINTS=1;
+            final int NEAR_BOTH=2;
 
             downloadNear.setSelectedIndex(Main.pref.getInteger(PREF_DOWNLOAD_ALONG_TRACK_NEAR, 0));
             msg.add(downloadNear, GBC.eol());
@@ -870 +872 @@
                     tr("Download from OSM along this track"),
                     JOptionPane.OK_CANCEL_OPTION,
                     JOptionPane.QUESTION_MESSAGE
-                    );
+            );
             switch(ret) {
             case JOptionPane.CANCEL_OPTION:
             case JOptionPane.CLOSED_OPTION:
@@ -881 +883 @@
 
             Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_DISTANCE, buffer.getSelectedIndex());
             Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_AREA, maxRect.getSelectedIndex());
-            int near = downloadNear.getSelectedIndex();
+            final int near = downloadNear.getSelectedIndex();
             Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_NEAR, near);
 
             /*
@@ -890 +892 @@
              */
             double latsum = 0;
             int latcnt = 0;
+            // one "tick" takes about 1 ms to compute later on, so use this to guess if a
+            // please wait dialog should be shown.
+            int ticks = 0;
 
             if (near == NEAR_TRACK || near == NEAR_BOTH) {
                 for (GpxTrack trk : data.tracks) {
                     for (GpxTrackSegment segment : trk.getSegments()) {
                         for (WayPoint p : segment.getWayPoints()) {
+                            ticks++;
                             latsum += p.getCoor().lat();
                             latcnt++;
                         }
@@ -912 +918 @@
             double avglat = latsum / latcnt;
             double scale = Math.cos(Math.toRadians(avglat));
 
+
+
+            Integer i = buffer.getSelectedIndex();
+            final int buffer_dist = dist[i < 0 ? 0 : i];
+            i = maxRect.getSelectedIndex();
+            double max_area = area[i < 0 ? 0 : i] / 10000.0 / scale;
+            final double buffer_y = buffer_dist / 100000.0;
+            final double buffer_x = buffer_y / scale;
+
             /*
              * Compute buffer zone extents and maximum bounding box size. Note that the maximum we
              * ever offer is a bbox area of 0.002, while the API theoretically supports 0.25, but as
              * soon as you touch any built-up area, that kind of bounding box will download forever
              * and then stop because it has more than 50k nodes.
              */
-            Integer i = buffer.getSelectedIndex();
-            int buffer_dist = dist[i < 0 ? 0 : i];
-            double buffer_y = buffer_dist / 100000.0;
-            double buffer_x = buffer_y / scale;
-            i = maxRect.getSelectedIndex();
-            double max_area = area[i < 0 ? 0 : i] / 10000.0 / scale;
-            Area a = new Area();
-            Rectangle2D r = new Rectangle2D.Double();
+            Callable<Area> calc =  new Callable<Area>() {
+                public Area call() {
+                    try {
+                        Thread.sleep(2000);
+                    } catch (InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    Area a = new Area();
+                    Rectangle2D r = new Rectangle2D.Double();
 
-            /*
-             * Collect the combined area of all gpx points plus buffer zones around them. We ignore
-             * points that lie closer to the previous point than the given buffer size because
-             * otherwise this operation takes ages.
-             */
-            LatLon previous = null;
-            if (near == NEAR_TRACK || near == NEAR_BOTH) {
-                for (GpxTrack trk : data.tracks) {
-                    for (GpxTrackSegment segment : trk.getSegments()) {
-                        for (WayPoint p : segment.getWayPoints()) {
+                    /*
+                     * Collect the combined area of all gpx points plus buffer zones around them. We ignore
+                     * points that lie closer to the previous point than the given buffer size because
+                     * otherwise this operation takes ages.
+                     */
+                    LatLon previous = null;
+                    if (near == NEAR_TRACK || near == NEAR_BOTH) {
+                        for (GpxTrack trk : data.tracks) {
+                            for (GpxTrackSegment segment : trk.getSegments()) {
+                                for (WayPoint p : segment.getWayPoints()) {
+                                    LatLon c = p.getCoor();
+                                    if (previous == null || c.greatCircleDistance(previous) > buffer_dist) {
+                                        // we add a buffer around the point.
+                                        r.setRect(c.lon() - buffer_x, c.lat() - buffer_y, 2 * buffer_x, 2 * buffer_y);
+                                        a.add(new Area(r));
+                                        previous = c;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (near == NEAR_WAYPOINTS || near == NEAR_BOTH) {
+                        for (WayPoint p : data.waypoints) {
                             LatLon c = p.getCoor();
                             if (previous == null || c.greatCircleDistance(previous) > buffer_dist) {
                                 // we add a buffer around the point.
@@ -946 +976 @@
                             }
                         }
                     }
+                    return a;
                 }
+            };
+
+            Area a;
+            final PleaseWaitProgressMonitor monitor1 = new PleaseWaitProgressMonitor(tr("Calculating download areas"));
+            try {
+                monitor1.beginTask("I have no idea", ticks);
+                a = Main.worker.submit(calc).get();
+            } catch (InterruptedException e1) {
+                e1.printStackTrace();
+                return;
+            } catch (ExecutionException e1) {
+                e1.printStackTrace();
+                return;
+            } finally {
+                //monitor1.close();
             }
-            if (near == NEAR_WAYPOINTS || near == NEAR_BOTH) {
-                for (WayPoint p : data.waypoints) {
-                    LatLon c = p.getCoor();
-                    if (previous == null || c.greatCircleDistance(previous) > buffer_dist) {
-                        // we add a buffer around the point.
-                        r.setRect(c.lon() - buffer_x, c.lat() - buffer_y, 2 * buffer_x, 2 * buffer_y);
-                        a.add(new Area(r));
-                        previous = c;
-                    }
-                }
-            }
 
             /*
              * Area "a" now contains the hull that we would like to download data for. however we
@@ -993 +1028 @@
                         tr("Download from OSM along this track"),
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.PLAIN_MESSAGE
-                        );
+                );
                 switch(ret) {
                 case JOptionPane.CANCEL_OPTION:
                 case JOptionPane.CLOSED_OPTION:
@@ -1002 +1037 @@
                     // continue
                 }
             }
-            final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
-            final Future<?> future = new DownloadOsmTaskList().download(false, toDownload, monitor);
+            final PleaseWaitProgressMonitor monitor2 = new PleaseWaitProgressMonitor(tr("Download data"));
+            final Future<?> future = new DownloadOsmTaskList().download(false, toDownload, monitor2);
             Main.worker.submit(
                     new Runnable() {
                         @Override
@@ -1014 +1049 @@
                                 e.printStackTrace();
                                 return;
                             }
-                            monitor.close();
+                            monitor2.close();
                         }
                     }
-                    );
+            );
         }
     }
 
@@ -1100 +1135 @@
                     tr("No GPX track available in layer to associate audio with."),
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE
-                    );
+            );
             return;
         }
 
@@ -1159 +1194 @@
             double duration = AudioUtil.getCalibratedDuration(wavFile);
             double startTime = lastModified - duration;
             startTime = firstStartTime + (startTime - firstStartTime)
-                    / Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */);
+            / Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */);
             WayPoint w1 = null;
             WayPoint w2 = null;
 
@@ -1481 +1516 @@
             String msg = tr("<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>"
                     + "Because its way points do not include a timestamp we cannot correlate them with audio data.</html>",
                     layer.getName()
-                    );
+            );
             HelpAwareOptionPane.showOptionDialog(
                     Main.parent,
                     msg,
                     tr("Import not possible"),
                     JOptionPane.WARNING_MESSAGE,
                     ht("/Action/ImportAudio#CantImportIntoGpxLayerFromServer")
-                    );
+            );
         }
 
         @Override
@@ -1547 +1582 @@
                 MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", getName()) + names,
                         getAssociatedFile(), GpxLayer.this);
                 double firstStartTime = sel[0].lastModified() / 1000.0 /* ms -> seconds */
-                        - AudioUtil.getCalibratedDuration(sel[0]);
+                - AudioUtil.getCalibratedDuration(sel[0]);
 
                 Markers m = new Markers();
                 for (int i = 0; i < sel.length; i++) {
@@ -1571 +1606 @@
             String msg = tr("<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>"
                     + "Because its way points do not include a timestamp we cannot correlate them with images.</html>",
                     layer.getName()
-                    );
+            );
             HelpAwareOptionPane.showOptionDialog(
                     Main.parent,
                     msg,
                     tr("Import not possible"),
                     JOptionPane.WARNING_MESSAGE,
                     ht("/Action/ImportImages#CantImportIntoGpxLayerFromServer")
-                    );
+            );
         }
 
         private void addRecursiveFiles(LinkedList<File> files, File[] sel) {

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -18 +18 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -58 +57 @@
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
-import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
@@ -66 +64 @@
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -622 +621 @@
             double dist = -1;
             if(this.selection.size() == 1) {
                 OsmPrimitive o = this.selection.get(0);
-                if(o instanceof Way)
-                   dist = ((Way)o).getLength();
+                if(o instanceof Way) {
+                    dist = ((Way)o).getLength();
+                }
             }
             Main.map.statusLine.setDist(dist);
         }

src/org/openstreetmap/josm/data/osm/WaySegment.java

@@ -29 +29 @@
         return way.getNode(lowerIndex + 1);
     }
 
+    /**
+     * returns this way segment as complete way.
+     * @return
+     */
+    public Way toWay() {
+        Way w = new Way();
+        w.addNode(getFirstNode());
+        w.addNode(getSecondNode());
+        return w;
+    }
+
     @Override public boolean equals(Object o) {
         return o != null && o instanceof WaySegment
             && ((WaySegment) o).way == way

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -114 +114 @@
     private Map<PrimitiveId, OsmPrimitive> primitivesMap = allPrimitives.foreignKey(new IdHash());
     private CopyOnWriteArrayList<DataSetListener> listeners = new CopyOnWriteArrayList<DataSetListener>();
 
+    // provide means to highlight map elements that are not osm primitives
+    private Collection<WaySegment> highlightedVirtualNodes = new LinkedList<WaySegment>();
+    private Collection<WaySegment> highlightedWaySegments = new LinkedList<WaySegment>();
+
     // Number of open calls to beginUpdate
     private int updateCount;
     // Events that occurred while dataset was locked but should be fired after write lock is released
@@ -430 +434 @@
     }
 
     /**
+     * returns an unmodifiable collection of *WaySegments* whose virtual
+     * nodes should be highlighted. WaySegements are used to avoid having
+     * to create a VirtualNode class that wouldn't have much purpose otherwise.
+     * 
+     * @return unmodifiable collection of WaySegements
+     */
+    public Collection<WaySegment> getHighlightedVirtualNodes() {
+        return Collections.unmodifiableCollection(highlightedVirtualNodes);
+    }
+
+    /**
+     * returns an unmodifiable collection of WaySegments that should be
+     * highlighted.
+     * 
+     * @return unmodifiable collection of WaySegements
+     */
+    public Collection<WaySegment> getHighlightedWaySegments() {
+        return Collections.unmodifiableCollection(highlightedWaySegments);
+    }
+
+    /**
      * Replies an unmodifiable collection of primitives currently selected
      * in this dataset. May be empty, but not null.
      *
@@ -507 +532 @@
     }
 
     /**
+     * set what virtual nodes should be highlighted. Requires a Collection of
+     * *WaySegements* to avoid a VirtualNode class that wouldn't have much use
+     * otherwise.
+     * @param Collection of waySegments
+     */
+    public void setHighlightedVirtualNodes(Collection<WaySegment> waySegments) {
+        if(highlightedVirtualNodes.isEmpty() && waySegments.isEmpty())
+            return;
+
+        highlightedVirtualNodes = waySegments;
+        // can't use fireHighlightingChanged because it requires an OsmPrimitive
+        highlightUpdateCount++;
+    }
+
+    /**
+     * set what virtual ways should be highlighted.
+     * @param Collection of waySegments
+     */
+    public void setHighlightedWaySegments(Collection<WaySegment> waySegments) {
+        if(highlightedWaySegments.isEmpty() && waySegments.isEmpty())
+            return;
+
+        highlightedWaySegments = waySegments;
+        // can't use fireHighlightingChanged because it requires an OsmPrimitive
+        highlightUpdateCount++;
+    }
+
+    /**
      * Sets the current selection to the primitives in <code>selection</code>.
      * Notifies all {@see SelectionChangedListener} if <code>fireSelectionChangeEvent</code> is true.
      *
@@ -592 +645 @@
     }
 
     /**
+     * clear all highlights of virtual nodes
+     */
+    public void clearHighlightedVirtualNodes() {
+        setHighlightedVirtualNodes(new ArrayList<WaySegment>());
+    }
+
+    /**
+     * clear all highlights of way segments
+     */
+    public void clearHighlightedWaySegments() {
+        setHighlightedWaySegments(new ArrayList<WaySegment>());
+    }
+
+    /**
      * Remove the selection from every value in the collection.
      * @param list The collection to remove the selection from.
      */

src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -20 +20 @@
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
@@ -34 +35 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -41 +43 @@
 import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.HorizontalTextAlignment;
 import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.VerticalTextAlignment;
 import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
+import org.openstreetmap.josm.gui.mappaint.TextElement;
 import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.Symbol;
-import org.openstreetmap.josm.gui.mappaint.TextElement;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -52 +54 @@
     private final NavigatableComponent nc;
     private final boolean inactive;
     private final MapPaintSettings settings;
+    private final Collection<WaySegment> highlightWaySegments;
 
     private final boolean useStrokes;
     private final boolean showNames;
@@ -63 +66 @@
     private final Color selectedColor;
     private final Color relationSelectedColor;
     private final Color nodeColor;
+    private final Color highlightColor;
     private final Color backgroundColor;
 
     private final Font orderFont;
@@ -80 +84 @@
 
     public MapPainter(MapPaintSettings settings, Graphics2D g,
             boolean inactive, NavigatableComponent nc, boolean virtual,
-            double circum, boolean leftHandTraffic){
+            double circum, boolean leftHandTraffic,
+            Collection<WaySegment> highlightWaySegments){
         this.settings = settings;
         this.g = g;
         this.inactive = inactive;
         this.nc = nc;
+        this.highlightWaySegments = highlightWaySegments;
         this.useStrokes = settings.getUseStrokesDistance() > circum;
         this.showNames = settings.getShowNamesDistance() > circum;
         this.showIcons = settings.getShowIconsDistance() > circum;
@@ -95 +101 @@
         this.selectedColor = PaintColors.SELECTED.get();
         this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
         this.nodeColor = PaintColors.NODE.get();
+        this.highlightColor = PaintColors.HIGHLIGHT.get();
         this.backgroundColor = PaintColors.getBackgroundColor();
 
         this.orderFont = new Font(Main.pref.get("mappaint.font", "Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
@@ -130 +137 @@
         boolean initialMoveToNeeded = true;
         List<Node> wayNodes = way.getNodes();
         if (wayNodes.size() < 2) return;
-        
-        Iterator<Point> it = new OffsetIterator(way.getNodes(), offset);
+
+        Collection<Integer> segmentsToHighlight = new ArrayList<Integer>();
+        // only highlight the segment if the way itself is not highlighted
+        if(!way.isHighlighted()) {
+            for(WaySegment ws : highlightWaySegments) {
+                if(ws.way != way || ws.lowerIndex < offset) {
+                    continue;
+                }
+                segmentsToHighlight.add(ws.lowerIndex+1);
+            }
+        }
+        GeneralPath highlightSegs = segmentsToHighlight.isEmpty() ? null : new GeneralPath();
+
+        Iterator<Point> it = new OffsetIterator(wayNodes, offset);
         while (it.hasNext()) {
             Point p = it.next();
             if (lastPoint != null) {
@@ -153 +172 @@
                         path.moveTo(p1.x, p1.y);
                     }
                     p2 = clip.getP2();
-                    path.lineTo(p2.x, p2.y);
+                    if(segmentsToHighlight.contains(offset)) {
+                        path.moveTo(p2.x, p2.y);
+                        // it is assumed that highlighted segments are not
+                        // next to each other.
+                        highlightSegs.moveTo(p1.x, p1.y);
+                        highlightSegs.lineTo(p2.x, p2.y);
+                    } else {
+                        path.lineTo(p2.x, p2.y);
+                    }
 
                     /* draw arrow */
                     if (showHeadArrowOnly ? !it.hasNext() : showOrientation) {
@@ -207 +234 @@
                 }
             }
             lastPoint = p;
+            // have the offset variable point to the current segment
+            offset++;
         }
-        displaySegments(path, orientationArrows, onewayArrows, onewayArrowsCasing, color, line, dashes, dashedColor);
+        displaySegments(path, orientationArrows, onewayArrows, onewayArrowsCasing, highlightSegs, color, line, dashes, dashedColor);
     }
 
     /**
@@ -220 +249 @@
      * perfect way, but it is should not throw an exception.
      */
     public class OffsetIterator implements Iterator<Point> {
-        
+
         private List<Node> nodes;
         private int offset;
         private int idx;
-        
+
         private Point prev = null;
         /* 'prev0' is a point that has distance 'offset' from 'prev' and the
          * line from 'prev' to 'prev0' is perpendicular to the way segment from
@@ -237 +266 @@
             this.offset = offset;
             idx = 0;
         }
-        
+
         @Override
         public boolean hasNext() {
             return idx < nodes.size();
@@ -246 +275 @@
         @Override
         public Point next() {
             if (offset == 0) return nc.getPoint(nodes.get(idx++));
-            
+
             Point current = nc.getPoint(nodes.get(idx));
-            
+
             if (idx == nodes.size() - 1) {
                 ++idx;
                 return new Point(x_prev0 + current.x - prev.x, y_prev0 + current.y - prev.y);
@@ -276 +305 @@
             } else {
                 int dx_prev = current.x - prev.x;
                 int dy_prev = current.y - prev.y;
-                
+
                 // determine intersection of the lines parallel to the two
                 // segments
                 int det = dx_next*dy_prev - dx_prev*dy_next;
-                
+
                 if (det == 0) {
                     ++idx;
                     prev = current;
@@ -306 +335 @@
             throw new UnsupportedOperationException();
         }
     }
-    
-    private void displaySegments(GeneralPath path, GeneralPath orientationArrows, GeneralPath onewayArrows, GeneralPath onewayArrowsCasing,
-            Color color, BasicStroke line, BasicStroke dashes, Color dashedColor) {
+
+    private void displaySegments(GeneralPath path, GeneralPath orientationArrows, GeneralPath onewayArrows,
+            GeneralPath onewayArrowsCasing, GeneralPath highlightedSegments, Color color, BasicStroke line,
+            BasicStroke dashes, Color dashedColor) {
         g.setColor(inactive ? inactiveColor : color);
         if (useStrokes) {
             g.setStroke(line);
         }
         g.draw(path);
 
+        if(highlightedSegments != null) {
+            g.setColor(highlightColor);
+            g.draw(highlightedSegments);
+        }
+
         if(!inactive && useStrokes && dashes != null) {
             g.setColor(dashedColor);
             g.setStroke(dashes);
             g.draw(path);
+            if(highlightedSegments != null) {
+                g.draw(highlightedSegments);
+            }
         }
 
         if (orientationArrows != null) {
@@ -997 +1035 @@
                 pVia, vx, vx2, vy, vy2, iconAngle, r.isSelected());
     }
 
-    public void drawVirtualNodes(Collection<Way> ways) {
-
-        if (virtualNodeSize != 0) {
-            GeneralPath path = new GeneralPath();
-            for (Way osm: ways){
-                if (osm.isUsable() && !osm.isDisabled()) {
-                    visitVirtual(path, osm);
-                }
+    public void drawVirtualNodes(Collection<Way> ways, Collection<WaySegment> highlightVirtualNodes) {
+        if (virtualNodeSize == 0)
+            return;
+        // print normal virtual nodes
+        GeneralPath path = new GeneralPath();
+        for (Way osm: ways){
+            if (osm.isUsable() && !osm.isDisabled()) {
+                visitVirtual(path, osm);
             }
-            g.setColor(nodeColor);
-            g.draw(path);
         }
+        g.setColor(nodeColor);
+        g.draw(path);
+        // print highlighted virtual nodes. Since only the color changes, simply
+        // drawing them over the existing ones works fine (at least in their current
+        // simple style)
+        path = new GeneralPath();
+        for (WaySegment wseg: highlightVirtualNodes){
+            if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
+                visitVirtual(path, wseg.toWay());
+            }
+        }
+        g.setColor(highlightColor);
+        g.draw(path);
     }
 
     public void visitVirtual(GeneralPath path, Way w) {

src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 
@@ -127 +128 @@
     }
 
     DataSet ds;
+
     public void render(DataSet data, boolean virtual, Bounds bounds) {
         BBox bbox = new BBox(bounds);
         this.ds = data;
@@ -167 +169 @@
                 osm.visit(this);
             }
         }
-        drawVirtualNodes(data.searchWays(bbox));
+        drawVirtualNodes(data.searchWays(bbox), data.getHighlightedVirtualNodes());
+
+        // draw highlighted way segments over the already drawn ways. Otherwise each
+        // way would have to be checked if it contains a way segment to highlight when
+        // in most of the cases there won't be more than one segment. Since the wireframe
+        // renderer does not feature any transparency there should be no visual difference.
+        for(final WaySegment wseg : data.getHighlightedWaySegments()) {
+            drawSegment(nc.getPoint(wseg.getFirstNode()), nc.getPoint(wseg.getSecondNode()), highlightColor, false);
+        }
+        displaySegments();
     }
 
     private static final int max(int a, int b, int c, int d) {
@@ -227 +238 @@
         return (xd+yd > space);
     }
 
-    public void drawVirtualNodes(Collection<Way> ways) {
-
-        if (virtualNodeSize != 0) {
-            GeneralPath path = new GeneralPath();
-            for (Way osm: ways){
-                if (osm.isUsable() && !osm.isDisabledAndHidden() && !osm.isDisabled()) {
-                    visitVirtual(path, osm);
-                }
+    public void drawVirtualNodes(Collection<Way> ways, Collection<WaySegment> highlightVirtualNodes) {
+        if (virtualNodeSize == 0)
+            return;
+        // print normal virtual nodes
+        GeneralPath path = new GeneralPath();
+        for (Way osm : ways) {
+            if (osm.isUsable() && !osm.isDisabledAndHidden() && !osm.isDisabled()) {
+                visitVirtual(path, osm);
             }
-            g.setColor(nodeColor);
-            g.draw(path);
         }
+        g.setColor(nodeColor);
+        g.draw(path);
+        // print highlighted virtual nodes. Since only the color changes, simply
+        // drawing them over the existing ones works fine (at least in their current
+        // simple style)
+        path = new GeneralPath();
+        for (WaySegment wseg: highlightVirtualNodes){
+            if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
+                visitVirtual(path, wseg.toWay());
+            }
+        }
+        g.setColor(highlightColor);
+        g.draw(path);
     }
 
     public void visitVirtual(GeneralPath path, Way w) {
@@ -308 +330 @@
 
     private Stroke relatedWayStroke = new BasicStroke(
             4, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL);
+
     public void visit(Relation r) {
         if (r.isIncomplete()) return;
 
@@ -428 +451 @@
                 final double sy = l * (p1.y - p2.y);
 
                 path.lineTo (p2.x + (int) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (int) Math.round(sinPHI * sx + cosPHI * sy));
-                path.moveTo (p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(- sinPHI * sx + cosPHI * sy));
+                path.moveTo (p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(-sinPHI * sx + cosPHI * sy));
                 path.lineTo(p2.x, p2.y);
             }
         }

src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -4 +4 @@
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -15 +16 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
 import org.openstreetmap.josm.gui.mappaint.ElemStyle;
@@ -219 +221 @@
                 Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
                         RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
 
-        this.painter = new MapPainter(paintSettings, g, isInactiveMode, nc, renderVirtualNodes, circum, leftHandTraffic);
+        Collection<WaySegment> hws = data.getHighlightedWaySegments();
 
+        this.painter = new MapPainter(paintSettings, g, isInactiveMode, nc, renderVirtualNodes, circum, leftHandTraffic, hws);
+
         StyleCollector sc = new StyleCollector(drawArea, drawMultipolygon, drawRestriction);
         collectNodeStyles(data, sc, bbox);
         collectWayStyles(data, sc, bbox);
@@ -228 +232 @@
         //long phase1 = System.currentTimeMillis();
         sc.drawAll();
         sc = null;
-        painter.drawVirtualNodes(data.searchWays(bbox));
+        painter.drawVirtualNodes(data.searchWays(bbox), data.getHighlightedVirtualNodes());
 
         //long now = System.currentTimeMillis();
         //System.err.println(String.format("PAINTING TOOK %d [PHASE1 took %d] (at scale %s)", now - start, phase1 - start, circum));

src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -233 +233 @@
 
         if (parents.isEmpty())
             return null;
-        if (!checkAndConfirmOutlyingDeletes(layer,parents) && !silent)
+        if (!silent && !checkAndConfirmOutlyingDeletes(layer,parents))
             return null;
         return new DeleteCommand(layer,parents);
     }
@@ -387 +387 @@
     }
 
     public static Command deleteWaySegment(OsmDataLayer layer, WaySegment ws) {
+        if (ws.way.getNodesCount() < 3)
+            return delete(layer, Collections.singleton(ws.way), false);
+
         if (ws.way.firstNode() == ws.way.lastNode()) {
             // If the way is circular (first and last nodes are the same),
             // the way shouldn't be splitted