Changeset 10946 in josm for trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java

Timestamp:

2016-09-03T20:01:46+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13395 - fix serialization issue causing bugs in copy/paste

File:

• trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (modified) (4 diffs)

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

@@ -30 +30 @@
     }
 
+    /**
+     * Constructs a new {@code PrimitiveData} from an existing one.
+     * @param data the data to copy
+     */
     public PrimitiveData(PrimitiveData data) {
         cloneFrom(data);
     }
 
+    /**
+     * Sets the primitive identifier.
+     * @param id primitive identifier
+     */
     public void setId(long id) {
         this.id = id;
     }
 
+    /**
+     * Sets the primitive version.
+     * @param version primitive version
+     */
     public void setVersion(int version) {
         this.version = version;
@@ -50 +62 @@
     }
 
+    /**
+     * Returns a copy of this primitive data.
+     * @return a copy of this primitive data
+     */
     public abstract PrimitiveData makeCopy();
 
@@ -82 +98 @@
         oos.writeInt(timestamp);
         oos.writeObject(keys);
+        oos.writeShort(flags);
         oos.defaultWriteObject();
     }
@@ -94 +111 @@
         timestamp = ois.readInt();
         keys = (String[]) ois.readObject();
+        flags = ois.readShort();
         ois.defaultReadObject();
     }