Edited auxilliary -> auxiliary.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@923 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Walter Korman
2002-02-03 08:22:38 +00:00
parent 5dc68306ac
commit 1415319aab
4 changed files with 19 additions and 19 deletions
@@ -1,5 +1,5 @@
// //
// $Id: ChatDirector.java,v 1.14 2001/12/16 21:46:46 mdb Exp $ // $Id: ChatDirector.java,v 1.15 2002/02/03 08:22:38 shaper Exp $
package com.threerings.crowd.chat; package com.threerings.crowd.chat;
@@ -116,18 +116,18 @@ public class ChatDirector
* Adds an additional object via which chat messages may arrive. The * Adds an additional object via which chat messages may arrive. The
* chat director assumes the caller will be managing the subscription * chat director assumes the caller will be managing the subscription
* to this object and will remain subscribed to it for as long as it * to this object and will remain subscribed to it for as long as it
* remains in effect as an auxilliary chat source. * remains in effect as an auxiliary chat source.
*/ */
public void addAuxilliarySource (String type, DObject source) public void addAuxiliarySource (String type, DObject source)
{ {
source.addListener(this); source.addListener(this);
_auxes.put(source.getOid(), type); _auxes.put(source.getOid(), type);
} }
/** /**
* Removes a previously added auxilliary chat source. * Removes a previously added auxiliary chat source.
*/ */
public void removeAuxilliarySource (DObject source) public void removeAuxiliarySource (DObject source)
{ {
source.removeListener(this); source.removeListener(this);
_auxes.remove(source.getOid()); _auxes.remove(source.getOid());
@@ -214,11 +214,11 @@ public class ChatDirector
/** /**
* Called when a speak message is received on the place object or one * Called when a speak message is received on the place object or one
* of our auxilliary chat objects. * of our auxiliary chat objects.
* *
* @param type {@link ChatCodes#PLACE_CHAT_TYPE} if the message was * @param type {@link ChatCodes#PLACE_CHAT_TYPE} if the message was
* received on the place object or the type associated with the * received on the place object or the type associated with the
* auxilliary chat object on which the message was received. * auxiliary chat object on which the message was received.
* @param args the arguments provided with the speak notification. * @param args the arguments provided with the speak notification.
*/ */
protected void handleSpeakMessage (String type, Object[] args) protected void handleSpeakMessage (String type, Object[] args)
@@ -239,7 +239,7 @@ public class ChatDirector
* *
* @param type {@link ChatCodes#PLACE_CHAT_TYPE} if the message was * @param type {@link ChatCodes#PLACE_CHAT_TYPE} if the message was
* received on the place object or the type associated with the * received on the place object or the type associated with the
* auxilliary chat object on which the message was received. * auxiliary chat object on which the message was received.
* @param args the arguments provided with the system message * @param args the arguments provided with the system message
* notification. * notification.
*/ */
@@ -273,7 +273,7 @@ public class ChatDirector
/** A list of registered chat displays. */ /** A list of registered chat displays. */
protected ArrayList _displays = new ArrayList(); protected ArrayList _displays = new ArrayList();
/** A mapping from auxilliary chat objects to the types under which /** A mapping from auxiliary chat objects to the types under which
* they are registered. */ * they are registered. */
protected HashIntMap _auxes = new HashIntMap(); protected HashIntMap _auxes = new HashIntMap();
} }
@@ -1,5 +1,5 @@
// //
// $Id: ChatDisplay.java,v 1.6 2001/12/17 01:06:34 mdb Exp $ // $Id: ChatDisplay.java,v 1.7 2002/02/03 08:22:38 shaper Exp $
package com.threerings.crowd.chat; package com.threerings.crowd.chat;
@@ -19,7 +19,7 @@ public interface ChatDisplay
* *
* @param type {@link ChatCodes#PLACE_CHAT_TYPE} for a speak message * @param type {@link ChatCodes#PLACE_CHAT_TYPE} for a speak message
* delivered via the place object, or for messages delivered via an * delivered via the place object, or for messages delivered via an
* auxilliary chat object, the type code provided when that auxilliary * auxiliary chat object, the type code provided when that auxiliary
* object was registered. * object was registered.
* @param speaker the username of the speaker. * @param speaker the username of the speaker.
* @param message the text of the message. * @param message the text of the message.
@@ -46,7 +46,7 @@ public interface ChatDisplay
* *
* @param type {@link ChatCodes#PLACE_CHAT_TYPE} for a speak message * @param type {@link ChatCodes#PLACE_CHAT_TYPE} for a speak message
* delivered via the place object, or for messages delivered via an * delivered via the place object, or for messages delivered via an
* auxilliary chat object, the type code provided when that auxilliary * auxiliary chat object, the type code provided when that auxiliary
* object was registered. * object was registered.
* @param message the text of the message. * @param message the text of the message.
*/ */
@@ -1,5 +1,5 @@
// //
// $Id: SpotCodes.java,v 1.4 2001/12/16 21:47:37 mdb Exp $ // $Id: SpotCodes.java,v 1.5 2002/02/03 08:22:38 shaper Exp $
package com.threerings.whirled.spot.client; package com.threerings.whirled.spot.client;
@@ -44,7 +44,7 @@ public interface SpotCodes extends ChatCodes, SceneCodes
/** The message identifier for a cluster speak request. */ /** The message identifier for a cluster speak request. */
public static final String CLUSTER_SPEAK_REQUEST = "ClusterSpeak"; public static final String CLUSTER_SPEAK_REQUEST = "ClusterSpeak";
/** The chat type code with which we register our cluster auxilliary /** The chat type code with which we register our cluster auxiliary
* chat objects. Chat display implementations should interpret chat * chat objects. Chat display implementations should interpret chat
* messages with this type accordingly. */ * messages with this type accordingly. */
public static final String CLUSTER_CHAT_TYPE = "clusterChat"; public static final String CLUSTER_CHAT_TYPE = "clusterChat";
@@ -1,5 +1,5 @@
// //
// $Id: SpotSceneDirector.java,v 1.9 2001/12/16 22:09:17 mdb Exp $ // $Id: SpotSceneDirector.java,v 1.10 2002/02/03 08:22:38 shaper Exp $
package com.threerings.whirled.spot.client; package com.threerings.whirled.spot.client;
@@ -237,7 +237,7 @@ public class SpotSceneDirector
DObjectManager omgr = _ctx.getDObjectManager(); DObjectManager omgr = _ctx.getDObjectManager();
// remove our old subscription if necessary // remove our old subscription if necessary
if (_clobj != null) { if (_clobj != null) {
_chatdir.removeAuxilliarySource(_clobj); _chatdir.removeAuxiliarySource(_clobj);
// unsubscribe from our old object // unsubscribe from our old object
omgr.unsubscribeFromObject(_clobj.getOid(), this); omgr.unsubscribeFromObject(_clobj.getOid(), this);
_clobj = null; _clobj = null;
@@ -278,7 +278,7 @@ public class SpotSceneDirector
// we've got our cluster chat object, configure the chat director // we've got our cluster chat object, configure the chat director
// with it and keep a reference ourselves // with it and keep a reference ourselves
if (_chatdir != null) { if (_chatdir != null) {
_chatdir.addAuxilliarySource(CLUSTER_CHAT_TYPE, object); _chatdir.addAuxiliarySource(CLUSTER_CHAT_TYPE, object);
_clobj = object; _clobj = object;
} }
} }
@@ -300,8 +300,8 @@ public class SpotSceneDirector
// unwire and clear out our cluster chat object if we've got one // unwire and clear out our cluster chat object if we've got one
if (_chatdir != null && _clobj != null) { if (_chatdir != null && _clobj != null) {
// unwire the auxilliary chat object // unwire the auxiliary chat object
_chatdir.removeAuxilliarySource(_clobj); _chatdir.removeAuxiliarySource(_clobj);
// unsubscribe as well // unsubscribe as well
DObjectManager omgr = _ctx.getDObjectManager(); DObjectManager omgr = _ctx.getDObjectManager();
omgr.unsubscribeFromObject(_clobj.getOid(), this); omgr.unsubscribeFromObject(_clobj.getOid(), this);