From cdd7a64b046d8953d9da5a9237b2511b3c626871 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Fri, 26 May 2006 22:39:31 +0000 Subject: [PATCH] Renamed some "inner" classes, removed debugging lines. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4152 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/as/com/threerings/crowd/chat/data/ChatMarshaller.as | 2 +- .../{TellMarshaller.as => ChatMarshaller_TellMarshaller.as} | 2 +- src/as/com/threerings/io/streamers/ArrayStreamer.as | 2 -- .../data/InvocationMarshaller_ListenerMarshaller.as | 6 +++--- src/as/com/threerings/presents/data/TimeBaseMarshaller.as | 2 +- ...aller.as => TimeBaseMarshaller_GotTimeBaseMarshaller.as} | 6 +++--- src/as/com/threerings/presents/dobj/DObject.as | 1 - src/as/com/threerings/whirled/data/SceneModel.as | 5 ----- 8 files changed, 9 insertions(+), 17 deletions(-) rename src/as/com/threerings/crowd/chat/data/{TellMarshaller.as => ChatMarshaller_TellMarshaller.as} (89%) rename src/as/com/threerings/presents/data/{GotTimeBaseMarshaller.as => TimeBaseMarshaller_GotTimeBaseMarshaller.as} (81%) diff --git a/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as b/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as index b55e36634..4efa21ea1 100644 --- a/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as +++ b/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as @@ -67,7 +67,7 @@ public class ChatMarshaller extends InvocationMarshaller // documentation inherited from interface public function tell (arg1 :Client, arg2 :Name, arg3 :String, arg4 :TellListener) :void { - var listener4 :TellMarshaller = new TellMarshaller(); + var listener4 :ChatMarshaller_TellMarshaller = new ChatMarshaller_TellMarshaller(); listener4.listener = arg4; sendRequest(arg1, TELL, [ arg2, arg3, listener4 ]); } diff --git a/src/as/com/threerings/crowd/chat/data/TellMarshaller.as b/src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as similarity index 89% rename from src/as/com/threerings/crowd/chat/data/TellMarshaller.as rename to src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as index 3a44f8524..af4f2bcc2 100644 --- a/src/as/com/threerings/crowd/chat/data/TellMarshaller.as +++ b/src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as @@ -6,7 +6,7 @@ import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.crowd.chat.client.TellListener; -public class TellMarshaller extends InvocationMarshaller_ListenerMarshaller +public class ChatMarshaller_TellMarshaller extends InvocationMarshaller_ListenerMarshaller { /** The method id used to dispatch {@link #tellSucceeded} * responses. */ diff --git a/src/as/com/threerings/io/streamers/ArrayStreamer.as b/src/as/com/threerings/io/streamers/ArrayStreamer.as index 00de835e5..5d9aa2978 100644 --- a/src/as/com/threerings/io/streamers/ArrayStreamer.as +++ b/src/as/com/threerings/io/streamers/ArrayStreamer.as @@ -15,7 +15,6 @@ public class ArrayStreamer extends Streamer public function ArrayStreamer (jname :String = "[Ljava.lang.Object;") { super(TypedArray, jname); - trace("got new ArrayStreamer for " + jname); var secondChar :String = jname.charAt(1); if (secondChar === "[") { @@ -69,7 +68,6 @@ public class ArrayStreamer extends Streamer { var ta :TypedArray = new TypedArray(_jname); ta.length = ins.readInt(); - trace("Read array length as: " + ta.length); return ta; } diff --git a/src/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as b/src/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as index 3d56972be..e9401d897 100644 --- a/src/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as +++ b/src/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as @@ -38,9 +38,9 @@ public class InvocationMarshaller_ListenerMarshaller // documentation inherited from interface public function requestFailed (cause :String) :void { - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, REQUEST_FAILED_RSPID, - [ cause ])); +// omgr.postEvent(new InvocationResponseEvent( +// callerOid, requestId, REQUEST_FAILED_RSPID, +// [ cause ])); } /** diff --git a/src/as/com/threerings/presents/data/TimeBaseMarshaller.as b/src/as/com/threerings/presents/data/TimeBaseMarshaller.as index 27db39746..3609e7418 100644 --- a/src/as/com/threerings/presents/data/TimeBaseMarshaller.as +++ b/src/as/com/threerings/presents/data/TimeBaseMarshaller.as @@ -18,7 +18,7 @@ public class TimeBaseMarshaller extends InvocationMarshaller public function getTimeOid ( arg1 :Client, arg2 :String, arg3 :GotTimeBaseListener) :void { - var listener3 :GotTimeBaseMarshaller = new GotTimeBaseMarshaller(); + var listener3 :TimeBaseMarshaller_GotTimeBaseMarshaller = new TimeBaseMarshaller_GotTimeBaseMarshaller(); listener3.listener = arg3; sendRequest(arg1, GET_TIME_OID, [arg2, listener3]); } diff --git a/src/as/com/threerings/presents/data/GotTimeBaseMarshaller.as b/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as similarity index 81% rename from src/as/com/threerings/presents/data/GotTimeBaseMarshaller.as rename to src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as index 267fa252a..b8596463f 100644 --- a/src/as/com/threerings/presents/data/GotTimeBaseMarshaller.as +++ b/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as @@ -5,7 +5,7 @@ import com.threerings.presents.client.GotTimeBaseListener; import com.threerings.presents.dobj.InvocationResponseEvent; // TODO: this will be autogenerated -public class GotTimeBaseMarshaller +public class TimeBaseMarshaller_GotTimeBaseMarshaller extends InvocationMarshaller_ListenerMarshaller implements GotTimeBaseListener { @@ -13,8 +13,8 @@ public class GotTimeBaseMarshaller public function gotTimeOid (arg1 :int) :void { - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, GOT_TIME_OID, [ arg1 ])); +// omgr.postEvent(new InvocationResponseEvent( +// callerOid, requestId, GOT_TIME_OID, [ arg1 ])); } public override function dispatchResponse (methodId :int, args :Array) :void diff --git a/src/as/com/threerings/presents/dobj/DObject.as b/src/as/com/threerings/presents/dobj/DObject.as index 2e2a83b9d..2ed1b0a7a 100644 --- a/src/as/com/threerings/presents/dobj/DObject.as +++ b/src/as/com/threerings/presents/dobj/DObject.as @@ -103,7 +103,6 @@ public class DObject // extends EventDispatcher public function postMessage (name :String, args :Array) :void { - trace("posting message: " + name + ", " + args); postEvent(new MessageEvent(_oid, name, args)); } diff --git a/src/as/com/threerings/whirled/data/SceneModel.as b/src/as/com/threerings/whirled/data/SceneModel.as index 3b020b7aa..8a843dfc5 100644 --- a/src/as/com/threerings/whirled/data/SceneModel.as +++ b/src/as/com/threerings/whirled/data/SceneModel.as @@ -89,15 +89,10 @@ public class SceneModel // documentation inherited from interface Streamable public function readObject (ins :ObjectInputStream) :void { - trace("Reading sceneId"); sceneId = ins.readInt(); - trace("Reading name (sceneId=" + sceneId + ")"); name = (ins.readField(String) as String); - trace("Reading version (name=" + name + ")"); version = ins.readInt(); - trace("Reading auxes (version=" + version + ")"); auxModels = (ins.readObject() as TypedArray); - trace("auxes=" + auxModels); } /**