From 7a353e672286f906481659580c9f2b58f37b4962 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Sun, 19 Feb 2006 23:35:22 +0000 Subject: [PATCH] Checkpoint. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3864 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/as/com/threerings/io/ObjectInputStream.as | 2 +- .../com/threerings/presents/client/TestClient.as | 15 +++++++++++++++ src/as/com/threerings/presents/dobj/DObject.as | 2 +- .../threerings/presents/net/AuthResponseData.as | 4 ++-- src/as/com/threerings/presents/net/Credentials.as | 4 +++- src/as/com/threerings/presents/net/PingRequest.as | 2 +- .../com/threerings/presents/net/PongResponse.as | 2 +- src/as/com/threerings/util/Name.as | 2 +- 8 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 src/as/com/threerings/presents/client/TestClient.as diff --git a/src/as/com/threerings/io/ObjectInputStream.as b/src/as/com/threerings/io/ObjectInputStream.as index af098eb34..72cb285b3 100644 --- a/src/as/com/threerings/io/ObjectInputStream.as +++ b/src/as/com/threerings/io/ObjectInputStream.as @@ -72,7 +72,7 @@ public class ObjectInputStream readBareObjectImpl(target, cmap.streamer); return target; - } catch (MemoryError me) { + } catch (me :MemoryError) { throw new IOError("out of memory" + me.message); } } diff --git a/src/as/com/threerings/presents/client/TestClient.as b/src/as/com/threerings/presents/client/TestClient.as new file mode 100644 index 000000000..949c6fb71 --- /dev/null +++ b/src/as/com/threerings/presents/client/TestClient.as @@ -0,0 +1,15 @@ +package com.threerings.presents.client { + +import com.threerings.util.Name; +import com.threerings.presents.net.Credentials; + +public class TestClient extends Client +{ + public function TestClient () + { + super(new Credentials(new Name("Ray"))); + setServer("tasman.sea.earth.threerings.net", DEFAULT_SERVER_PORT); + logon(); + } +} +} diff --git a/src/as/com/threerings/presents/dobj/DObject.as b/src/as/com/threerings/presents/dobj/DObject.as index ac9583b53..5dfe8041a 100644 --- a/src/as/com/threerings/presents/dobj/DObject.as +++ b/src/as/com/threerings/presents/dobj/DObject.as @@ -69,7 +69,7 @@ public class DObject // extends EventDispatcher postEvent(new MessageEvent(_oid, name, args)); } - public function postEvent (DEvent event) :void + public function postEvent (event :DEvent) :void { // TODO: transactons? if (_omgr != null) { diff --git a/src/as/com/threerings/presents/net/AuthResponseData.as b/src/as/com/threerings/presents/net/AuthResponseData.as index e335bafbc..6d1827052 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 function writeObject (out :ObjectOutputStream) :void + public override function writeObject (out :ObjectOutputStream) :void { super.writeObject(out); out.writeField(code); } // documentation inherited - public function readObject (ins :ObjectInputStream) :void + public override function readObject (ins :ObjectInputStream) :void { super.readObject(ins); code = ins.readField(String); diff --git a/src/as/com/threerings/presents/net/Credentials.as b/src/as/com/threerings/presents/net/Credentials.as index 9f1eb5d08..07431acf6 100644 --- a/src/as/com/threerings/presents/net/Credentials.as +++ b/src/as/com/threerings/presents/net/Credentials.as @@ -15,12 +15,14 @@ public class Credentials public function writeObject (out :ObjectOutputStream) :void //throws IOError { + out.writeObject(_username); } // documentation inherited from interface Streamable - public function readObject (in :ObjectInputStream) :void + public function readObject (ins :ObjectInputStream) :void //throws IOError { + _username = ins.readObject(); } /** The username. */ diff --git a/src/as/com/threerings/presents/net/PingRequest.as b/src/as/com/threerings/presents/net/PingRequest.as index 4a8eadeb4..a86ae5a73 100644 --- a/src/as/com/threerings/presents/net/PingRequest.as +++ b/src/as/com/threerings/presents/net/PingRequest.as @@ -20,7 +20,7 @@ public class PingRequest extends UpstreamMessage } // documentation inherited - public function writeObject (out :ObjectOutputStream) + public override function writeObject (out :ObjectOutputStream) { _packStamp = new Date().getTime(); super.writeObject(out); diff --git a/src/as/com/threerings/presents/net/PongResponse.as b/src/as/com/threerings/presents/net/PongResponse.as index b4a642f1c..d76f3ec6c 100644 --- a/src/as/com/threerings/presents/net/PongResponse.as +++ b/src/as/com/threerings/presents/net/PongResponse.as @@ -28,7 +28,7 @@ public class PongResponse extends DownstreamMessage return _unpackStamp; } - public function readObject (ins :ObjectInputStream) + public override function readObject (ins :ObjectInputStream) { _unpackStamp = new Date().getTime(); super.readObject(ins); diff --git a/src/as/com/threerings/util/Name.as b/src/as/com/threerings/util/Name.as index 5a20c7199..fa05f3dfa 100644 --- a/src/as/com/threerings/util/Name.as +++ b/src/as/com/threerings/util/Name.as @@ -30,7 +30,7 @@ public class Name extends Object return Name.isBlank(this); } - public override function toString () :String + public function toString () :String { return _name; }