JavaFormatter: added serialization methods

x2/src/main/java/x2/Deserializer.java

@@ -176,6 +176,20 @@ public Calendar readCallendar() throws IOException {
 
  // Read methods for composite types
 
+ public byte[] readBytes() throws IOException {
+ byte[] value = null;
+ int length = readNonnegativeInt();
+ if (length == 0) { return value; }
+
+ buffer.checkLengthToRead(length);
+
+ value = new byte[length];
+ for (int i = 0; i < length; ++i) {
+ value[i] = buffer.get();
+ }
+ return value;
+ }
+
  /** Decodes a cell-derived object out of the underlying buffer. */
  public <T extends Cell> T readCell(Class<T> cls) throws IOException {
  T value = null;

x2/src/main/java/x2/Event.java

@@ -3,6 +3,8 @@
 
 package x2;
 
+import java.io.IOException;
+
 import x2.util.*;
 
 /** Common base class for all events. */
@@ -92,6 +94,24 @@ protected boolean isEquivalent(Cell other, Fingerprint fingerprint) {
 
  // Serialization
 
+ @Override
+ public void deserialize(Deserializer deserializer) throws IOException {
+ super.deserialize(deserializer);
+ }
+
+ @Override
+ public int length() {
+ int length = Serializer.lengthInt(_getTypeId());
+ length += super.length();
+ return length;
+ }
+
+ @Override
+ public void serialize(Serializer serializer) {
+ serializer.writeInt(_getTypeId());
+ super.serialize(serializer);
+ }
+
  // Built-in accessors and mutators
 
  /** Gets the link session handle associated with this event. */