Use ​Swing Copy/Paste instead of CopyAction/PasteAction with custom buffer?

[simon04]

From ticket:5546#comment:3

Is there a reason for a "custom" implementation of CopyAction and PasteAction in contrast to the ​Swing CCP?

[Don-vip]

sounds good

[Don-vip]

Milestone renamed

[michael2402]

I spend some time on this.

The patch still needs some cleanup, corner case handling, documentation and testing ;-).

Supported features:

• Replace FileDrop - Java provides a nice Transferable interface that does the same job
• Allow drop/paste of:
  • Files (same as drop handling before)
  • Primitive transfers
• Allow copy of:
  • Primitives

Currently, primitives added to the internal copy buffer are automatically added to the system clippboard.

You can now open two JOSM instances and Copy/Paste between the two ;-). Cut is not (yet) supported.

I suggest Crtl+Alt+V to paste at the same postion the node was copied.

[Don-vip]

Sorry I didn't see you attached the patch file! It looks OK but it does not apply properly now, could you please attach an updated version?

[michael2402]

I'll update it to the current version of JOSM and get the missing features (compatibility, cut, ...) working. I suggest moving this to 16.7 since I want to work on fixing the tests and not start an other big change that might break stuff before the 16.6 release.

[michael2402]

I attached two patches that implement swing copy+paste for JOSM.

The Main.paste* fields are deprecated and never used in JOSM code. The pasteBuffer is read only, the pasteSource not available.

There is a new ClipboardUtils class that contains the methods used to access the clipboard. The clipboard will also work in headless mode.

I split this into two patches:

(1) patch-patch-ccp-primitives-copy-no-layers.patch​ converts all copy/paste to use the swing buffer. This includes copying/pasting tags and relation members. It is quite big (~2000 lines added) but splitting it will be difficult. The main work is done by OsmTransferHandler. Fixes #11114.
(2) patch-ccp-primitives-copy-only-layers.patch​ adds drag+drop support for layers.

This will work now:

• Copy/Paste between JOSM instances
• Copy something in JOSM, paste it in the relation dialog as members
• Copy/Paste/Drag between relation dialogs
• Paste a file to open/load it
• Reorder and duplicate layers using drag+drop

In the future, if you use multiple layer lists, you can drag+drop between them. We could also add a nicer way to duplicate layers so that other layers like GPX, imagery, ... could be duplicated as well.

[michael2402]

The patch is ready to be merged but further java 8 migration may create conflicts. Fixes #12565 and #11114.

[Don-vip]

In 10604/josm:

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

[Don-vip]

FileDrop is still used in GettingStarted, shouldn't it be replaced?

[Don-vip]

I forgot the other patch

[Don-vip]

In 10605/josm:

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

[michael2402]

FileDrop can be replaced. The nice thing about FileDrop is that it adds a border to indicate the drop target. It already uses swing transferables to transfer objects but could be cleaned up a lot.

[Don-vip]

In 10613/josm:

see #12478 - do not try to enable dragging in headless mode