Changeset 10604 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.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/gui/dialogs/relation/actions/CopyMembersAction.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.actions.CopyAction;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.gui.datatransfer.RelationMemberTransferable;
 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
@@ -29 +30 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        final Collection<OsmPrimitive> primitives = memberTableModel.getSelectedChildPrimitives();
-        if (!primitives.isEmpty()) {
-            CopyAction.copy(layer, primitives);
+        final Collection<RelationMember> members = memberTableModel.getSelectedMembers();
+
+        if (!members.isEmpty()) {
+            ClipboardUtils.copy(new RelationMemberTransferable(members));
         }
     }