diff --git a/src/as/com/threerings/crowd/chat/client/ChatDirector.as b/src/as/com/threerings/crowd/chat/client/ChatDirector.as index ca34e1a8b..c526e0b22 100644 --- a/src/as/com/threerings/crowd/chat/client/ChatDirector.as +++ b/src/as/com/threerings/crowd/chat/client/ChatDirector.as @@ -629,7 +629,7 @@ public class ChatDirector extends BasicDirector } // documentation inherited - public override function clientDidLogon (event :ClientEvent) :void + override public function clientDidLogon (event :ClientEvent) :void { super.clientDidLogon(event); @@ -639,7 +639,7 @@ public class ChatDirector extends BasicDirector } // documentation inherited - public override function clientObjectDidChange (event :ClientEvent) :void + override public function clientObjectDidChange (event :ClientEvent) :void { super.clientObjectDidChange(event); @@ -652,7 +652,7 @@ public class ChatDirector extends BasicDirector } // documentation inherited - public override function clientDidLogoff (event :ClientEvent) :void + override public function clientDidLogoff (event :ClientEvent) :void { super.clientDidLogoff(event); @@ -960,7 +960,7 @@ public class ChatDirector extends BasicDirector } // documentation inherited from interface - protected override function fetchServices (client :Client) :void + override protected function fetchServices (client :Client) :void { // get a handle on our chat service _cservice = (client.requireService(ChatService) as ChatService); diff --git a/src/as/com/threerings/crowd/chat/client/ClearHandler.as b/src/as/com/threerings/crowd/chat/client/ClearHandler.as index aed5ab1cc..a80b77a10 100644 --- a/src/as/com/threerings/crowd/chat/client/ClearHandler.as +++ b/src/as/com/threerings/crowd/chat/client/ClearHandler.as @@ -6,7 +6,7 @@ import com.threerings.crowd.chat.data.ChatCodes; public class ClearHandler extends CommandHandler { - public override function handleCommand ( + override public function handleCommand ( ctx :CrowdContext, speakSvc :SpeakService, cmd :String, args :String, history :Array) :String { diff --git a/src/as/com/threerings/crowd/chat/client/EmoteHandler.as b/src/as/com/threerings/crowd/chat/client/EmoteHandler.as index 5cd919ee8..429e5d0c6 100644 --- a/src/as/com/threerings/crowd/chat/client/EmoteHandler.as +++ b/src/as/com/threerings/crowd/chat/client/EmoteHandler.as @@ -8,7 +8,7 @@ import com.threerings.crowd.chat.data.ChatCodes; public class EmoteHandler extends CommandHandler { - public override function handleCommand ( + override public function handleCommand ( ctx :CrowdContext, speakSvc :SpeakService, cmd :String, args :String, history :Array) :String { diff --git a/src/as/com/threerings/crowd/chat/client/HelpHandler.as b/src/as/com/threerings/crowd/chat/client/HelpHandler.as index 676e710ff..8d45c17ab 100644 --- a/src/as/com/threerings/crowd/chat/client/HelpHandler.as +++ b/src/as/com/threerings/crowd/chat/client/HelpHandler.as @@ -10,7 +10,7 @@ import com.threerings.crowd.chat.data.ChatCodes; public class HelpHandler extends CommandHandler { - public override function handleCommand ( + override public function handleCommand ( ctx :CrowdContext, speakSvc :SpeakService, cmd :String, args :String, history :Array) :String { diff --git a/src/as/com/threerings/crowd/chat/client/SpeakHandler.as b/src/as/com/threerings/crowd/chat/client/SpeakHandler.as index 79d026ebb..5e492918a 100644 --- a/src/as/com/threerings/crowd/chat/client/SpeakHandler.as +++ b/src/as/com/threerings/crowd/chat/client/SpeakHandler.as @@ -8,7 +8,7 @@ import com.threerings.crowd.chat.data.ChatCodes; public class SpeakHandler extends CommandHandler { - public override function handleCommand ( + override public function handleCommand ( ctx :CrowdContext, speakSvc :SpeakService, cmd :String, args :String, history :Array) :String { diff --git a/src/as/com/threerings/crowd/chat/client/TellHandler.as b/src/as/com/threerings/crowd/chat/client/TellHandler.as index e79d2b9ce..c2277765b 100644 --- a/src/as/com/threerings/crowd/chat/client/TellHandler.as +++ b/src/as/com/threerings/crowd/chat/client/TellHandler.as @@ -9,7 +9,7 @@ import com.threerings.crowd.chat.data.ChatCodes; public class TellHandler extends CommandHandler { - public override function handleCommand ( + override public function handleCommand ( ctx :CrowdContext, speakSvc :SpeakService, cmd :String, args :String, history :Array) :String { diff --git a/src/as/com/threerings/crowd/chat/client/ThinkHandler.as b/src/as/com/threerings/crowd/chat/client/ThinkHandler.as index 21fdfd826..390ac27e3 100644 --- a/src/as/com/threerings/crowd/chat/client/ThinkHandler.as +++ b/src/as/com/threerings/crowd/chat/client/ThinkHandler.as @@ -8,7 +8,7 @@ import com.threerings.crowd.chat.data.ChatCodes; public class ThinkHandler extends CommandHandler { - public override function handleCommand ( + override public function handleCommand ( ctx :CrowdContext, speakSvc :SpeakService, cmd :String, args :String, history :Array) :String { diff --git a/src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as b/src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as index af4f2bcc2..19062d8ad 100644 --- a/src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as +++ b/src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as @@ -13,7 +13,7 @@ public class ChatMarshaller_TellMarshaller extends InvocationMarshaller_Listener public static const TELL_SUCCEEDED :int = 1; // documentation inherited - public override function dispatchResponse (methodId :int, args :Array) :void + override public function dispatchResponse (methodId :int, args :Array) :void { switch (methodId) { case TELL_SUCCEEDED: diff --git a/src/as/com/threerings/crowd/chat/data/SystemMessage.as b/src/as/com/threerings/crowd/chat/data/SystemMessage.as index acade05b7..b2c255dfa 100644 --- a/src/as/com/threerings/crowd/chat/data/SystemMessage.as +++ b/src/as/com/threerings/crowd/chat/data/SystemMessage.as @@ -51,13 +51,13 @@ public class SystemMessage extends ChatMessage this.attentionLevel = attLevel; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); attentionLevel = ins.readByte(); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeByte(attentionLevel); diff --git a/src/as/com/threerings/crowd/chat/data/UserMessage.as b/src/as/com/threerings/crowd/chat/data/UserMessage.as index 930141f00..73a66b5f3 100644 --- a/src/as/com/threerings/crowd/chat/data/UserMessage.as +++ b/src/as/com/threerings/crowd/chat/data/UserMessage.as @@ -37,14 +37,14 @@ public class UserMessage extends ChatMessage /** The mode of the message. @see ChatCodes.DEFAULT_MODE */ public var mode :int; - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); speaker = (ins.readObject() as Name); mode = ins.readByte(); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(speaker); diff --git a/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as b/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as index 1b630f982..a85e95c67 100644 --- a/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as +++ b/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as @@ -30,13 +30,13 @@ public class UserSystemMessage extends SystemMessage this.speaker = sender; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); speaker = (ins.readObject() as Name); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(speaker); diff --git a/src/as/com/threerings/crowd/client/LocationDecoder.as b/src/as/com/threerings/crowd/client/LocationDecoder.as index 5fce22e3d..c1bbae00a 100644 --- a/src/as/com/threerings/crowd/client/LocationDecoder.as +++ b/src/as/com/threerings/crowd/client/LocationDecoder.as @@ -46,13 +46,13 @@ public class LocationDecoder extends InvocationDecoder } // documentation inherited - public override function getReceiverCode () :String + override public function getReceiverCode () :String { return RECEIVER_CODE; } // documentation inherited - public override function dispatchNotification ( + override public function dispatchNotification ( methodId :int, args :Array) :void { switch (methodId) { diff --git a/src/as/com/threerings/crowd/client/LocationDirector.as b/src/as/com/threerings/crowd/client/LocationDirector.as index 7c5229351..c29102b10 100644 --- a/src/as/com/threerings/crowd/client/LocationDirector.as +++ b/src/as/com/threerings/crowd/client/LocationDirector.as @@ -383,7 +383,7 @@ public class LocationDirector extends BasicDirector } // documentation inherited from interface - public override function clientDidLogon (event :ClientEvent) :void + override public function clientDidLogon (event :ClientEvent) :void { super.clientDidLogon(event); @@ -404,7 +404,7 @@ public class LocationDirector extends BasicDirector } // documentation inherited - public override function clientDidLogoff (event :ClientEvent) :void + override public function clientDidLogoff (event :ClientEvent) :void { super.clientDidLogoff(event); @@ -424,7 +424,7 @@ public class LocationDirector extends BasicDirector } // documentation inherited - protected override function fetchServices (client :Client) :void + override protected function fetchServices (client :Client) :void { // obtain our service handle _lservice = diff --git a/src/as/com/threerings/crowd/client/OccupantDirector.as b/src/as/com/threerings/crowd/client/OccupantDirector.as index e809b9a02..a05232531 100644 --- a/src/as/com/threerings/crowd/client/OccupantDirector.as +++ b/src/as/com/threerings/crowd/client/OccupantDirector.as @@ -111,7 +111,7 @@ public class OccupantDirector extends BasicDirector } // documentation inherited - public override function clientDidLogoff (event :ClientEvent) :void + override public function clientDidLogoff (event :ClientEvent) :void { super.clientDidLogoff(event); // clear things out diff --git a/src/as/com/threerings/crowd/data/BodyObject.as b/src/as/com/threerings/crowd/data/BodyObject.as index faeb99502..f9ba8baa7 100644 --- a/src/as/com/threerings/crowd/data/BodyObject.as +++ b/src/as/com/threerings/crowd/data/BodyObject.as @@ -76,36 +76,36 @@ public class BodyObject extends ClientObject */ public var awayMessage :String; -// /** -// * Checks whether or not this user has access to the specified -// * feature. Currently used by the chat system to regulate access to -// * chat broadcasts but also forms the basis of an extensible -// * fine-grained permissions system. -// * -// * @return null if the user has access, a fully-qualified translatable -// * message string indicating the reason for denial of access (or just -// * {@link InvocationCodes#ACCESS_DENIED} if you don't want to be -// * specific). -// */ -// public String checkAccess (String feature, Object context) -// { -// // our default access control policy; how quaint -// if (ChatCodes.BROADCAST_ACCESS.equals(feature)) { -// return getTokens().isAdmin() ? null : ChatCodes.ACCESS_DENIED; -// } else if (ChatCodes.CHAT_ACCESS.equals(feature)) { -// return null; -// } else { -// return InvocationCodes.ACCESS_DENIED; -// } -// } -// -// /** -// * Returns this user's access control tokens. -// */ -// public TokenRing getTokens () -// { -// return EMPTY_TOKENS; -// } + /** + * Checks whether or not this user has access to the specified + * feature. Currently used by the chat system to regulate access to + * chat broadcasts but also forms the basis of an extensible + * fine-grained permissions system. + * + * @return null if the user has access, a fully-qualified translatable + * message string indicating the reason for denial of access (or just + * {@link InvocationCodes#ACCESS_DENIED} if you don't want to be + * specific). + */ + public function checkAccess (feature :String, context :Object) :String + { + // our default access control policy; how quaint + if (ChatCodes.BROADCAST_ACCESS == feature) { + return getTokens().isAdmin() ? null : InvocationCodes.ACCESS_DENIED; + } else if (ChatCodes.CHAT_ACCESS == feature) { + return null; + } else { + return InvocationCodes.ACCESS_DENIED; + } + } + + /** + * Returns this user's access control tokens. + */ + public function getTokens () :TokenRing + { + return new TokenRing(); + } /** * Returns the name that should be displayed to other users and used for @@ -116,7 +116,7 @@ public class BodyObject extends ClientObject return username; } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); @@ -126,7 +126,7 @@ public class BodyObject extends ClientObject out.writeField(awayMessage); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); diff --git a/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as b/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as index 5b8683acf..35f0345bd 100644 --- a/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as +++ b/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as @@ -11,7 +11,7 @@ public class LocationMarshaller_MoveMarshaller extends InvocationMarshaller_List public static const MOVE_SUCCEEDED :int = 1; // documentation inherited - public override function dispatchResponse (methodId :int, args :Array) :void + override public function dispatchResponse (methodId :int, args :Array) :void { switch (methodId) { case MOVE_SUCCEEDED: diff --git a/src/as/com/threerings/crowd/data/PlaceObject.as b/src/as/com/threerings/crowd/data/PlaceObject.as index e54bc3fa8..deb6c419c 100644 --- a/src/as/com/threerings/crowd/data/PlaceObject.as +++ b/src/as/com/threerings/crowd/data/PlaceObject.as @@ -179,7 +179,7 @@ public class PlaceObject extends DObject // AUTO-GENERATED: METHODS END // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(occupants); @@ -188,7 +188,7 @@ public class PlaceObject extends DObject } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); occupants = (ins.readObject() as OidList); diff --git a/src/as/com/threerings/crowd/data/TokenRing.as b/src/as/com/threerings/crowd/data/TokenRing.as new file mode 100644 index 000000000..cc1b45105 --- /dev/null +++ b/src/as/com/threerings/crowd/data/TokenRing.as @@ -0,0 +1,108 @@ +// +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +package com.threerings.crowd.data { + +import com.threerings.io.ObjectInputStream; +import com.threerings.io.ObjectOutputStream; +import com.threerings.io.Streamable; + +/** + * Defines access control tokens that convey certain privileges to users + * (see {@link BodyObject#checkAccess}). + */ +public class TokenRing + implements Streamable +{ + /** Indicates that this user is an administrator and can do things + * like broadcast, shutdown the server and whatnot. */ + public static const ADMIN :int = (1 << 0); + + /** + * Constructs a token ring with the supplied set of tokens. + */ + public function TokenRing (tokens :int = 0) + { + _tokens = tokens; + } + + /** + * Returns true if this token ring contains the specified token. + */ + public function holdsToken (token :int) :Boolean + { + return (_tokens & token) != 0; + } + + /** + * Convenience function for checking whether this ring holds the + * {@link #ADMIN} token. + */ + public function isAdmin () :Boolean + { + return holdsToken(ADMIN); + } + + /** + * Returns the bitmask that stores the various tokens. + */ + public function getTokens () :int + { + return _tokens; + } + + /** + * Adds the specified token to this ring. + */ + public function setToken (token :int, setOn :Boolean = true) :void + { + if (setOn) { + _tokens |= token; + + } else { + clearToken(token); + } + } + + /** + * Clears the specified token from this ring. + */ + public function clearToken (token :int) :void + { + _tokens &= ~token; + } + + // documentation inherited from interface Streamable + public function writeObject (out :ObjectOutputStream) :void + { + out.writeInt(_tokens); + } + + // documentation inherited from interface Streamable + public function readObject (ins :ObjectInputStream) :void + { + _tokens = ins.readInt(); + } + + /** The tokens contained in this ring (composed together bitwise). */ + protected var _tokens :int; +} +} diff --git a/src/as/com/threerings/events/ControllerEvent.as b/src/as/com/threerings/events/ControllerEvent.as index ecb97cd6e..5dff9ddb9 100644 --- a/src/as/com/threerings/events/ControllerEvent.as +++ b/src/as/com/threerings/events/ControllerEvent.as @@ -17,12 +17,12 @@ public class ControllerEvent extends Event this.arg = arg; } - public override function clone () :Event + override public function clone () :Event { return new ControllerEvent(command, arg); } - public override function toString () :String + override public function toString () :String { return "ControllerEvent[" + command + " (" + arg + ")]"; } diff --git a/src/as/com/threerings/io/streamers/ArrayStreamer.as b/src/as/com/threerings/io/streamers/ArrayStreamer.as index 5d9aa2978..5136de1cc 100644 --- a/src/as/com/threerings/io/streamers/ArrayStreamer.as +++ b/src/as/com/threerings/io/streamers/ArrayStreamer.as @@ -39,7 +39,7 @@ public class ArrayStreamer extends Streamer } } - public override function isStreamerFor (obj :Object) :Boolean + override public function isStreamerFor (obj :Object) :Boolean { if (_jname === "[Ljava.lang.Object;") { // we fall back to streaming any array as Object @@ -51,7 +51,7 @@ public class ArrayStreamer extends Streamer } } - public override function isStreamerForClass (clazz :Class) :Boolean + override public function isStreamerForClass (clazz :Class) :Boolean { if (_jname === "[Ljava.lang.Object;") { return (clazz != TypedArray) && @@ -64,14 +64,14 @@ public class ArrayStreamer extends Streamer } } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { var ta :TypedArray = new TypedArray(_jname); ta.length = ins.readInt(); return ta; } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var arr :Array = (obj as Array); @@ -104,7 +104,7 @@ public class ArrayStreamer extends Streamer } } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { var arr :Array = (obj as Array); diff --git a/src/as/com/threerings/io/streamers/ByteArrayStreamer.as b/src/as/com/threerings/io/streamers/ByteArrayStreamer.as index a783c8174..897ec35fc 100644 --- a/src/as/com/threerings/io/streamers/ByteArrayStreamer.as +++ b/src/as/com/threerings/io/streamers/ByteArrayStreamer.as @@ -16,14 +16,14 @@ public class ByteArrayStreamer extends Streamer super(ByteArray, "[B"); // yes, that's the Java class for a byte[]. } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { var bytes :ByteArray = new ByteArray(); bytes.length = ins.readInt(); return bytes; } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var bytes :ByteArray = (obj as ByteArray); @@ -31,7 +31,7 @@ public class ByteArrayStreamer extends Streamer out.writeBytes(bytes); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { var bytes :ByteArray = (obj as ByteArray); diff --git a/src/as/com/threerings/io/streamers/ByteStreamer.as b/src/as/com/threerings/io/streamers/ByteStreamer.as index cab7f0a28..3c629e213 100644 --- a/src/as/com/threerings/io/streamers/ByteStreamer.as +++ b/src/as/com/threerings/io/streamers/ByteStreamer.as @@ -16,19 +16,19 @@ public class ByteStreamer extends Streamer super(Byte, "java.lang.Byte"); } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { return new Byte(ins.readByte()); } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var byte :Byte = (obj as Byte); out.writeByte(byte.value); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { // unneeded, done in createObject diff --git a/src/as/com/threerings/io/streamers/FloatStreamer.as b/src/as/com/threerings/io/streamers/FloatStreamer.as index 67d6cffc1..25911a581 100644 --- a/src/as/com/threerings/io/streamers/FloatStreamer.as +++ b/src/as/com/threerings/io/streamers/FloatStreamer.as @@ -16,19 +16,19 @@ public class FloatStreamer extends Streamer super(Float, "java.lang.Float"); } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { return new Float(ins.readFloat()); } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var float :Float = (obj as Float); out.writeFloat(float.value); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { // unneeded, done in createObject diff --git a/src/as/com/threerings/io/streamers/IntegerStreamer.as b/src/as/com/threerings/io/streamers/IntegerStreamer.as index 7fb6fd0b4..fc89fc976 100644 --- a/src/as/com/threerings/io/streamers/IntegerStreamer.as +++ b/src/as/com/threerings/io/streamers/IntegerStreamer.as @@ -16,19 +16,19 @@ public class IntegerStreamer extends Streamer super(Integer, "java.lang.Integer"); } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { return new Integer(ins.readInt()); } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var inty :Integer = (obj as Integer); out.writeInt(inty.value); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { // unneeded, done in createObject diff --git a/src/as/com/threerings/io/streamers/LongStreamer.as b/src/as/com/threerings/io/streamers/LongStreamer.as index 2d150799e..025704831 100644 --- a/src/as/com/threerings/io/streamers/LongStreamer.as +++ b/src/as/com/threerings/io/streamers/LongStreamer.as @@ -16,12 +16,12 @@ public class LongStreamer extends Streamer super(Long, "java.lang.Long"); } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { return new Long(0); } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var longy :Long = (obj as Long); @@ -29,7 +29,7 @@ public class LongStreamer extends Streamer out.writeInt(longy.high); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { var longy :Long = (obj as Long); diff --git a/src/as/com/threerings/io/streamers/NumberStreamer.as b/src/as/com/threerings/io/streamers/NumberStreamer.as index 42f38d57a..fbf52739c 100644 --- a/src/as/com/threerings/io/streamers/NumberStreamer.as +++ b/src/as/com/threerings/io/streamers/NumberStreamer.as @@ -14,19 +14,19 @@ public class NumberStreamer extends Streamer super(Number, "java.lang.Double"); } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { return ins.readDouble(); } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var n :Number = (obj as Number); out.writeDouble(n); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { // nothing here, the Number is fully read in createObject() diff --git a/src/as/com/threerings/io/streamers/ShortStreamer.as b/src/as/com/threerings/io/streamers/ShortStreamer.as index e7e0dba64..64e107263 100644 --- a/src/as/com/threerings/io/streamers/ShortStreamer.as +++ b/src/as/com/threerings/io/streamers/ShortStreamer.as @@ -16,19 +16,19 @@ public class ShortStreamer extends Streamer super(Short, "java.lang.Short"); } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { return new Short(ins.readShort()); } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var short :Short = (obj as Short); out.writeShort(short.value); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { // unneeded, done in createObject diff --git a/src/as/com/threerings/io/streamers/StringStreamer.as b/src/as/com/threerings/io/streamers/StringStreamer.as index d62b4f149..d22158939 100644 --- a/src/as/com/threerings/io/streamers/StringStreamer.as +++ b/src/as/com/threerings/io/streamers/StringStreamer.as @@ -14,19 +14,19 @@ public class StringStreamer extends Streamer super(String, "java.lang.String"); } - public override function createObject (ins :ObjectInputStream) :Object + override public function createObject (ins :ObjectInputStream) :Object { return ins.readUTF(); } - public override function writeObject (obj :Object, out :ObjectOutputStream) + override public function writeObject (obj :Object, out :ObjectOutputStream) :void { var s :String = (obj as String); out.writeUTF(s); } - public override function readObject (obj :Object, ins :ObjectInputStream) + override public function readObject (obj :Object, ins :ObjectInputStream) :void { // nothing here, the String is fully read in createObject() diff --git a/src/as/com/threerings/presents/client/TestClient.as b/src/as/com/threerings/presents/client/TestClient.as index b658f5275..149fed1ea 100644 --- a/src/as/com/threerings/presents/client/TestClient.as +++ b/src/as/com/threerings/presents/client/TestClient.as @@ -126,7 +126,7 @@ public class TestClient extends Client //var ta3 :TypedArray = new TypedArray(Pork); } - public override function gotBootstrap ( + override public function gotBootstrap ( data :BootstrapData, omgr :DObjectManager) :void { _listy.addItemAt("new item 0", 0); @@ -231,7 +231,7 @@ final class HooperClass extends HelperClass super(cli); } - public override function hype () :void + override public function hype () :void { Log.getLog(this).debug("hooper hype"); } diff --git a/src/as/com/threerings/presents/data/ClientObject.as b/src/as/com/threerings/presents/data/ClientObject.as index aa38b4d13..d430b2f35 100644 --- a/src/as/com/threerings/presents/data/ClientObject.as +++ b/src/as/com/threerings/presents/data/ClientObject.as @@ -58,13 +58,13 @@ public class ClientObject extends DObject return "(" + getOid() + ")"; } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(receivers); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); receivers = (ins.readObject() as DSet); diff --git a/src/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as b/src/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as index 34d035ce0..417000f9e 100644 --- a/src/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as +++ b/src/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as @@ -15,7 +15,7 @@ public class InvocationMarshaller_ConfirmMarshaller } // documetnation inherited - public override function dispatchResponse (methodId :int, args :Array) :void + override public function dispatchResponse (methodId :int, args :Array) :void { switch (methodId) { case REQUEST_PROCESSED: diff --git a/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as b/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as index b8596463f..12bd60699 100644 --- a/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as +++ b/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as @@ -17,7 +17,7 @@ public class TimeBaseMarshaller_GotTimeBaseMarshaller // callerOid, requestId, GOT_TIME_OID, [ arg1 ])); } - public override function dispatchResponse (methodId :int, args :Array) :void + override public function dispatchResponse (methodId :int, args :Array) :void { switch (methodId) { case GOT_TIME_OID: diff --git a/src/as/com/threerings/presents/dobj/AttributeChangedEvent.as b/src/as/com/threerings/presents/dobj/AttributeChangedEvent.as index ddfa116bc..fb71b5a93 100644 --- a/src/as/com/threerings/presents/dobj/AttributeChangedEvent.as +++ b/src/as/com/threerings/presents/dobj/AttributeChangedEvent.as @@ -35,7 +35,7 @@ public class AttributeChangedEvent extends NamedEvent /** * Applies this attribute change to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { // if we have no old value, that means we're not running on the @@ -83,7 +83,7 @@ public class AttributeChangedEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is AttributeChangeListener) { listener.attributeChanged(this); @@ -91,20 +91,20 @@ public class AttributeChangedEvent extends NamedEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("CHANGE:"); super.toStringBuf(buf); buf.append(", value=", _value); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(_value); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _value = ins.readObject(); diff --git a/src/as/com/threerings/presents/dobj/CompoundEvent.as b/src/as/com/threerings/presents/dobj/CompoundEvent.as index 6654d49e7..5ababd9e0 100644 --- a/src/as/com/threerings/presents/dobj/CompoundEvent.as +++ b/src/as/com/threerings/presents/dobj/CompoundEvent.as @@ -120,7 +120,7 @@ public class CompoundEvent extends DEvent /** * Nothing to apply here. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { return false; @@ -138,7 +138,7 @@ public class CompoundEvent extends DEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("COMPOUND:"); super.toStringBuf(buf); @@ -148,13 +148,13 @@ public class CompoundEvent extends DEvent } } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(_events); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _events = (ins.readObject() as StreamableArrayList); diff --git a/src/as/com/threerings/presents/dobj/ElementUpdatedEvent.as b/src/as/com/threerings/presents/dobj/ElementUpdatedEvent.as index 59c5246de..1ae6781e7 100644 --- a/src/as/com/threerings/presents/dobj/ElementUpdatedEvent.as +++ b/src/as/com/threerings/presents/dobj/ElementUpdatedEvent.as @@ -69,7 +69,7 @@ public class ElementUpdatedEvent extends NamedEvent /** * Applies this element update to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { if (_oldValue === UNSET_OLD_ENTRY) { @@ -80,7 +80,7 @@ public class ElementUpdatedEvent extends NamedEvent } // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(_value); @@ -88,7 +88,7 @@ public class ElementUpdatedEvent extends NamedEvent } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _value = ins.readObject(); @@ -96,7 +96,7 @@ public class ElementUpdatedEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is ElementUpdateListener) { listener.elementUpdated(this); @@ -104,7 +104,7 @@ public class ElementUpdatedEvent extends NamedEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("UPDATE:"); super.toStringBuf(buf); diff --git a/src/as/com/threerings/presents/dobj/EntryAddedEvent.as b/src/as/com/threerings/presents/dobj/EntryAddedEvent.as index da5d93924..39d405185 100644 --- a/src/as/com/threerings/presents/dobj/EntryAddedEvent.as +++ b/src/as/com/threerings/presents/dobj/EntryAddedEvent.as @@ -42,7 +42,7 @@ public class EntryAddedEvent extends NamedEvent /** * Applies this event to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { var added :Boolean = target[_name].add(_entry); @@ -54,7 +54,7 @@ public class EntryAddedEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is SetListener) { listener.entryAdded(this); @@ -62,20 +62,20 @@ public class EntryAddedEvent extends NamedEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("ELADD:"); super.toStringBuf(buf); buf.append(", entry=", _entry); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(_entry); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _entry = (ins.readObject() as DSet_Entry); diff --git a/src/as/com/threerings/presents/dobj/EntryRemovedEvent.as b/src/as/com/threerings/presents/dobj/EntryRemovedEvent.as index bf2fd41d5..c16a5d6a4 100644 --- a/src/as/com/threerings/presents/dobj/EntryRemovedEvent.as +++ b/src/as/com/threerings/presents/dobj/EntryRemovedEvent.as @@ -56,7 +56,7 @@ public class EntryRemovedEvent extends NamedEvent /** * Applies this event to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { if (_oldEntry == UNSET_OLD_ENTRY) { @@ -74,7 +74,7 @@ public class EntryRemovedEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is SetListener) { listener.entryRemoved(this); @@ -82,20 +82,20 @@ public class EntryRemovedEvent extends NamedEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("ELREM:"); super.toStringBuf(buf); buf.append(", key=", _key); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(_key); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _key = ins.readObject(); diff --git a/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as b/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as index ce1dc152a..12bb6f623 100644 --- a/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as +++ b/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as @@ -55,7 +55,7 @@ public class EntryUpdatedEvent extends NamedEvent /** * Applies this event to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { // only apply the change if we haven't already @@ -74,7 +74,7 @@ public class EntryUpdatedEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is SetListener) { listener.entryUpdated(this); @@ -82,20 +82,20 @@ public class EntryUpdatedEvent extends NamedEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("ELUPD:"); super.toStringBuf(buf); buf.append(", entry=", _entry); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(_entry); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _entry = (ins.readObject() as DSet_Entry); diff --git a/src/as/com/threerings/presents/dobj/InvocationNotificationEvent.as b/src/as/com/threerings/presents/dobj/InvocationNotificationEvent.as index 03b8c755a..85f27d2c3 100644 --- a/src/as/com/threerings/presents/dobj/InvocationNotificationEvent.as +++ b/src/as/com/threerings/presents/dobj/InvocationNotificationEvent.as @@ -84,7 +84,7 @@ public class InvocationNotificationEvent extends DEvent /** * Applies this attribute change to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { // nothing to do here @@ -92,13 +92,13 @@ public class InvocationNotificationEvent extends DEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { // nothing to do here } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("INOT:"); super.toStringBuf(buf); @@ -108,7 +108,7 @@ public class InvocationNotificationEvent extends DEvent } // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeShort(_receiverId); @@ -117,7 +117,7 @@ public class InvocationNotificationEvent extends DEvent } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _receiverId = ins.readShort(); diff --git a/src/as/com/threerings/presents/dobj/InvocationRequestEvent.as b/src/as/com/threerings/presents/dobj/InvocationRequestEvent.as index f8970c104..698ffffbe 100644 --- a/src/as/com/threerings/presents/dobj/InvocationRequestEvent.as +++ b/src/as/com/threerings/presents/dobj/InvocationRequestEvent.as @@ -81,7 +81,7 @@ public class InvocationRequestEvent extends DEvent /** * Applies this attribute change to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { // nothing to do here @@ -89,13 +89,13 @@ public class InvocationRequestEvent extends DEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { // nothing to do here } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("IREQ:"); super.toStringBuf(buf); @@ -105,7 +105,7 @@ public class InvocationRequestEvent extends DEvent } // documentation inherited from interface Streamable - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeInt(_invCode); @@ -114,7 +114,7 @@ public class InvocationRequestEvent extends DEvent } // documentation inherited from interface Streamable - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _invCode = ins.readInt(); diff --git a/src/as/com/threerings/presents/dobj/InvocationResponseEvent.as b/src/as/com/threerings/presents/dobj/InvocationResponseEvent.as index 9af9bd7bb..d32d4ecc8 100644 --- a/src/as/com/threerings/presents/dobj/InvocationResponseEvent.as +++ b/src/as/com/threerings/presents/dobj/InvocationResponseEvent.as @@ -81,7 +81,7 @@ public class InvocationResponseEvent extends DEvent /** * Applies this attribute change to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { // nothing to do here @@ -89,13 +89,13 @@ public class InvocationResponseEvent extends DEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { // nothing to do here } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("IRSP:"); super.toStringBuf(buf); @@ -105,7 +105,7 @@ public class InvocationResponseEvent extends DEvent } // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeShort(_requestId); @@ -114,7 +114,7 @@ public class InvocationResponseEvent extends DEvent } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _requestId = ins.readShort(); diff --git a/src/as/com/threerings/presents/dobj/MessageEvent.as b/src/as/com/threerings/presents/dobj/MessageEvent.as index 439cea094..326b90a53 100644 --- a/src/as/com/threerings/presents/dobj/MessageEvent.as +++ b/src/as/com/threerings/presents/dobj/MessageEvent.as @@ -55,7 +55,7 @@ public class MessageEvent extends NamedEvent /** * Applies this attribute change to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { // nothing to do here @@ -63,7 +63,7 @@ public class MessageEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is MessageListener) { listener.messageReceived(this); @@ -71,7 +71,7 @@ public class MessageEvent extends NamedEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("MSG:"); super.toStringBuf(buf); @@ -79,14 +79,14 @@ public class MessageEvent extends NamedEvent } // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeField(_args); } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _args = (ins.readField(Array) as Array); diff --git a/src/as/com/threerings/presents/dobj/NamedEvent.as b/src/as/com/threerings/presents/dobj/NamedEvent.as index fcd444894..b2a897c4f 100644 --- a/src/as/com/threerings/presents/dobj/NamedEvent.as +++ b/src/as/com/threerings/presents/dobj/NamedEvent.as @@ -32,19 +32,19 @@ public /* abstract */ class NamedEvent extends DEvent return _name; } - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { super.toStringBuf(buf); buf.append(", name=", _name); } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeField(_name); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _name = (ins.readField(String) as String); diff --git a/src/as/com/threerings/presents/dobj/ObjectAddedEvent.as b/src/as/com/threerings/presents/dobj/ObjectAddedEvent.as index 4a6e75706..253a13886 100644 --- a/src/as/com/threerings/presents/dobj/ObjectAddedEvent.as +++ b/src/as/com/threerings/presents/dobj/ObjectAddedEvent.as @@ -43,7 +43,7 @@ public class ObjectAddedEvent extends NamedEvent /** * Applies this event to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { var list :OidList = target[_name]; @@ -52,27 +52,27 @@ public class ObjectAddedEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is OidListListener) { (listener as OidListListener).objectAdded(this); } } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeInt(_oid); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _oid = ins.readInt(); } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("OBJADD:"); super.toStringBuf(buf); diff --git a/src/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as b/src/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as index 9d42e5d57..79450edde 100644 --- a/src/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as +++ b/src/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as @@ -44,7 +44,7 @@ public class ObjectDestroyedEvent extends DEvent } // documentation inherited - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { // nothing to do in preparation for destruction, the omgr will @@ -53,7 +53,7 @@ public class ObjectDestroyedEvent extends DEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is ObjectDeathListener) { listener.objectDestroyed(this); @@ -61,7 +61,7 @@ public class ObjectDestroyedEvent extends DEvent } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("DESTROY:"); super.toStringBuf(buf); diff --git a/src/as/com/threerings/presents/dobj/ObjectRemovedEvent.as b/src/as/com/threerings/presents/dobj/ObjectRemovedEvent.as index 87995e753..8aae65084 100644 --- a/src/as/com/threerings/presents/dobj/ObjectRemovedEvent.as +++ b/src/as/com/threerings/presents/dobj/ObjectRemovedEvent.as @@ -66,7 +66,7 @@ public class ObjectRemovedEvent extends NamedEvent /** * Applies this event to the object. */ - public override function applyToObject (target :DObject) :Boolean + override public function applyToObject (target :DObject) :Boolean //throws ObjectAccessException { var list :OidList = (target[_name] as OidList); @@ -75,27 +75,27 @@ public class ObjectRemovedEvent extends NamedEvent } // documentation inherited - protected override function notifyListener (listener :Object) :void + override protected function notifyListener (listener :Object) :void { if (listener is OidListListener) { listener.objectRemoved(this); } } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeInt(_oid); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _oid = ins.readInt(); } // documentation inherited - protected override function toStringBuf (buf :StringBuilder) :void + override protected function toStringBuf (buf :StringBuilder) :void { buf.append("OBJREM:"); super.toStringBuf(buf); diff --git a/src/as/com/threerings/presents/net/AuthRequest.as b/src/as/com/threerings/presents/net/AuthRequest.as index e8e4cdf6f..773c9a864 100644 --- a/src/as/com/threerings/presents/net/AuthRequest.as +++ b/src/as/com/threerings/presents/net/AuthRequest.as @@ -12,7 +12,7 @@ public class AuthRequest extends UpstreamMessage } // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); @@ -21,7 +21,7 @@ public class AuthRequest extends UpstreamMessage } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); diff --git a/src/as/com/threerings/presents/net/AuthResponse.as b/src/as/com/threerings/presents/net/AuthResponse.as index e4ea195db..bb402d136 100644 --- a/src/as/com/threerings/presents/net/AuthResponse.as +++ b/src/as/com/threerings/presents/net/AuthResponse.as @@ -10,7 +10,7 @@ public class AuthResponse extends DownstreamMessage return _data; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _data = (ins.readObject() as AuthResponseData); diff --git a/src/as/com/threerings/presents/net/AuthResponseData.as b/src/as/com/threerings/presents/net/AuthResponseData.as index f70db0830..267b5d2c1 100644 --- a/src/as/com/threerings/presents/net/AuthResponseData.as +++ b/src/as/com/threerings/presents/net/AuthResponseData.as @@ -15,14 +15,14 @@ public class AuthResponseData extends DObject public var code :String; // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeField(code); } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); code = (ins.readField(String) as String); diff --git a/src/as/com/threerings/presents/net/BootstrapNotification.as b/src/as/com/threerings/presents/net/BootstrapNotification.as index f0687c875..a9ff3369f 100644 --- a/src/as/com/threerings/presents/net/BootstrapNotification.as +++ b/src/as/com/threerings/presents/net/BootstrapNotification.as @@ -9,7 +9,7 @@ public class BootstrapNotification extends DownstreamMessage return _data; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _data = (ins.readObject() as BootstrapData); diff --git a/src/as/com/threerings/presents/net/EventNotification.as b/src/as/com/threerings/presents/net/EventNotification.as index 17a72be7f..c0db97bbb 100644 --- a/src/as/com/threerings/presents/net/EventNotification.as +++ b/src/as/com/threerings/presents/net/EventNotification.as @@ -37,7 +37,7 @@ public class EventNotification extends DownstreamMessage return "[type=EVT, evt=" + _event + "]"; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _event = (ins.readObject() as DEvent); diff --git a/src/as/com/threerings/presents/net/FailureResponse.as b/src/as/com/threerings/presents/net/FailureResponse.as index ff9077773..05e0eda4d 100644 --- a/src/as/com/threerings/presents/net/FailureResponse.as +++ b/src/as/com/threerings/presents/net/FailureResponse.as @@ -35,7 +35,7 @@ public class FailureResponse extends DownstreamMessage return "[type=FAIL, msgid=" + messageId + ", oid=" + _oid + "]"; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _oid = ins.readInt(); diff --git a/src/as/com/threerings/presents/net/ForwardEventRequest.as b/src/as/com/threerings/presents/net/ForwardEventRequest.as index ccd568e04..6420a5a4e 100644 --- a/src/as/com/threerings/presents/net/ForwardEventRequest.as +++ b/src/as/com/threerings/presents/net/ForwardEventRequest.as @@ -44,13 +44,13 @@ public class ForwardEventRequest extends UpstreamMessage return _event; } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeObject(_event); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _event = (ins.readObject() as DEvent); diff --git a/src/as/com/threerings/presents/net/ObjectResponse.as b/src/as/com/threerings/presents/net/ObjectResponse.as index 99903d16f..5da45b10a 100644 --- a/src/as/com/threerings/presents/net/ObjectResponse.as +++ b/src/as/com/threerings/presents/net/ObjectResponse.as @@ -37,7 +37,7 @@ public class ObjectResponse extends DownstreamMessage return "[type=ORSP, msgid=" + messageId + ", obj=" + _dobj + "]"; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _dobj = (ins.readObject() as DObject); diff --git a/src/as/com/threerings/presents/net/PingRequest.as b/src/as/com/threerings/presents/net/PingRequest.as index 68c6fc3d6..d43afaf43 100644 --- a/src/as/com/threerings/presents/net/PingRequest.as +++ b/src/as/com/threerings/presents/net/PingRequest.as @@ -22,7 +22,7 @@ public class PingRequest extends UpstreamMessage } // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { _packStamp = getTimer(); super.writeObject(out); diff --git a/src/as/com/threerings/presents/net/PongResponse.as b/src/as/com/threerings/presents/net/PongResponse.as index b96966174..a7afecea6 100644 --- a/src/as/com/threerings/presents/net/PongResponse.as +++ b/src/as/com/threerings/presents/net/PongResponse.as @@ -30,7 +30,7 @@ public class PongResponse extends DownstreamMessage return _unpackStamp; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { _unpackStamp = getTimer(); super.readObject(ins); diff --git a/src/as/com/threerings/presents/net/SubscribeRequest.as b/src/as/com/threerings/presents/net/SubscribeRequest.as index e90d5a3c6..2d8e917ed 100644 --- a/src/as/com/threerings/presents/net/SubscribeRequest.as +++ b/src/as/com/threerings/presents/net/SubscribeRequest.as @@ -47,7 +47,7 @@ public class SubscribeRequest extends UpstreamMessage return "[type=SUB, msgid=" + messageId + ", oid=" + _oid + "]"; } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeInt(_oid); diff --git a/src/as/com/threerings/presents/net/UnsubscribeRequest.as b/src/as/com/threerings/presents/net/UnsubscribeRequest.as index 7b80e8427..e9bc63f4c 100644 --- a/src/as/com/threerings/presents/net/UnsubscribeRequest.as +++ b/src/as/com/threerings/presents/net/UnsubscribeRequest.as @@ -47,7 +47,7 @@ public class UnsubscribeRequest extends UpstreamMessage return "[type=UNSUB, msgid=" + messageId + ", oid=" + _oid + "]"; } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeInt(_oid); diff --git a/src/as/com/threerings/presents/net/UnsubscribeResponse.as b/src/as/com/threerings/presents/net/UnsubscribeResponse.as index 97d1d29b9..7cf00bb0c 100644 --- a/src/as/com/threerings/presents/net/UnsubscribeResponse.as +++ b/src/as/com/threerings/presents/net/UnsubscribeResponse.as @@ -40,7 +40,7 @@ public class UnsubscribeResponse extends DownstreamMessage return "[type=UNACK, msgid=" + messageId + ", oid=" + _oid + "]"; } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _oid = ins.readInt(); diff --git a/src/as/com/threerings/presents/net/UsernamePasswordCreds.as b/src/as/com/threerings/presents/net/UsernamePasswordCreds.as index 5f707744a..437d0ad4b 100644 --- a/src/as/com/threerings/presents/net/UsernamePasswordCreds.as +++ b/src/as/com/threerings/presents/net/UsernamePasswordCreds.as @@ -43,20 +43,20 @@ public class UsernamePasswordCreds extends Credentials return _password; } - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeField(_password); } - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); _password = (ins.readField(String) as String); } // documentation inherited - internal override function toStringBuf (buf :StringBuilder) :void + override internal function toStringBuf (buf :StringBuilder) :void { super.toStringBuf(buf); buf.append(", password=", _password); diff --git a/src/as/com/threerings/whirled/client/SceneController.as b/src/as/com/threerings/whirled/client/SceneController.as index 0ac31ac7d..b337aaca6 100644 --- a/src/as/com/threerings/whirled/client/SceneController.as +++ b/src/as/com/threerings/whirled/client/SceneController.as @@ -41,21 +41,21 @@ import com.threerings.whirled.util.WhirledContext; public /*abstract*/ class SceneController extends PlaceController { // documentation inherited - public override function init (ctx :CrowdContext, config :PlaceConfig) :void + override public function init (ctx :CrowdContext, config :PlaceConfig) :void { super.init(ctx, config); _wctx = WhirledContext(ctx); } // documentation inherited - public override function willEnterPlace (plobj :PlaceObject) :void + override public function willEnterPlace (plobj :PlaceObject) :void { super.willEnterPlace(plobj); plobj.addListener(_updateListener); } // documentation inherited - public override function didLeavePlace (plobj :PlaceObject) :void + override public function didLeavePlace (plobj :PlaceObject) :void { super.didLeavePlace(plobj); plobj.removeListener(_updateListener); diff --git a/src/as/com/threerings/whirled/client/SceneDecoder.as b/src/as/com/threerings/whirled/client/SceneDecoder.as index 7225e44c2..aad2769fd 100644 --- a/src/as/com/threerings/whirled/client/SceneDecoder.as +++ b/src/as/com/threerings/whirled/client/SceneDecoder.as @@ -47,13 +47,13 @@ public class SceneDecoder extends InvocationDecoder } // documentation inherited - public override function getReceiverCode () :String + override public function getReceiverCode () :String { return RECEIVER_CODE; } // documentation inherited - public override function dispatchNotification (methodId :int, args :Array) :void + override public function dispatchNotification (methodId :int, args :Array) :void { switch (methodId) { case FORCED_MOVE: diff --git a/src/as/com/threerings/whirled/client/SceneDirector.as b/src/as/com/threerings/whirled/client/SceneDirector.as index 1089a79d7..7343cf96f 100644 --- a/src/as/com/threerings/whirled/client/SceneDirector.as +++ b/src/as/com/threerings/whirled/client/SceneDirector.as @@ -463,7 +463,7 @@ public class SceneDirector extends BasicDirector } // documentation inherited - public override function clientDidLogoff (event :ClientEvent) :void + override public function clientDidLogoff (event :ClientEvent) :void { super.clientDidLogoff(event); @@ -477,7 +477,7 @@ public class SceneDirector extends BasicDirector } // documentation inherited - protected override function fetchServices (client :Client) :void + override protected function fetchServices (client :Client) :void { // get a handle on our scene service _sservice = (client.requireService(SceneService) as SceneService); diff --git a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as index fd304869e..23e48546f 100644 --- a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as +++ b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as @@ -54,7 +54,7 @@ public class SceneMarshaller_SceneMoveMarshaller extends InvocationMarshaller_Li } // documentation inherited - public override function dispatchResponse (methodId :int, args :Array) :void + override public function dispatchResponse (methodId :int, args :Array) :void { switch (methodId) { case MOVE_SUCCEEDED: diff --git a/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as b/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as index b91c2ec3e..4e6dff133 100644 --- a/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as +++ b/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as @@ -344,7 +344,7 @@ public class SpotSceneDirector extends BasicDirector } // documentation inherited - public override function clientDidLogon (event :ClientEvent) :void + override public function clientDidLogon (event :ClientEvent) :void { super.clientDidLogon(event); @@ -360,7 +360,7 @@ public class SpotSceneDirector extends BasicDirector } // documentation inherited - public override function clientObjectDidChange (event :ClientEvent) :void + override public function clientObjectDidChange (event :ClientEvent) :void { super.clientObjectDidChange(event); @@ -371,7 +371,7 @@ public class SpotSceneDirector extends BasicDirector } // documentation inherited - public override function clientDidLogoff (event :ClientEvent) :void + override public function clientDidLogoff (event :ClientEvent) :void { super.clientDidLogoff(event); @@ -387,7 +387,7 @@ public class SpotSceneDirector extends BasicDirector } // documentation inherited - protected override function fetchServices (client :Client) :void + override protected function fetchServices (client :Client) :void { _sservice = (client.requireService(SpotService) as SpotService); } diff --git a/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as b/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as index 2376c95b0..25d30c096 100644 --- a/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as +++ b/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as @@ -142,7 +142,7 @@ public class SpotSceneObject extends SceneObject // AUTO-GENERATED: METHODS END // documentation inherited - public override function writeObject (out :ObjectOutputStream) :void + override public function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); @@ -151,7 +151,7 @@ public class SpotSceneObject extends SceneObject } // documentation inherited - public override function readObject (ins :ObjectInputStream) :void + override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins);