Changeset 9891 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-02-27T19:30:02+01:00 (8 years ago)

Author:

simon04

Message:

see #12300 - Make Drag and Drop work between different JOSM instances

Location:

trunk/src/org/openstreetmap/josm/gui/datatransfer

Files:

• PrimitiveTransferable.java (modified) (3 diffs)
• RelationMemberTransferable.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -21 +23 @@
      * A wrapper for a collection of {@link PrimitiveData}.
      */
-    public static final class Data {
+    public static final class Data implements Serializable {
+        private static final long serialVersionUID = -1485089993600213704L;
         private final Collection<PrimitiveData> primitiveData;
 
         private Data(Collection<PrimitiveData> primitiveData) {
+            CheckParameterUtil.ensureThat(primitiveData instanceof Serializable, "primitiveData must be instanceof Serializable");
             this.primitiveData = primitiveData;
         }

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

@@ -5 +5 @@
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -21 +23 @@
      * A wrapper for a collection of {@link RelationMemberData}.
      */
-    public static final class Data {
+    public static final class Data implements Serializable {
+        private static final long serialVersionUID = -8432393711635811029L;
         private final Collection<RelationMemberData> relationMemberDatas;
 
         private Data(Collection<RelationMemberData> primitiveData) {
+            CheckParameterUtil.ensureThat(primitiveData instanceof Serializable, "primitiveData must be instanceof Serializable");
             this.relationMemberDatas = primitiveData;
         }