Scratch that. The plot is thicker. I'll have to take the pain to support mixed
readObject()/no-readObject() havers otherwise everyone everywhere will have to generate streamer methods which is way too big a PITA. Grumble. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4690 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user