r58@sally: elizabeth | 2005-10-25 03:59:59 -0700

Changed things around a bit to have the cheesy JabberChat run out of the box:
 * ChatDirector no longer freaks out when given null message bundles/managers.
 * MiCasa's ChatPanel is marked with a TODO item to stop passing in null
   messagebundles and messagemanagers to ChatDirector.
 * JabberApp and JabberClient have been adjusted to allow the user to specify
   which chatroom to join from the command line; I plan to implement this using
   BootstrapData when time permits.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3741 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/crowd/chat/client/ChatDirector.java

@@ -153,6 +153,10 @@ public class ChatDirector extends BasicDirector
         _ctx.getLocationDirector().addLocationObserver(this);
 
         // register our default chat handlers
+        if (_bundle == null || _msgmgr == null) {
+            Log.warning("Null bundle or message manager given to ChatDirector");
+            return;
+        }
         MessageBundle msg = _msgmgr.getBundle(_bundle);
         registerCommandHandler(msg, "help", new HelpHandler());
         registerCommandHandler(msg, "clear", new ClearHandler());

src/java/com/threerings/micasa/client/ChatPanel.java

@@ -78,6 +78,8 @@ public class ChatPanel
 
         // create our chat director and register ourselves with it
         _chatdtr = new ChatDirector(_ctx, null, null);
+        // XXX - the line above royally borks things because it sends
+        // null, null downstream.
         _chatdtr.addChatDisplay(this);
 
         // register as an occupant observer