Changeset 10604 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2016-07-23T14:54:19+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12478, fix #12565, fix #11114 - Use ​Swing Copy/Paste instead of CopyAction/PasteAction with custom buffer (patch by michael2402, modified) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -84 +84 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapFrameListener;
+import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
@@ -178 +179 @@
     /**
      * The global paste buffer.
-     */
+     * @deprecated Use swing CCP instead. See {@link OsmTransferHandler}
+     */
+    @Deprecated
     public static final PrimitiveDeepCopy pasteBuffer = new PrimitiveDeepCopy();
 
     /**
      * The layer source from which {@link Main#pasteBuffer} data comes from.
-     */
+     * @deprecated During a copy operation, the layer should be added. See {@link OsmLayerTransferData}.
+     */
+    @Deprecated
     public static Layer pasteSource;