From f61338ec1de9a57e09e3e4d4f8bb675298b5811e Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 14 Oct 2010 15:53:05 +0000
Subject: [PATCH] No longer need to pass a MessageManager when constructing the
 ChatDirector.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@979 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../com/threerings/micasa/client/MiCasaClient.java   | 12 ++++++------
 .../micasa/simulator/client/SimpleClient.java        | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/java/com/threerings/micasa/client/MiCasaClient.java b/src/java/com/threerings/micasa/client/MiCasaClient.java
index b2f6d622..101a3d09 100644
--- a/src/java/com/threerings/micasa/client/MiCasaClient.java
+++ b/src/java/com/threerings/micasa/client/MiCasaClient.java
@@ -127,7 +127,7 @@ public class MiCasaClient
         _occdir = new OccupantDirector(_ctx);
         _pardtr = new ParlorDirector(_ctx);
         _msgmgr = new MessageManager(MESSAGE_MANAGER_PREFIX);
-        _chatdir = new ChatDirector(_ctx, _msgmgr, null);
+        _chatdir = new ChatDirector(_ctx, null);
     }
 
     /**
@@ -176,6 +176,11 @@ public class MiCasaClient
             return _chatdir;
         }
 
+        public MessageManager getMessageManager ()
+        {
+            return _msgmgr;
+        }
+
         public ParlorDirector getParlorDirector ()
         {
             return _pardtr;
@@ -196,11 +201,6 @@ public class MiCasaClient
         {
             return _frame;
         }
-
-        public MessageManager getMessageManager ()
-        {
-            return _msgmgr;
-        }
     }
 
     protected MiCasaContext _ctx;
diff --git a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java
index 82bf2c2a..6154a7a0 100644
--- a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java
+++ b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java
@@ -64,7 +64,7 @@ public class SimpleClient
         _locdir = new LocationDirector(_ctx);
         _occdir = new OccupantDirector(_ctx);
         _pardtr = new ParlorDirector(_ctx);
-        _chatdir = new ChatDirector(_ctx, _msgmgr, null);
+        _chatdir = new ChatDirector(_ctx, null);
 
         // keep this for later
         _frame = frame;
@@ -148,6 +148,11 @@ public class SimpleClient
             return _chatdir;
         }
 
+        public MessageManager getMessageManager ()
+        {
+            return _msgmgr;
+        }
+
         public void setPlaceView (PlaceView view)
         {
             // stick the place view into our frame
@@ -163,11 +168,6 @@ public class SimpleClient
         {
             return (MiCasaFrame)_frame;
         }
-
-        public MessageManager getMessageManager ()
-        {
-            return _msgmgr;
-        }
     }
 
     protected MiCasaContext _ctx;