From f4e7fd73f65ceb04b923fa65e14cb73da3d42592 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Mon, 11 Sep 2006 20:19:11 +0000 Subject: [PATCH] Commented out upstream methods for classes that will never use them. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4367 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/crowd/data/BodyObject.as | 150 +++++++------- .../com/threerings/crowd/data/PlaceObject.as | 184 +++++++++--------- .../threerings/presents/data/ClientObject.as | 24 +-- .../com/threerings/presents/dobj/DObject.as | 5 +- .../presents/net/AuthResponseData.as | 12 +- 5 files changed, 188 insertions(+), 187 deletions(-) diff --git a/src/as/com/threerings/crowd/data/BodyObject.as b/src/as/com/threerings/crowd/data/BodyObject.as index d36c52b00..948b3966e 100644 --- a/src/as/com/threerings/crowd/data/BodyObject.as +++ b/src/as/com/threerings/crowd/data/BodyObject.as @@ -116,15 +116,81 @@ public class BodyObject extends ClientObject return username; } - override public function writeObject (out :ObjectOutputStream) :void - { - super.writeObject(out); - - out.writeObject(username); - out.writeInt(location); - out.writeByte(status); - out.writeField(awayMessage); - } +// // AUTO-GENERATED: METHODS START +// /** +// * Requests that the username field be set to the +// * specified value. The local value will be updated immediately and an +// * event will be propagated through the system to notify all listeners +// * that the attribute did change. Proxied copies of this object (on +// * clients) will apply the value change when they received the +// * attribute changed notification. +// */ +// public function setUsername (value :Name) :void +// { +// var ovalue :Name = this.username; +// requestAttributeChange( +// USERNAME, value, ovalue); +// this.username = value; +// } +// +// /** +// * Requests that the location field be set to the +// * specified value. The local value will be updated immediately and an +// * event will be propagated through the system to notify all listeners +// * that the attribute did change. Proxied copies of this object (on +// * clients) will apply the value change when they received the +// * attribute changed notification. +// */ +// public function setLocation (value :int) :void +// { +// var ovalue :int = this.location; +// requestAttributeChange( +// LOCATION, value, ovalue); +// this.location = value; +// } +// +// /** +// * Requests that the status field be set to the +// * specified value. The local value will be updated immediately and an +// * event will be propagated through the system to notify all listeners +// * that the attribute did change. Proxied copies of this object (on +// * clients) will apply the value change when they received the +// * attribute changed notification. +// */ +// public function setStatus (value :int) :void +// { +// var ovalue :int = this.status; +// requestAttributeChange( +// STATUS, Byte.valueOf(value), Byte.valueOf(ovalue)); +// this.status = value; +// } +// +// /** +// * Requests that the awayMessage field be set to the +// * specified value. The local value will be updated immediately and an +// * event will be propagated through the system to notify all listeners +// * that the attribute did change. Proxied copies of this object (on +// * clients) will apply the value change when they received the +// * attribute changed notification. +// */ +// public function setAwayMessage (value :String) :void +// { +// var ovalue :String = this.awayMessage; +// requestAttributeChange( +// AWAY_MESSAGE, value, ovalue); +// this.awayMessage = value; +// } +// // AUTO-GENERATED: METHODS END +// +// override public function writeObject (out :ObjectOutputStream) :void +// { +// super.writeObject(out); +// +// out.writeObject(username); +// out.writeInt(location); +// out.writeByte(status); +// out.writeField(awayMessage); +// } override public function readObject (ins :ObjectInputStream) :void { @@ -135,71 +201,5 @@ public class BodyObject extends ClientObject status = ins.readByte(); awayMessage = (ins.readField(String) as String); } - - // AUTO-GENERATED: METHODS START - /** - * Requests that the username field be set to the - * specified value. The local value will be updated immediately and an - * event will be propagated through the system to notify all listeners - * that the attribute did change. Proxied copies of this object (on - * clients) will apply the value change when they received the - * attribute changed notification. - */ - public function setUsername (value :Name) :void - { - var ovalue :Name = this.username; - requestAttributeChange( - USERNAME, value, ovalue); - this.username = value; - } - - /** - * Requests that the location field be set to the - * specified value. The local value will be updated immediately and an - * event will be propagated through the system to notify all listeners - * that the attribute did change. Proxied copies of this object (on - * clients) will apply the value change when they received the - * attribute changed notification. - */ - public function setLocation (value :int) :void - { - var ovalue :int = this.location; - requestAttributeChange( - LOCATION, value, ovalue); - this.location = value; - } - - /** - * Requests that the status field be set to the - * specified value. The local value will be updated immediately and an - * event will be propagated through the system to notify all listeners - * that the attribute did change. Proxied copies of this object (on - * clients) will apply the value change when they received the - * attribute changed notification. - */ - public function setStatus (value :int) :void - { - var ovalue :int = this.status; - requestAttributeChange( - STATUS, Byte.valueOf(value), Byte.valueOf(ovalue)); - this.status = value; - } - - /** - * Requests that the awayMessage field be set to the - * specified value. The local value will be updated immediately and an - * event will be propagated through the system to notify all listeners - * that the attribute did change. Proxied copies of this object (on - * clients) will apply the value change when they received the - * attribute changed notification. - */ - public function setAwayMessage (value :String) :void - { - var ovalue :String = this.awayMessage; - requestAttributeChange( - AWAY_MESSAGE, value, ovalue); - this.awayMessage = value; - } - // AUTO-GENERATED: METHODS END } } diff --git a/src/as/com/threerings/crowd/data/PlaceObject.as b/src/as/com/threerings/crowd/data/PlaceObject.as index deb6c419c..a2d0abf43 100644 --- a/src/as/com/threerings/crowd/data/PlaceObject.as +++ b/src/as/com/threerings/crowd/data/PlaceObject.as @@ -94,98 +94,98 @@ public class PlaceObject extends DObject return null; } - // AUTO-GENERATED: METHODS START - /** - * Requests that oid be added to the occupants - * oid list. The list will not change until the event is actually - * propagated through the system. - */ - public function addToOccupants (oid :int) :void - { - requestOidAdd(OCCUPANTS, oid); - } - - /** - * Requests that oid be removed from the - * occupants oid list. The list will not change until the - * event is actually propagated through the system. - */ - public function removeFromOccupants (oid :int) :void - { - requestOidRemove(OCCUPANTS, oid); - } - - /** - * Requests that the specified entry be added to the - * occupantInfo set. The set will not change until the event is - * actually propagated through the system. - */ - public function addToOccupantInfo (elem :DSet_Entry) :void - { - requestEntryAdd(OCCUPANT_INFO, elem); - } - - /** - * Requests that the entry matching the supplied key be removed from - * the occupantInfo set. The set will not change until the - * event is actually propagated through the system. - */ - public function removeFromOccupantInfo (key :Object) :void - { - requestEntryRemove(OCCUPANT_INFO, key); - } - - /** - * Requests that the specified entry be updated in the - * occupantInfo set. The set will not change until the event is - * actually propagated through the system. - */ - public function updateOccupantInfo (elem :DSet_Entry) :void - { - requestEntryUpdate(OCCUPANT_INFO, elem); - } - - /** - * Requests that the occupantInfo field be set to the - * specified value. Generally one only adds, updates and removes - * entries of a distributed set, but certain situations call for a - * complete replacement of the set value. The local value will be - * updated immediately and an event will be propagated through the - * system to notify all listeners that the attribute did - * change. Proxied copies of this object (on clients) will apply the - * value change when they received the attribute changed notification. - */ - public function setOccupantInfo (value :DSet) :void - { - requestAttributeChange(OCCUPANT_INFO, value, this.occupantInfo); - this.occupantInfo = (value == null) ? null : value; - } - - /** - * Requests that the speakService field be set to the - * specified value. The local value will be updated immediately and an - * event will be propagated through the system to notify all listeners - * that the attribute did change. Proxied copies of this object (on - * clients) will apply the value change when they received the - * attribute changed notification. - */ - public function setSpeakService (value :SpeakMarshaller) :void - { - var ovalue :SpeakMarshaller = this.speakService; - requestAttributeChange( - SPEAK_SERVICE, value, ovalue); - this.speakService = value; - } - // AUTO-GENERATED: METHODS END - - // documentation inherited - override public function writeObject (out :ObjectOutputStream) :void - { - super.writeObject(out); - out.writeObject(occupants); - out.writeObject(occupantInfo); - out.writeObject(speakService); - } +// // AUTO-GENERATED: METHODS START +// /** +// * Requests that oid be added to the occupants +// * oid list. The list will not change until the event is actually +// * propagated through the system. +// */ +// public function addToOccupants (oid :int) :void +// { +// requestOidAdd(OCCUPANTS, oid); +// } +// +// /** +// * Requests that oid be removed from the +// * occupants oid list. The list will not change until the +// * event is actually propagated through the system. +// */ +// public function removeFromOccupants (oid :int) :void +// { +// requestOidRemove(OCCUPANTS, oid); +// } +// +// /** +// * Requests that the specified entry be added to the +// * occupantInfo set. The set will not change until the event is +// * actually propagated through the system. +// */ +// public function addToOccupantInfo (elem :DSet_Entry) :void +// { +// requestEntryAdd(OCCUPANT_INFO, elem); +// } +// +// /** +// * Requests that the entry matching the supplied key be removed from +// * the occupantInfo set. The set will not change until the +// * event is actually propagated through the system. +// */ +// public function removeFromOccupantInfo (key :Object) :void +// { +// requestEntryRemove(OCCUPANT_INFO, key); +// } +// +// /** +// * Requests that the specified entry be updated in the +// * occupantInfo set. The set will not change until the event is +// * actually propagated through the system. +// */ +// public function updateOccupantInfo (elem :DSet_Entry) :void +// { +// requestEntryUpdate(OCCUPANT_INFO, elem); +// } +// +// /** +// * Requests that the occupantInfo field be set to the +// * specified value. Generally one only adds, updates and removes +// * entries of a distributed set, but certain situations call for a +// * complete replacement of the set value. The local value will be +// * updated immediately and an event will be propagated through the +// * system to notify all listeners that the attribute did +// * change. Proxied copies of this object (on clients) will apply the +// * value change when they received the attribute changed notification. +// */ +// public function setOccupantInfo (value :DSet) :void +// { +// requestAttributeChange(OCCUPANT_INFO, value, this.occupantInfo); +// this.occupantInfo = (value == null) ? null : value; +// } +// +// /** +// * Requests that the speakService field be set to the +// * specified value. The local value will be updated immediately and an +// * event will be propagated through the system to notify all listeners +// * that the attribute did change. Proxied copies of this object (on +// * clients) will apply the value change when they received the +// * attribute changed notification. +// */ +// public function setSpeakService (value :SpeakMarshaller) :void +// { +// var ovalue :SpeakMarshaller = this.speakService; +// requestAttributeChange( +// SPEAK_SERVICE, value, ovalue); +// this.speakService = value; +// } +// // AUTO-GENERATED: METHODS END +// +// // documentation inherited +// override public function writeObject (out :ObjectOutputStream) :void +// { +// super.writeObject(out); +// out.writeObject(occupants); +// out.writeObject(occupantInfo); +// out.writeObject(speakService); +// } // documentation inherited override public function readObject (ins :ObjectInputStream) :void diff --git a/src/as/com/threerings/presents/data/ClientObject.as b/src/as/com/threerings/presents/data/ClientObject.as index 3cba9dea9..2826be672 100644 --- a/src/as/com/threerings/presents/data/ClientObject.as +++ b/src/as/com/threerings/presents/data/ClientObject.as @@ -59,18 +59,6 @@ public class ClientObject extends DObject return "(" + getOid() + ")"; } - override public function writeObject (out :ObjectOutputStream) :void - { - super.writeObject(out); - out.writeObject(receivers); - } - - override public function readObject (ins :ObjectInputStream) :void - { - super.readObject(ins); - receivers = (ins.readObject() as DSet); - } - // AUTO-GENERATED: METHODS START public function addToReceivers (elem :DSet_Entry) :void { @@ -94,5 +82,17 @@ public class ClientObject extends DObject : (ObjectUtil.copy(value) as DSet); } // AUTO-GENERATED: METHODS END + +// override public function writeObject (out :ObjectOutputStream) :void +// { +// super.writeObject(out); +// out.writeObject(receivers); +// } + + override public function readObject (ins :ObjectInputStream) :void + { + super.readObject(ins); + receivers = (ins.readObject() as DSet); + } } } diff --git a/src/as/com/threerings/presents/dobj/DObject.as b/src/as/com/threerings/presents/dobj/DObject.as index 47b525820..e4516464c 100644 --- a/src/as/com/threerings/presents/dobj/DObject.as +++ b/src/as/com/threerings/presents/dobj/DObject.as @@ -264,9 +264,10 @@ public class DObject // extends EventDispatcher } // documentation inherited from interface Streamable - public function writeObject (out :ObjectOutputStream) :void + public final function writeObject (out :ObjectOutputStream) :void { - out.writeInt(_oid); + throw new Error(); +// out.writeInt(_oid); } // documentation inherited from interface Streamable diff --git a/src/as/com/threerings/presents/net/AuthResponseData.as b/src/as/com/threerings/presents/net/AuthResponseData.as index 267b5d2c1..bc13742b3 100644 --- a/src/as/com/threerings/presents/net/AuthResponseData.as +++ b/src/as/com/threerings/presents/net/AuthResponseData.as @@ -14,12 +14,12 @@ public class AuthResponseData extends DObject * why the authentication failed. */ public var code :String; - // documentation inherited - override public function writeObject (out :ObjectOutputStream) :void - { - super.writeObject(out); - out.writeField(code); - } +// // documentation inherited +// override public function writeObject (out :ObjectOutputStream) :void +// { +// super.writeObject(out); +// out.writeField(code); +// } // documentation inherited override public function readObject (ins :ObjectInputStream) :void