Changeset 9891 in josm for trunk/src/org

Timestamp:

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

Author:

simon04

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/NodeData.java (modified) (1 diff)
• data/osm/PrimitiveData.java (modified) (2 diffs)
• data/osm/RelationData.java (modified) (1 diff)
• data/osm/RelationMemberData.java (modified) (1 diff)
• data/osm/WayData.java (modified) (1 diff)
• gui/datatransfer/PrimitiveTransferable.java (modified) (3 diffs)
• gui/datatransfer/RelationMemberTransferable.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/NodeData.java

@@ -9 +9 @@
 public class NodeData extends PrimitiveData implements INode {
 
+    private static final long serialVersionUID = 5626323599550908773L;
     /*
      * we "inline" lat/lon coordinates instead of using a LatLon => reduces memory footprint

trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15 +16 @@
  * reported by events
  */
-public abstract class PrimitiveData extends AbstractPrimitive {
+public abstract class PrimitiveData extends AbstractPrimitive implements Serializable {
+
+    private static final long serialVersionUID = -1044837092478109138L;
 
     /**

trunk/src/org/openstreetmap/josm/data/osm/RelationData.java

@@ -9 +9 @@
 public class RelationData extends PrimitiveData implements IRelation {
 
+    private static final long serialVersionUID = 1163664954890478565L;
     private List<RelationMemberData> members = new ArrayList<>();
 

trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.io.Serializable;
 import java.util.Objects;
 
-public class RelationMemberData implements PrimitiveId {
+public class RelationMemberData implements PrimitiveId, Serializable {
 
+    private static final long serialVersionUID = 381392198209333319L;
     private final String role;
     private final long memberId;

trunk/src/org/openstreetmap/josm/data/osm/WayData.java

@@ -9 +9 @@
 public class WayData extends PrimitiveData implements IWay {
 
+    private static final long serialVersionUID = 106944939313286415L;
     private List<Long> nodes = new ArrayList<>();
 

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;
         }