Changeset 6047 in josm for trunk/src/org

Timestamp:

2013-07-03T15:00:20+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8846 - use correct key mask on Mac in PasteAction

File:

• trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) (3 diffs)

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

@@ -8 +8 @@
 import java.awt.MouseInfo;
 import java.awt.Point;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -22 +23 @@
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
+import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
 import org.openstreetmap.josm.data.osm.RelationData;
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.WayData;
-import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -86 +87 @@
         // default to paste in center of map (pasted via menu or cursor not in MapView)
         EastNorth mPosition = Main.map.mapView.getCenter();
-        if((e.getModifiers() & ActionEvent.CTRL_MASK) != 0) {
+        if((e.getModifiers() & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) != 0) {
             final Point mp = MouseInfo.getPointerInfo().getLocation();
             final Point tl = Main.map.mapView.getLocationOnScreen();