Changeset 10766 in josm for trunk

Timestamp:

2016-08-07T22:52:29+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13290 - pasting from other layer changes objects position (modified patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractPasteAction.java (added)
• actions/DuplicateAction.java (modified) (3 diffs)
• actions/PasteAction.java (modified) (4 diffs)
• actions/PasteAtSourcePositionAction.java (added)
• gui/MainMenu.java (modified) (3 diffs)
• gui/datatransfer/OsmTransferHandler.java (modified) (2 diffs)
• gui/datatransfer/importers/PrimitiveDataPaster.java (modified) (1 diff)

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

@@ -10 +10 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
 import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
@@ -20 +18 @@
  * An action that duplicates the given nodes. They are not added to the clipboard.
  */
-public final class DuplicateAction extends JosmAction {
+public final class DuplicateAction extends AbstractPasteAction {
 
     /**
@@ -35 +33 @@
     public void actionPerformed(ActionEvent e) {
         PrimitiveTransferData data = PrimitiveTransferData.getDataWithReferences(getLayerManager().getEditDataSet().getSelected());
-        new OsmTransferHandler().pasteOn(Main.getLayerManager().getEditLayer(),
-                PasteAction.computePastePosition(e, getValue(NAME)), new PrimitiveTransferable(data));
+        doPaste(e, new PrimitiveTransferable(data));
     }
 

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

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.MouseInfo;
-import java.awt.Point;
-import java.awt.datatransfer.FlavorEvent;
-import java.awt.datatransfer.FlavorListener;
-import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
-import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -23 +15 @@
  * @since 404
  */
-public final class PasteAction extends JosmAction implements FlavorListener {
-
-    private final OsmTransferHandler transferHandler;
+public final class PasteAction extends AbstractPasteAction {
 
     /**
@@ -31 +21 @@
      */
     public PasteAction() {
-        super(tr("Paste"), "paste", tr("Paste contents of paste buffer."),
+        super(tr("Paste"), "paste", tr("Paste contents of clipboard."),
                 Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.CTRL), true);
         putValue("help", ht("/Action/Paste"));
@@ -37 +27 @@
         Main.registerActionShortcut(this,
                 Shortcut.registerShortcut("system:paste:cua", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_INSERT, Shortcut.SHIFT));
-        transferHandler = new OsmTransferHandler();
-        ClipboardUtils.getClipboard().addFlavorListener(this);
-    }
-
-    @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();
-        // We previously checked for modifier to know if the action has been trigerred via shortcut or via menu
-        // 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 && !name.equals(e.getActionCommand())) {
-            final Point mp = MouseInfo.getPointerInfo().getLocation();
-            final Point tl = Main.map.mapView.getLocationOnScreen();
-            final Point pos = new Point(mp.x-tl.x, mp.y-tl.y);
-            if (Main.map.mapView.contains(pos)) {
-                mPosition = Main.map.mapView.getEastNorth(pos.x, pos.y);
-            }
-        }
-        return mPosition;
-    }
-
-    @Override
-    protected void updateEnabledState() {
-        setEnabled(getLayerManager().getEditDataSet() != null && transferHandler.isDataAvailable());
-    }
-
-    @Override
-    public void flavorsChanged(FlavorEvent e) {
-        updateEnabledState();
     }
 }

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

@@ -74 +74 @@
 import org.openstreetmap.josm.actions.OverpassDownloadAction;
 import org.openstreetmap.josm.actions.PasteAction;
+import org.openstreetmap.josm.actions.PasteAtSourcePositionAction;
 import org.openstreetmap.josm.actions.PasteTagsAction;
 import org.openstreetmap.josm.actions.PreferenceToggleAction;
@@ -195 +196 @@
     /** Edit / Paste */
     public final PasteAction paste = new PasteAction();
+    /** Edit / Paste at source */
+    private final PasteAtSourcePositionAction pasteAtSource = new PasteAtSourcePositionAction();
     /** Edit / Paste Tags */
     public final PasteTagsAction pasteTags = new PasteTagsAction();
@@ -680 +683 @@
         add(editMenu, copyCoordinates, true);
         add(editMenu, paste);
+        add(editMenu, pasteAtSource, true);
         add(editMenu, pasteTags);
         add(editMenu, duplicate);

trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java

@@ -83 +83 @@
      * Paste the current clipboard current at the given position
      * @param editLayer The layer to paste on.
-     * @param mPosition The position to paste at.
+     * @param mPosition The position to paste at. If it is <code>null</code>, the original position will be used.
      */
     public void pasteOn(OsmDataLayer editLayer, EastNorth mPosition) {
@@ -93 +93 @@
      * Paste the given clipboard current at the given position
      * @param editLayer The layer to paste on.
-     * @param mPosition The position to paste at.
+     * @param mPosition The position to paste at. If it is <code>null</code>, the original position will be used.
      * @param transferable The transferable to use.
      */

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java

@@ -50 +50 @@
 
         EastNorth center = pasteBuffer.getCenter();
-        EastNorth offset = center == null ? null : pasteAt.subtract(center);
+        EastNorth offset = center == null || pasteAt == null ? new EastNorth(0, 0) : pasteAt.subtract(center);
 
         AddPrimitivesCommand command = createNewPrimitives(pasteBuffer, offset, layer);