Changeset 11554 in josm for trunk/src/org

Timestamp:

2017-02-12T16:41:53+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14356 - make sure that workaround for JDK-6322854 is used everywhere

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractPasteAction.java (modified) (1 diff)
• gui/datatransfer/OsmTransferHandler.java (modified) (2 diffs)
• gui/dialogs/relation/actions/PasteMembersAction.java (modified) (1 diff)

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

@@ -85 +85 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        doPaste(e, ClipboardUtils.getClipboard().getContents(null));
+        doPaste(e, ClipboardUtils.getClipboardContent());
     }
 

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

@@ -60 +60 @@
      */
     public void pasteOn(OsmDataLayer editLayer, EastNorth mPosition) {
-        Transferable transferable = ClipboardUtils.getClipboard().getContents(null);
+        Transferable transferable = ClipboardUtils.getClipboardContent();
         pasteOn(editLayer, mPosition, transferable);
     }
@@ -79 +79 @@
      */
     public void pasteTags(Collection<? extends OsmPrimitive> primitives) {
-        Transferable transferable = ClipboardUtils.getClipboard().getContents(null);
+        Transferable transferable = ClipboardUtils.getClipboardContent();
         importTags(new TransferSupport(Main.panel, transferable), primitives);
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java

@@ -42 +42 @@
 
     private TransferSupport getSupport() {
-        return new TransferSupport(memberTable, ClipboardUtils.getClipboard().getContents(null));
+        return new TransferSupport(memberTable, ClipboardUtils.getClipboardContent());
     }