diff options
Diffstat (limited to 'sources/events/VSAbstractEvent.java')
| -rw-r--r-- | sources/events/VSAbstractEvent.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java index 9a4062e..34e2b87 100644 --- a/sources/events/VSAbstractEvent.java +++ b/sources/events/VSAbstractEvent.java @@ -27,6 +27,7 @@ import java.io.*; import core.VSProcess; import prefs.VSPrefs; +import serialize.*; import utils.*; /** @@ -165,11 +166,13 @@ abstract public class VSAbstractEvent extends VSPrefs { abstract public void onStart(); /* (non-Javadoc) - * @see prefs.VSPrefs#writeObject() + * @see serialize.VSSerializable#serialize(serialize.VSSerialize, + * java.io.ObjectOutputStream) */ - public synchronized void writeObject(ObjectOutputStream objectOutputStream) + public synchronized void serialize(VSSerialize serialize, + ObjectOutputStream objectOutputStream) throws IOException { - super.writeObject(objectOutputStream); + super.serialize(serialize, objectOutputStream); objectOutputStream.writeObject(new Integer(super.getID())); //objectOutputStream.writeObject(new Integer(process.getProcessNum())); objectOutputStream.writeObject(eventShortname); @@ -177,22 +180,23 @@ abstract public class VSAbstractEvent extends VSPrefs { } /* (non-Javadoc) - * @see prefs.VSPrefs#readObject() + * @see serialize.VSSerializable#deserialize(serialize.VSSerialize, + * java.io.ObjectInputStream) */ @SuppressWarnings("unchecked") - public synchronized void readObject(ObjectInputStream objectInputStream) + public synchronized void deserialize(VSSerialize serialize, + ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException { - super.readObject(objectInputStream); + super.deserialize(serialize, objectInputStream); - if (VSDeserializationHelper.DEBUG) + if (VSSerialize.DEBUG) System.out.println("Deserializing: VSAbstractEvent"); - Integer id = (Integer) objectInputStream.readObject(); + int id = ((Integer) objectInputStream.readObject()).intValue(); //Integer processNum = (Integer) objectInputStream.readObject(); this.eventShortname = (String) objectInputStream.readObject(); this.eventClassname = (String) objectInputStream.readObject(); - VSDeserializationHelper.setObject(id.intValue(), - "event", this); + serialize.setObject(id, "event", this); } } |