From f5114699016749752783aaff72d0a5d4adc6f3ab Mon Sep 17 00:00:00 2001
From: Mike Thomas <mthomas@threerings.net>
Date: Wed, 29 Oct 2008 22:26:56 +0000
Subject: [PATCH] Purge the use of the getChatName() hack.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5482 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/crowd/chat/server/ChatChannelManager.java | 2 +-
 .../com/threerings/crowd/chat/server/ChatProvider.java   | 4 ++--
 .../com/threerings/crowd/chat/server/SpeakHandler.java   | 2 +-
 src/java/com/threerings/crowd/data/BodyObject.java       | 9 ---------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
index 7bb4e6cb0..28861267b 100644
--- a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
+++ b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
@@ -90,7 +90,7 @@ public abstract class ChatChannelManager
     public void speak (ClientObject caller, final ChatChannel channel, String message, byte mode)
     {
         final UserMessage umsg = new UserMessage(
-            ((BodyObject)caller).getChatName(), null, message, mode);
+            ((BodyObject)caller).getVisibleName(), null, message, mode);
 
         // if we're hosting this channel, dispatch it directly
         if (_channels.containsKey(channel)) {
diff --git a/src/java/com/threerings/crowd/chat/server/ChatProvider.java b/src/java/com/threerings/crowd/chat/server/ChatProvider.java
index 5bf24e0c4..ee0a41d9d 100644
--- a/src/java/com/threerings/crowd/chat/server/ChatProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/ChatProvider.java
@@ -154,7 +154,7 @@ public class ChatProvider
         // make sure the requesting user has broadcast privileges
         InvocationException.requireAccess(caller, ChatCodes.BROADCAST_ACCESS);
         BodyObject body = (BodyObject)caller;
-        broadcast(body.getChatName(), null, message, false, true);
+        broadcast(body.getVisibleName(), null, message, false, true);
     }
 
     /**
@@ -256,7 +256,7 @@ public class ChatProvider
      */
     protected UserMessage createTellMessage (BodyObject source, String message)
     {
-        return new UserMessage(source.getChatName(), message);
+        return new UserMessage(source.getVisibleName(), message);
     }
 
     /**
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakHandler.java b/src/java/com/threerings/crowd/chat/server/SpeakHandler.java
index 4b5d3dd25..245707f80 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakHandler.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakHandler.java
@@ -93,7 +93,7 @@ public class SpeakHandler
 
         } else {
             // issue the speak message on our speak object
-            SpeakUtil.sendSpeak(_speakObj, source.getChatName(), null, message, mode);
+            SpeakUtil.sendSpeak(_speakObj, source.getVisibleName(), null, message, mode);
         }
     }
 
diff --git a/src/java/com/threerings/crowd/data/BodyObject.java b/src/java/com/threerings/crowd/data/BodyObject.java
index 66d3f7263..8653b16ef 100644
--- a/src/java/com/threerings/crowd/data/BodyObject.java
+++ b/src/java/com/threerings/crowd/data/BodyObject.java
@@ -86,15 +86,6 @@ public class BodyObject extends ClientObject
         return username;
     }
 
-    /**
-     * Returns the name that should be used for the chat system. The default is to use {@link
-     * #username}.
-     */
-    public Name getChatName ()
-    {
-        return getVisibleName();
-    }
-
     /**
      * Creates a blank occupant info instance that will used to publish information about the
      * various bodies occupying a place.