Switch to new samskivert logging API.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5134 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -49,7 +49,6 @@ import com.threerings.util.MessageManager;
|
||||
import com.threerings.util.Name;
|
||||
import com.threerings.util.TimeUtil;
|
||||
|
||||
import com.threerings.crowd.Log;
|
||||
import com.threerings.crowd.client.LocationObserver;
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
import com.threerings.crowd.data.CrowdCodes;
|
||||
@@ -63,6 +62,8 @@ import com.threerings.crowd.chat.data.TellFeedbackMessage;
|
||||
import com.threerings.crowd.chat.data.UserMessage;
|
||||
import com.threerings.crowd.chat.data.UserSystemMessage;
|
||||
|
||||
import static com.threerings.crowd.Log.log;
|
||||
|
||||
/**
|
||||
* The chat director is the client side coordinator of all chat related services. It handles both
|
||||
* place constrained chat as well as direct messaging.
|
||||
@@ -148,7 +149,7 @@ public class ChatDirector extends BasicDirector
|
||||
|
||||
// register our default chat handlers
|
||||
if (_bundle == null || _msgmgr == null) {
|
||||
Log.warning("Null bundle or message manager given to ChatDirector");
|
||||
log.warning("Null bundle or message manager given to ChatDirector");
|
||||
return;
|
||||
}
|
||||
registerCommandHandlers();
|
||||
@@ -1001,7 +1002,7 @@ public class ChatDirector extends BasicDirector
|
||||
if (bundle != null && _msgmgr != null) {
|
||||
MessageBundle msgb = _msgmgr.getBundle(bundle);
|
||||
if (msgb == null) {
|
||||
Log.warning("No message bundle available to translate message " +
|
||||
log.warning("No message bundle available to translate message " +
|
||||
"[bundle=" + bundle + ", message=" + message + "].");
|
||||
} else {
|
||||
message = msgb.xlate(message);
|
||||
|
||||
@@ -30,7 +30,7 @@ import com.samskivert.util.StringUtil;
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.crowd.Log;
|
||||
import static com.threerings.crowd.Log.log;
|
||||
|
||||
/**
|
||||
* A chat filter that can filter out curse words from user chat.
|
||||
@@ -150,7 +150,7 @@ public abstract class CurseFilter implements ChatFilter
|
||||
String mapping = st.nextToken();
|
||||
StringTokenizer st2 = new StringTokenizer(mapping, "=");
|
||||
if (st2.countTokens() != 2) {
|
||||
Log.warning("Something looks wrong in the x.cursewords " +
|
||||
log.warning("Something looks wrong in the x.cursewords " +
|
||||
"properties (" + mapping + "), skipping.");
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -27,10 +27,11 @@ import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
import com.threerings.presents.server.InvocationManager;
|
||||
|
||||
import com.threerings.crowd.Log;
|
||||
import com.threerings.crowd.chat.data.ChatCodes;
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
|
||||
import static com.threerings.crowd.Log.log;
|
||||
|
||||
/**
|
||||
* Wires up the {@link SpeakService} to a particular distributed object. A server entity can make
|
||||
* "speech" available among the subscribers of a particular distributed object by constructing a
|
||||
@@ -86,7 +87,7 @@ public class SpeakHandler
|
||||
// ensure that the speaker is valid
|
||||
if ((mode == ChatCodes.BROADCAST_MODE) ||
|
||||
(_validator != null && !_validator.isValidSpeaker(_speakObj, caller, mode))) {
|
||||
Log.warning("Refusing invalid speak request [caller=" + caller.who() +
|
||||
log.warning("Refusing invalid speak request [caller=" + caller.who() +
|
||||
", speakObj=" + _speakObj.which() +
|
||||
", message=" + message + ", mode=" + mode + "].");
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
import com.threerings.presents.server.InvocationProvider;
|
||||
|
||||
import com.threerings.crowd.Log;
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
import com.threerings.crowd.server.CrowdServer;
|
||||
|
||||
@@ -42,6 +41,8 @@ import com.threerings.crowd.chat.data.SpeakObject;
|
||||
import com.threerings.crowd.chat.data.SystemMessage;
|
||||
import com.threerings.crowd.chat.data.UserMessage;
|
||||
|
||||
import static com.threerings.crowd.Log.log;
|
||||
|
||||
/**
|
||||
* Provides the back-end of the chat speaking facilities.
|
||||
*/
|
||||
@@ -174,7 +175,7 @@ public class SpeakUtil
|
||||
public static void sendMessage (DObject speakObj, ChatMessage msg)
|
||||
{
|
||||
if (speakObj == null) {
|
||||
Log.warning("Dropping speak message, no speak obj '" + msg + "'.");
|
||||
log.warning("Dropping speak message, no speak obj '" + msg + "'.");
|
||||
Thread.dumpStack();
|
||||
return;
|
||||
}
|
||||
@@ -192,7 +193,7 @@ public class SpeakUtil
|
||||
_messageMapper.message = null;
|
||||
|
||||
} else {
|
||||
Log.info("Unable to note listeners [dclass=" + speakObj.getClass() +
|
||||
log.info("Unable to note listeners [dclass=" + speakObj.getClass() +
|
||||
", msg=" + msg + "].");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user