Changeset 9994 in josm for trunk

Timestamp:

2016-03-14T20:32:56+01:00 (9 years ago)

Author:

simon04

Message:

Fix drag-and-drop from selection list to relation member table

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/PrimitiveData.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java (added)
• test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java (added)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -73 +76 @@
     @Override
     public abstract OsmPrimitiveType getType();
+
+    private void writeObject(ObjectOutputStream oos) throws IOException {
+        // since super class is not Serializable
+        oos.writeLong(id);
+        oos.writeLong(user == null ? -1 : user.getId());
+        oos.writeInt(version);
+        oos.writeInt(changesetId);
+        oos.writeInt(timestamp);
+        oos.defaultWriteObject();
+    }
+
+    private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+        // since super class is not Serializable
+        id = ois.readLong();
+        final long userId = ois.readLong();
+        user = userId == -1 ? null : User.getById(userId);
+        version = ois.readInt();
+        changesetId = ois.readInt();
+        timestamp = ois.readInt();
+        ois.defaultReadObject();
+    }
 }