- Added TokenRing

- Specify override first on overridden methods.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4170 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2006-06-05 21:28:00 +00:00
parent a442646791
commit 251566b321
66 changed files with 301 additions and 193 deletions
@@ -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");
}
@@ -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);
@@ -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:
@@ -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:
@@ -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();
@@ -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);
@@ -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);
@@ -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);
@@ -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();
@@ -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);
@@ -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();
@@ -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();
@@ -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();
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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();
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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();
@@ -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);