Changeset 19096 in josm

Timestamp:

2024-06-03T18:08:14+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Fix #23677: Move PrimitiveData serialization back from AbstractPrimitive

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• AbstractPrimitive.java (modified) (3 diffs)
• PrimitiveData.java (modified) (1 diff)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.text.MessageFormat;
 import java.time.Instant;
@@ -143 +140 @@
      * Other bits of this field are used in subclasses.
      */
-    private volatile short flags = FLAG_VISIBLE;   // visible per default
+    protected volatile short flags = FLAG_VISIBLE;   // visible per default
 
     /**
@@ -372 +369 @@
         updateFlags(flag, value);
         return oldFlags != flags;
-    }
-
-    /**
-     * Write common data to a serialization stream. At time of writing, this should <i>only</i> be used by {@link PrimitiveData}.
-     * @param oos The output stream to write to
-     * @throws IOException see {@link ObjectOutputStream#write}
-     */
-    protected void writeObjectCommon(ObjectOutputStream oos) throws IOException {
-        oos.writeLong(id);
-        oos.writeLong(user == null ? -1 : user.getId());
-        oos.writeInt(version);
-        oos.writeInt(changesetId);
-        oos.writeInt(timestamp);
-        oos.writeObject(keys);
-        oos.writeShort(flags);
-    }
-
-    /**
-     * Read common data from a serialization stream. At time of writing, this should <i>only</i> be used by {@link PrimitiveData}.
-     * @param ois The serialization stream to read from
-     * @throws ClassNotFoundException see {@link ObjectInputStream#readObject()}
-     * @throws IOException see {@link ObjectInputStream#read}
-     */
-    protected void readObjectCommon(ObjectInputStream ois) throws ClassNotFoundException, IOException {
-        id = ois.readLong();
-        final long userId = ois.readLong();
-        user = userId == -1 ? null : User.getById(userId);
-        version = ois.readInt();
-        changesetId = ois.readInt();
-        timestamp = ois.readInt();
-        keys = (String[]) ois.readObject();
-        flags = ois.readShort();
     }
 

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

@@ -84 +84 @@
 
     private void writeObject(ObjectOutputStream oos) throws IOException {
-        // since super class is not Serializable
-        super.writeObjectCommon(oos);
+        oos.writeLong(id);
+        oos.writeLong(user == null ? -1 : user.getId());
+        oos.writeInt(version);
+        oos.writeInt(changesetId);
+        oos.writeInt(timestamp);
+        oos.writeObject(keys);
+        oos.writeShort(flags);
         oos.defaultWriteObject();
     }
 
     private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
-        // since super class is not Serializable
-        super.readObjectCommon(ois);
+        id = ois.readLong();
+        final long userId = ois.readLong();
+        user = userId == -1 ? null : User.getById(userId);
+        version = ois.readInt();
+        changesetId = ois.readInt();
+        timestamp = ois.readInt();
+        keys = (String[]) ois.readObject();
+        flags = ois.readShort();
         ois.defaultReadObject();
     }