Changeset 10605 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-07-23T15:15:14+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12478 - Use ​Swing Copy/Paste instead of CopyAction/PasteAction with custom buffer (layer part: patch by michael2402, modified) - gsoc-core

File:

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

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

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -48 +49 @@
         }
 
-        copy(selection);
+        copy(getLayerManager().getEditLayer(), selection);
     }
 
@@ -54 +55 @@
      * Copies the given primitive ids to the clipboard. The output by this function
      * looks similar to: node 1089302677,node 1089303458,way 93793372
+     * @param source The OSM data layer source
      * @param primitives The OSM primitives to copy
      */
-    public static void copy(Collection<OsmPrimitive> primitives) {
+    public static void copy(OsmDataLayer source, Collection<OsmPrimitive> primitives) {
         // copy ids to the clipboard
-        ClipboardUtils.copy(new PrimitiveTransferable(PrimitiveTransferData.getDataWithReferences(primitives)));
+        ClipboardUtils.copy(new PrimitiveTransferable(PrimitiveTransferData.getDataWithReferences(primitives), source));
     }