diff --git a/src/java/com/threerings/crowd/chat/data/ChatMessage.java b/src/java/com/threerings/crowd/chat/data/ChatMessage.java index 55c74a412..8a0d61c78 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatMessage.java +++ b/src/java/com/threerings/crowd/chat/data/ChatMessage.java @@ -21,12 +21,8 @@ package com.threerings.crowd.chat.data; -import java.io.IOException; - import com.samskivert.util.StringUtil; -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; /** @@ -91,22 +87,4 @@ public abstract class ChatMessage { return StringUtil.shortClassName(this) + StringUtil.fieldsToString(this); } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - message = ins.readUTF(); - bundle = ins.readUTF(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - out.writeUTF(message); - out.writeUTF(bundle); - } - // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/crowd/chat/data/SystemMessage.java b/src/java/com/threerings/crowd/chat/data/SystemMessage.java index cd9ce3228..0f8c3f585 100644 --- a/src/java/com/threerings/crowd/chat/data/SystemMessage.java +++ b/src/java/com/threerings/crowd/chat/data/SystemMessage.java @@ -21,11 +21,6 @@ package com.threerings.crowd.chat.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; - /** * A ChatMessage that represents a message that came from the server and did not result from direct * user action. @@ -58,22 +53,4 @@ public class SystemMessage extends ChatMessage super(message, bundle); this.attentionLevel = attentionLevel; } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - super.readObject(ins); - attentionLevel = ins.readByte(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - super.writeObject(out); - out.writeByte(attentionLevel); - } - // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java b/src/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java index a8d403c50..014bd4d96 100644 --- a/src/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java +++ b/src/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java @@ -21,10 +21,6 @@ package com.threerings.crowd.chat.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.util.Name; /** @@ -56,23 +52,5 @@ public class TellFeedbackMessage extends UserMessage return _failure ? null : "m.told_format"; } - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - super.readObject(ins); - _failure = ins.readBoolean(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - super.writeObject(out); - out.writeBoolean(_failure); - } - // AUTO-GENERATED: METHODS END - protected boolean _failure; } diff --git a/src/java/com/threerings/crowd/chat/data/UserMessage.java b/src/java/com/threerings/crowd/chat/data/UserMessage.java index 90aeba155..151630ab6 100644 --- a/src/java/com/threerings/crowd/chat/data/UserMessage.java +++ b/src/java/com/threerings/crowd/chat/data/UserMessage.java @@ -21,10 +21,6 @@ package com.threerings.crowd.chat.data; -import java.io.IOException; - -import com.threerings.io.ObjectOutputStream; -import com.threerings.io.ObjectInputStream; import com.threerings.util.Name; /** @@ -90,24 +86,4 @@ public class UserMessage extends ChatMessage } return "m.speak_format"; } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - super.readObject(ins); - speaker = (Name)ins.readObject(); - mode = ins.readByte(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - super.writeObject(out); - out.writeObject(speaker); - out.writeByte(mode); - } - // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/crowd/chat/data/UserSystemMessage.java b/src/java/com/threerings/crowd/chat/data/UserSystemMessage.java index 36346c9bd..9ac987237 100644 --- a/src/java/com/threerings/crowd/chat/data/UserSystemMessage.java +++ b/src/java/com/threerings/crowd/chat/data/UserSystemMessage.java @@ -21,10 +21,6 @@ package com.threerings.crowd.chat.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.util.Name; /** @@ -57,22 +53,4 @@ public class UserSystemMessage extends SystemMessage super(message, bundle, attentionLevel); this.speaker = sender; } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - super.readObject(ins); - speaker = (Name)ins.readObject(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - super.writeObject(out); - out.writeObject(speaker); - } - // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java index 406e00a42..54c383555 100644 --- a/src/java/com/threerings/crowd/data/OccupantInfo.java +++ b/src/java/com/threerings/crowd/data/OccupantInfo.java @@ -21,10 +21,6 @@ package com.threerings.crowd.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.io.SimpleStreamableObject; import com.threerings.util.Name; @@ -107,24 +103,4 @@ public class OccupantInfo extends SimpleStreamableObject throw new RuntimeException(cnse); } } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - bodyOid = ins.readInt(); - username = (Name)ins.readObject(); - status = ins.readByte(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - out.writeInt(bodyOid); - out.writeObject(username); - out.writeByte(status); - } - // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/crowd/data/TokenRing.java b/src/java/com/threerings/crowd/data/TokenRing.java index 4bbba09a5..552a5488f 100644 --- a/src/java/com/threerings/crowd/data/TokenRing.java +++ b/src/java/com/threerings/crowd/data/TokenRing.java @@ -21,10 +21,6 @@ package com.threerings.crowd.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.io.SimpleStreamableObject; /** @@ -114,22 +110,6 @@ public class TokenRing extends SimpleStreamableObject _tokens &= ~token; } - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - _tokens = ins.readInt(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - out.writeInt(_tokens); - } - // AUTO-GENERATED: METHODS END - /** The tokens contained in this ring (composed together bitwise). */ protected int _tokens; } diff --git a/src/java/com/threerings/crowd/peer/data/CrowdClientInfo.java b/src/java/com/threerings/crowd/peer/data/CrowdClientInfo.java index 668b516e3..313548a64 100644 --- a/src/java/com/threerings/crowd/peer/data/CrowdClientInfo.java +++ b/src/java/com/threerings/crowd/peer/data/CrowdClientInfo.java @@ -21,10 +21,6 @@ package com.threerings.crowd.peer.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.util.Name; import com.threerings.presents.peer.data.ClientInfo; @@ -46,20 +42,4 @@ public class CrowdClientInfo extends ClientInfo // makes lookups much more efficient return visibleName; } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - visibleName = (Name)ins.readObject(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - out.writeObject(visibleName); - } - // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/presents/data/ConMgrStats.java b/src/java/com/threerings/presents/data/ConMgrStats.java index 2dd579e79..d32fed552 100644 --- a/src/java/com/threerings/presents/data/ConMgrStats.java +++ b/src/java/com/threerings/presents/data/ConMgrStats.java @@ -21,10 +21,6 @@ package com.threerings.presents.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.io.SimpleStreamableObject; /** @@ -74,38 +70,4 @@ public class ConMgrStats extends SimpleStreamableObject throw new RuntimeException(cnse); } } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - authQueueSize = ins.readInt(); - deathQueueSize = ins.readInt(); - outQueueSize = ins.readInt(); - overQueueSize = ins.readInt(); - connects = ins.readInt(); - disconnects = ins.readInt(); - bytesIn = ins.readLong(); - bytesOut = ins.readLong(); - msgsIn = ins.readInt(); - msgsOut = ins.readInt(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - out.writeInt(authQueueSize); - out.writeInt(deathQueueSize); - out.writeInt(outQueueSize); - out.writeInt(overQueueSize); - out.writeInt(connects); - out.writeInt(disconnects); - out.writeLong(bytesIn); - out.writeLong(bytesOut); - out.writeInt(msgsIn); - out.writeInt(msgsOut); - } - // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/presents/data/InvocationMarshaller.java b/src/java/com/threerings/presents/data/InvocationMarshaller.java index 108d14c64..24eee66ff 100644 --- a/src/java/com/threerings/presents/data/InvocationMarshaller.java +++ b/src/java/com/threerings/presents/data/InvocationMarshaller.java @@ -21,12 +21,8 @@ package com.threerings.presents.data; -import java.io.IOException; - import com.samskivert.util.StringUtil; -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; import com.threerings.presents.Log; @@ -246,24 +242,6 @@ public class InvocationMarshaller return "[invOid=" + _invOid + ", code=" + _invCode + ", type=" + getClass().getName() + "]"; } - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - _invOid = ins.readInt(); - _invCode = ins.readInt(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - out.writeInt(_invOid); - out.writeInt(_invCode); - } - // AUTO-GENERATED: METHODS END - /** * Called by generated invocation marshaller code; packages up and sends the specified * invocation service request. diff --git a/src/java/com/threerings/presents/peer/data/ClientInfo.java b/src/java/com/threerings/presents/peer/data/ClientInfo.java index 374641c2d..cbb2be1a2 100644 --- a/src/java/com/threerings/presents/peer/data/ClientInfo.java +++ b/src/java/com/threerings/presents/peer/data/ClientInfo.java @@ -21,10 +21,6 @@ package com.threerings.presents.peer.data; -import java.io.IOException; - -import com.threerings.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; import com.threerings.io.SimpleStreamableObject; import com.threerings.util.Name; @@ -44,20 +40,4 @@ public class ClientInfo extends SimpleStreamableObject { return username; } - - // AUTO-GENERATED: METHODS START - // from interface Streamable - public void readObject (ObjectInputStream ins) - throws IOException, ClassNotFoundException - { - username = (Name)ins.readObject(); - } - - // from interface Streamable - public void writeObject (ObjectOutputStream out) - throws IOException - { - out.writeObject(username); - } - // AUTO-GENERATED: METHODS END }