Changeset 3594 in josm for trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

Timestamp:

2010-10-09T00:37:35+02:00 (14 years ago)

Author:

bastiK

Message:

applied #5500 (patch by cmuelle8) - improve SelectAction and NavigatableComponent

File:

• trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -61 +61 @@
          * @see InputEvent#getModifiersEx()
          */
-        public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl);
+        public void selectionEnded(Rectangle r, MouseEvent e);
         /**
          * Called to register the selection manager for "active" property.
@@ -189 +189 @@
         mousePos = null;
 
-        boolean shift = (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0;
-        boolean alt = (e.getModifiersEx() & (MouseEvent.ALT_DOWN_MASK | MouseEvent.ALT_GRAPH_DOWN_MASK)) != 0;
-        boolean ctrl = (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0;
         if ((e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) {
-            selectionEndedListener.selectionEnded(r, alt, shift, ctrl);
+            selectionEndedListener.selectionEnded(r, e);
         }
     }
@@ -277 +274 @@
 
         if (clicked) {
-            OsmPrimitive osm = nc.getNearest(center, OsmPrimitive.isSelectablePredicate);
+            OsmPrimitive osm = nc.getNearestNodeOrWay(center, OsmPrimitive.isSelectablePredicate);
             if (osm != null) {
                 selection.add(osm);