From add8f3f97c7e11d7fe3b859ecf8389178f492788 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Sat, 18 Mar 2006 00:04:34 +0000 Subject: [PATCH] Work around a compiler bug by FQing the Log classname we're using. We can revert these statements when/if that bug gets fixed. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3960 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/crowd/chat/client/ChatDirector.as | 4 ++-- src/as/com/threerings/io/streamers/ArrayStreamer.as | 2 +- src/as/com/threerings/presents/dobj/DObject.as | 10 +++++----- src/as/com/threerings/presents/dobj/DSet.as | 2 +- src/as/com/threerings/presents/net/BootstrapData.as | 3 +-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/as/com/threerings/crowd/chat/client/ChatDirector.as b/src/as/com/threerings/crowd/chat/client/ChatDirector.as index 536f0c70a..71584a9ea 100644 --- a/src/as/com/threerings/crowd/chat/client/ChatDirector.as +++ b/src/as/com/threerings/crowd/chat/client/ChatDirector.as @@ -86,7 +86,7 @@ public class ChatDirector extends BasicDirector _cctx.getLocationDirector().addLocationObserver(this); if (_bundle == null || _msgmgr == null) { - Log.warning("Null bundle or message manager given to ChatDirector"); + com.threerings.crowd.Log.warning("Null bundle or message manager given to ChatDirector"); return; } var msg :MessageBundle = _msgmgr.getBundle(_bundle); @@ -902,7 +902,7 @@ public class ChatDirector extends BasicDirector if (bundle != null && _msgmgr != null) { var msgb :MessageBundle = _msgmgr.getBundle(bundle); if (msgb == null) { - Log.warning( + com.threerings.crowd.Log.warning( "No message bundle available to translate message " + "[bundle=" + bundle + ", message=" + message + "]."); } else { diff --git a/src/as/com/threerings/io/streamers/ArrayStreamer.as b/src/as/com/threerings/io/streamers/ArrayStreamer.as index 8e5023dfe..7f86f8ec9 100644 --- a/src/as/com/threerings/io/streamers/ArrayStreamer.as +++ b/src/as/com/threerings/io/streamers/ArrayStreamer.as @@ -32,7 +32,7 @@ public class ArrayStreamer extends Streamer _isFinal = ClassUtil.isFinal(_elementType); } else { - Log.warning("Other array types are currently not handled yet " + + com.threerings.presents.Log.warning("Other array types are currently not handled yet " + "[jname=" + jname + "]."); throw new Error("Unimplemented bit"); } diff --git a/src/as/com/threerings/presents/dobj/DObject.as b/src/as/com/threerings/presents/dobj/DObject.as index 2d4522d8a..2eac09f7b 100644 --- a/src/as/com/threerings/presents/dobj/DObject.as +++ b/src/as/com/threerings/presents/dobj/DObject.as @@ -62,9 +62,9 @@ public class DObject // extends EventDispatcher _listeners = new ArrayCollection(); } else if (_listeners.contains(listener)) { - Log.warning("Refusing repeat listener registration " + + com.threerings.presents.Log.warning("Refusing repeat listener registration " + "[dobj=" + which() + ", list=" + listener + "]."); - Log.logStackTrace(new Error()); + com.threerings.presents.Log.logStackTrace(new Error()); return; } _listeners.addItem(listener); @@ -95,9 +95,9 @@ public class DObject // extends EventDispatcher (listener as EventListener).eventReceived(event); } } catch (e :Error) { - Log.warning("Listener choked during notification " + + com.threerings.presents.Log.warning("Listener choked during notification " + "[list=" + listener + ", event=" + event + "]."); - Log.logStackTrace(e); + com.threerings.presents.Log.logStackTrace(e); } } } @@ -114,7 +114,7 @@ public class DObject // extends EventDispatcher _omgr.postEvent(event); } else { - Log.warning("Unable to post event, object has no omgr " + + com.threerings.presents.Log.warning("Unable to post event, object has no omgr " + "[oid=" + getOid() + ", class=" + ClassUtil.getClassName(this) + ", event=" + event + "]."); } diff --git a/src/as/com/threerings/presents/dobj/DSet.as b/src/as/com/threerings/presents/dobj/DSet.as index 1cfbc17b8..b7767b68f 100644 --- a/src/as/com/threerings/presents/dobj/DSet.as +++ b/src/as/com/threerings/presents/dobj/DSet.as @@ -123,7 +123,7 @@ public class DSet } } else if (contains(elem)) { - Log.warning("Refusing to add duplicate entry [set=" + this + + com.threerings.presents.Log.warning("Refusing to add duplicate entry [set=" + this + ", entry=" + elem + "]."); return false; } diff --git a/src/as/com/threerings/presents/net/BootstrapData.as b/src/as/com/threerings/presents/net/BootstrapData.as index 9d280ed1e..95a492f31 100644 --- a/src/as/com/threerings/presents/net/BootstrapData.as +++ b/src/as/com/threerings/presents/net/BootstrapData.as @@ -26,8 +26,7 @@ public class BootstrapData // documentation inherited from interface Streamable public function writeObject (out :ObjectOutputStream) :void { - Log.warning("This is client code: BootstrapData shouldn't be written"); - //out.writeShort(messageId); + com.threerings.presents.Log.warning("This is client code: BootstrapData shouldn't be written"); } // documentation inherited from interface Streamable