From 09ad0ca87d67cb4f0e1847275a1cba7be6ed986f Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 31 Jul 2007 21:05:36 +0000
Subject: [PATCH] Updates to reflect SpeakProvider refactoring.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@395 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../com/threerings/parlor/game/server/GameManager.java     | 7 +++----
 .../com/threerings/whirled/spot/server/SpotProvider.java   | 4 ++--
 .../threerings/whirled/spot/server/SpotSceneManager.java   | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/java/com/threerings/parlor/game/server/GameManager.java b/src/java/com/threerings/parlor/game/server/GameManager.java
index de241994..283d510a 100644
--- a/src/java/com/threerings/parlor/game/server/GameManager.java
+++ b/src/java/com/threerings/parlor/game/server/GameManager.java
@@ -39,7 +39,7 @@ import com.threerings.presents.dobj.AttributeChangedEvent;
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.MessageEvent;
 
-import com.threerings.crowd.chat.server.SpeakProvider;
+import com.threerings.crowd.chat.server.SpeakUtil;
 
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceObject;
@@ -391,8 +391,7 @@ public class GameManager extends PlaceManager
      *
      * @param waitForStart if true, the message will not be sent until the game has started.
      */
-    public void systemMessage (
-        String msgbundle, String msg, boolean waitForStart)
+    public void systemMessage (String msgbundle, String msg, boolean waitForStart)
     {
         if (waitForStart && ((_gameobj == null) || (_gameobj.state == GameObject.PRE_GAME))) {
             // queue up the message.
@@ -404,7 +403,7 @@ public class GameManager extends PlaceManager
         }
 
         // otherwise, just deliver the message
-        SpeakProvider.sendInfo(_gameobj, msgbundle, msg);
+        SpeakUtil.sendInfo(_gameobj, msgbundle, msg);
     }
 
     /**
diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java
index a43f19f0..0d298fc3 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java
@@ -32,7 +32,7 @@ import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
 import com.threerings.crowd.chat.data.ChatCodes;
-import com.threerings.crowd.chat.server.SpeakProvider;
+import com.threerings.crowd.chat.server.SpeakUtil;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.server.PlaceRegistry;
 
@@ -182,7 +182,7 @@ public class SpotProvider
         BodyObject source = (BodyObject)caller;
         String errmsg = source.checkAccess(ChatCodes.CHAT_ACCESS, null);
         if (errmsg != null) {
-            SpeakProvider.sendFeedback(source, MessageManager.GLOBAL_BUNDLE, errmsg);
+            SpeakUtil.sendFeedback(source, MessageManager.GLOBAL_BUNDLE, errmsg);
         } else {
             sendClusterChatMessage(ScenePlace.getSceneId(source), source.getOid(),
                                    source.getVisibleName(), null, message, mode);
diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
index 57bc0211..5e53b6a2 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
@@ -32,7 +32,7 @@ import com.threerings.presents.dobj.Subscriber;
 import com.threerings.presents.dobj.ObjectAccessException;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.crowd.chat.server.SpeakProvider;
+import com.threerings.crowd.chat.server.SpeakUtil;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.OccupantInfo;
 import com.threerings.crowd.server.CrowdServer;
@@ -393,7 +393,7 @@ public class SpotSceneManager extends SceneManager
             Log.warning("Non-clustered user requested cluster speak [where=" + where() +
                         ", chatter=" + source + " (" + sourceOid + "), msg=" + message + "].");
         } else {
-            SpeakProvider.sendSpeak(clrec.getClusterObject(), source, bundle, message, mode);
+            SpeakUtil.sendSpeak(clrec.getClusterObject(), source, bundle, message, mode);
         }
     }