Changeset 11554 in josm for trunk/src/org


Ignore:
Timestamp:
2017-02-12T16:41:53+01:00 (3 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/AbstractPasteAction.java

    r10766 r11554  
    8585    @Override
    8686    public void actionPerformed(ActionEvent e) {
    87         doPaste(e, ClipboardUtils.getClipboard().getContents(null));
     87        doPaste(e, ClipboardUtils.getClipboardContent());
    8888    }
    8989
  • trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java

    r10936 r11554  
    6060     */
    6161    public void pasteOn(OsmDataLayer editLayer, EastNorth mPosition) {
    62         Transferable transferable = ClipboardUtils.getClipboard().getContents(null);
     62        Transferable transferable = ClipboardUtils.getClipboardContent();
    6363        pasteOn(editLayer, mPosition, transferable);
    6464    }
     
    7979     */
    8080    public void pasteTags(Collection<? extends OsmPrimitive> primitives) {
    81         Transferable transferable = ClipboardUtils.getClipboard().getContents(null);
     81        Transferable transferable = ClipboardUtils.getClipboardContent();
    8282        importTags(new TransferSupport(Main.panel, transferable), primitives);
    8383    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java

    r10847 r11554  
    4242
    4343    private TransferSupport getSupport() {
    44         return new TransferSupport(memberTable, ClipboardUtils.getClipboard().getContents(null));
     44        return new TransferSupport(memberTable, ClipboardUtils.getClipboardContent());
    4545    }
    4646
Note: See TracChangeset for help on using the changeset viewer.