AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scratch that. The plot is thicker. I'll have to take the pain to support mixed

Browse Source 
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:
Michael Bayne
2007-05-04 22:25:41 +00:00
parent a60a71552a
commit ae1e7dc4a8
11 changed files with 0 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/crowd/chat/data/ChatMessage.java
-22
View File
@@ -21,12 +21,8 @@
package com.threerings.crowd.chat.data; package com.threerings.crowd.chat.data;
import java.io.IOException;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.Streamable; import com.threerings.io.Streamable;
/** /**
@@ -91,22 +87,4 @@ public abstract class ChatMessage
{ {
return StringUtil.shortClassName(this) + StringUtil.fieldsToString(this); 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
} }
src/java/com/threerings/crowd/chat/data/SystemMessage.java
-23
View File
@@ -21,11 +21,6 @@
package com.threerings.crowd.chat.data; 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 * A ChatMessage that represents a message that came from the server and did not result from direct
* user action. * user action.
@@ -58,22 +53,4 @@ public class SystemMessage extends ChatMessage
super(message, bundle); super(message, bundle);
this.attentionLevel = attentionLevel; 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
} }
src/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java
-22
View File
@@ -21,10 +21,6 @@
package com.threerings.crowd.chat.data; 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; import com.threerings.util.Name;
/** /**
@@ -56,23 +52,5 @@ public class TellFeedbackMessage extends UserMessage
return _failure ? null : "m.told_format"; 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; protected boolean _failure;
} }
src/java/com/threerings/crowd/chat/data/UserMessage.java
-24
View File
@@ -21,10 +21,6 @@
package com.threerings.crowd.chat.data; 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; import com.threerings.util.Name;
/** /**
@@ -90,24 +86,4 @@ public class UserMessage extends ChatMessage
} }
return "m.speak_format"; 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
} }
src/java/com/threerings/crowd/chat/data/UserSystemMessage.java
-22
View File
@@ -21,10 +21,6 @@
package com.threerings.crowd.chat.data; 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; import com.threerings.util.Name;
/** /**
@@ -57,22 +53,4 @@ public class UserSystemMessage extends SystemMessage
super(message, bundle, attentionLevel); super(message, bundle, attentionLevel);
this.speaker = sender; 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
} }
src/java/com/threerings/crowd/data/OccupantInfo.java
-24
View File
@@ -21,10 +21,6 @@
package com.threerings.crowd.data; 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.io.SimpleStreamableObject;
import com.threerings.util.Name; import com.threerings.util.Name;
@@ -107,24 +103,4 @@ public class OccupantInfo extends SimpleStreamableObject
throw new RuntimeException(cnse); 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
} }
src/java/com/threerings/crowd/data/TokenRing.java
-20
View File
@@ -21,10 +21,6 @@
package com.threerings.crowd.data; 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.io.SimpleStreamableObject;
/** /**
@@ -114,22 +110,6 @@ public class TokenRing extends SimpleStreamableObject
_tokens &= ~token; _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). */ /** The tokens contained in this ring (composed together bitwise). */
protected int _tokens; protected int _tokens;
} }
src/java/com/threerings/crowd/peer/data/CrowdClientInfo.java
-20
View File
@@ -21,10 +21,6 @@
package com.threerings.crowd.peer.data; 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.util.Name;
import com.threerings.presents.peer.data.ClientInfo; import com.threerings.presents.peer.data.ClientInfo;
@@ -46,20 +42,4 @@ public class CrowdClientInfo extends ClientInfo
// makes lookups much more efficient // makes lookups much more efficient
return visibleName; 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
} }
src/java/com/threerings/presents/data/ConMgrStats.java
-38
View File
@@ -21,10 +21,6 @@
package com.threerings.presents.data; package com.threerings.presents.data;
import java.io.IOException;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.SimpleStreamableObject; import com.threerings.io.SimpleStreamableObject;
/** /**
@@ -74,38 +70,4 @@ public class ConMgrStats extends SimpleStreamableObject
throw new RuntimeException(cnse); 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
} }
src/java/com/threerings/presents/data/InvocationMarshaller.java
-22
View File
@@ -21,12 +21,8 @@
package com.threerings.presents.data; package com.threerings.presents.data;
import java.io.IOException;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.Streamable; import com.threerings.io.Streamable;
import com.threerings.presents.Log; import com.threerings.presents.Log;
@@ -246,24 +242,6 @@ public class InvocationMarshaller
return "[invOid=" + _invOid + ", code=" + _invCode + ", type=" + getClass().getName() + "]"; 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 * Called by generated invocation marshaller code; packages up and sends the specified
* invocation service request. * invocation service request.
src/java/com/threerings/presents/peer/data/ClientInfo.java
-20
View File
@@ -21,10 +21,6 @@
package com.threerings.presents.peer.data; 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.io.SimpleStreamableObject;
import com.threerings.util.Name; import com.threerings.util.Name;
@@ -44,20 +40,4 @@ public class ClientInfo extends SimpleStreamableObject
{ {
return username; 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
} }