Changeset 10682 in josm

Timestamp:

2016-07-31T12:28:39+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13203 - Ctrl-D (Duplicate) places new object on top of source object (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DuplicateAction.java (modified) (1 diff)
• PasteAction.java (modified) (3 diffs)

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

@@ -35 +35 @@
     public void actionPerformed(ActionEvent e) {
         PrimitiveTransferData data = PrimitiveTransferData.getDataWithReferences(getLayerManager().getEditDataSet().getSelected());
-        new OsmTransferHandler().pasteOn(Main.getLayerManager().getEditLayer(), data.getCenter(), new PrimitiveTransferable(data));
+        new OsmTransferHandler().pasteOn(Main.getLayerManager().getEditLayer(),
+                PasteAction.computePastePosition(e, getValue(NAME)), new PrimitiveTransferable(data));
     }
 

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

@@ -43 +43 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        transferHandler.pasteOn(Main.getLayerManager().getEditLayer(), computePastePosition(e, getValue(NAME)));
+    }
+
+    static EastNorth computePastePosition(ActionEvent e, Object name) {
         // default to paste in center of map (pasted via menu or cursor not in MapView)
         EastNorth mPosition = Main.map.mapView.getCenter();
@@ -48 +52 @@
         // But this does not work if the shortcut is changed to a single key (see #9055)
         // Observed behaviour: getActionCommand() returns Action.NAME when triggered via menu, but shortcut text when triggered with it
-        if (e != null && !getValue(NAME).equals(e.getActionCommand())) {
+        if (e != null && !name.equals(e.getActionCommand())) {
             final Point mp = MouseInfo.getPointerInfo().getLocation();
             final Point tl = Main.map.mapView.getLocationOnScreen();
@@ -56 +60 @@
             }
         }
-
-        transferHandler.pasteOn(Main.getLayerManager().getEditLayer(), mPosition);
+        return mPosition;
     }