Switch to new logging API.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@608 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2008-05-27 20:00:28 +00:00
parent 3b7ef57a20
commit a133c7c693
91 changed files with 486 additions and 722 deletions
@@ -23,11 +23,12 @@ package com.threerings.parlor.client;
import com.threerings.util.Name;
import com.threerings.parlor.Log;
import com.threerings.parlor.data.ParlorCodes;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.parlor.util.ParlorContext;
import static com.threerings.parlor.Log.log;
/**
* The invitation class is used to track information related to
* outstanding invitations generated by or targeted to this client.
@@ -151,7 +152,7 @@ public class Invitation
{
// make sure we have an observer to notify
if (_observer == null) {
Log.warning("No observer registered for invitation " +
log.warning("No observer registered for invitation " +
this + ".");
return;
}
@@ -173,10 +174,9 @@ public class Invitation
}
} catch (Exception e) {
Log.warning("Invitation response observer choked on response " +
log.warning("Invitation response observer choked on response " +
"[code=" + code + ", arg=" + arg +
", invite=" + this + "].");
Log.logStackTrace(e);
", invite=" + this + "].", e);
}
// unless the invitation was countered, we can remove it from the
@@ -30,11 +30,12 @@ import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.parlor.Log;
import com.threerings.parlor.data.ParlorCodes;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.parlor.util.ParlorContext;
import static com.threerings.parlor.Log.log;
/**
* The parlor director manages the client side of the game configuration and matchmaking
* processes. It is also the entity that is listening for game start notifications which it then
@@ -132,7 +133,7 @@ public class ParlorDirector extends BasicDirector
// documentation inherited from interface
public void gameIsReady (int gameOid)
{
Log.info("Handling game ready [goid=" + gameOid + "].");
log.info("Handling game ready [goid=" + gameOid + "].");
// see what our observers have to say about it
boolean handled = false;
@@ -163,8 +164,7 @@ public class ParlorDirector extends BasicDirector
_handler.invitationReceived(invite);
} catch (Exception e) {
Log.warning("Invitation handler choked on invite notification " + invite + ".");
Log.logStackTrace(e);
log.warning("Invitation handler choked on invite notification " + invite + ".", e);
}
}
@@ -174,7 +174,7 @@ public class ParlorDirector extends BasicDirector
// look up the invitation record for this invitation
Invitation invite = (Invitation)_pendingInvites.get(remoteId);
if (invite == null) {
Log.warning("Have no record of invitation for which we received a response?! " +
log.warning("Have no record of invitation for which we received a response?! " +
"[remoteId=" + remoteId + ", code=" + code + ", arg=" + arg + "].");
} else {
@@ -35,13 +35,14 @@ import com.threerings.presents.dobj.SetListener;
import com.threerings.crowd.data.BodyObject;
import com.threerings.parlor.Log;
import com.threerings.parlor.data.Table;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.data.TableLobbyObject;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.parlor.util.ParlorContext;
import static com.threerings.parlor.Log.log;
/**
* As tables are created and managed within the scope of a place (a lobby), we want to fold the
* table management functionality into the standard hierarchy of place controllers that deal with
@@ -146,14 +147,14 @@ public class TableDirector extends BasicDirector
{
// if we're already in a table, refuse the request
if (_ourTable != null) {
Log.warning("Ignoring request to create table as we're already in a table " +
log.warning("Ignoring request to create table as we're already in a table " +
"[table=" + _ourTable + "].");
return;
}
// make sure we're currently in a place
if (_tlobj == null) {
Log.warning("Requested to create a table but we're not currently in a place " +
log.warning("Requested to create a table but we're not currently in a place " +
"[config=" + config + "].");
return;
}
@@ -170,14 +171,14 @@ public class TableDirector extends BasicDirector
{
// if we're already in a table, refuse the request
if (_ourTable != null) {
Log.warning("Ignoring request to join table as we're already in a table " +
log.warning("Ignoring request to join table as we're already in a table " +
"[table=" + _ourTable + "].");
return;
}
// make sure we're currently in a place
if (_tlobj == null) {
Log.warning("Requested to join a table but we're not currently in a place " +
log.warning("Requested to join a table but we're not currently in a place " +
"[tableId=" + tableId + "].");
return;
}
@@ -194,7 +195,7 @@ public class TableDirector extends BasicDirector
{
// make sure we're currently in a place
if (_tlobj == null) {
Log.warning("Requested to leave a table but we're not currently in a place " +
log.warning("Requested to leave a table but we're not currently in a place " +
"[tableId=" + tableId + "].");
return;
}
@@ -210,7 +211,7 @@ public class TableDirector extends BasicDirector
public void startTableNow (int tableId)
{
if (_tlobj == null) {
Log.warning("Requested to start a table but we're not currently in a place " +
log.warning("Requested to start a table but we're not currently in a place " +
"[tableId=" + tableId + "].");
return;
}
@@ -270,13 +271,13 @@ public class TableDirector extends BasicDirector
int tableId = (Integer)result;
if (_tlobj == null) {
// we've left, it's none of our concern anymore
Log.info("Table created, but no lobby. [tableId=" + tableId + "].");
log.info("Table created, but no lobby. [tableId=" + tableId + "].");
return;
}
Table table = (Table) _tlobj.getTables().get(tableId);
if (table == null) {
Log.warning("Table created, but where is it? [tableId=" + tableId + "]");
log.warning("Table created, but where is it? [tableId=" + tableId + "]");
return;
}
@@ -289,7 +290,7 @@ public class TableDirector extends BasicDirector
// from interface TableService.ResultListener
public void requestFailed (String reason)
{
Log.warning("Table action failed [reason=" + reason + "].");
log.warning("Table action failed [reason=" + reason + "].");
}
/**