AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1044 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Dave Hoover
2011-01-01 05:03:18 +00:00
parent 24c3d4ef3e
commit a5e05979ba
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/micasa/client/MiCasaApp.java
+5 -8
View File
@@ -33,9 +33,8 @@ import com.threerings.presents.net.UsernamePasswordCreds;
import static com.threerings.micasa.Log.log;
/**
* The micasa app is the main point of entry for the MiCasa client
* application. It creates and initializes the myriad components of the
* client and sets all the proper wheels in motion.
* The micasa app is the main point of entry for the MiCasa client application. It creates and
* initializes the myriad components of the client and sets all the proper wheels in motion.
*/
public class MiCasaApp
{
@@ -59,8 +58,7 @@ public class MiCasaApp
try {
_client = (MiCasaClient)Class.forName(cclass).newInstance();
} catch (Exception e) {
log.warning("Unable to instantiate client class " +
"[cclass=" + cclass + "].", e);
log.warning("Unable to instantiate client class", "cclass", cclass, e);
}
// initialize our client instance
@@ -76,14 +74,13 @@ public class MiCasaApp
Client client = _client.getContext().getClient();
log.info("Using [server=" + server + ".");
log.info("Using", "server", server);
client.setServer(server, Client.DEFAULT_SERVER_PORTS);
// configure the client with some credentials and logon
if (username != null && password != null) {
// create and set our credentials
client.setCredentials(
new UsernamePasswordCreds(new Name(username), password));
client.setCredentials(new UsernamePasswordCreds(new Name(username), password));
client.logon();
}
}
src/main/java/com/threerings/micasa/simulator/server/SimulatorManager.java
+7 -12
View File
@@ -73,8 +73,7 @@ public class SimulatorManager
public class CreateGameTask
{
public CreateGameTask (BodyObject source, GameConfig config, String simClass,
int playerCount)
{
int playerCount) {
// save off game request info
_source = source;
_config = config;
@@ -94,7 +93,7 @@ public class SimulatorManager
_gmgr = (GameManager)_plreg.createPlace(config);
} catch (Exception e) {
log.warning("Unable to create game manager [e=" + e + "].", e);
log.warning("Unable to create game manager", "e", e, e);
return;
}
@@ -115,8 +114,7 @@ public class SimulatorManager
}
// resolve the simulant body objects
ClientResolutionListener listener = new ClientResolutionListener()
{
ClientResolutionListener listener = new ClientResolutionListener() {
public void clientResolved (Name username, ClientObject clobj) {
// hold onto the body object for later game creation
_sims.add(clobj);
@@ -126,7 +124,7 @@ public class SimulatorManager
}
}
public void resolutionFailed (Name username, Exception cause) {
log.warning("Unable to create simulant body object [error=" + cause + "].");
log.warning("Unable to create simulant body object", "error", cause);
}
};
@@ -141,8 +139,7 @@ public class SimulatorManager
* Called when all simulant body objects are present and the simulants are ready to be
* created.
*/
protected void createSimulants ()
{
protected void createSimulants () {
// finish setting up the simulants
for (int ii = 1; ii < _playerCount; ii++) {
// create the simulant object
@@ -150,8 +147,7 @@ public class SimulatorManager
try {
sim = (Simulant)Class.forName(_simClass).newInstance();
} catch (Exception e) {
log.warning("Unable to create simulant " +
"[class=" + _simClass + "].");
log.warning("Unable to create simulant", "class", _simClass);
return;
}
@@ -167,8 +163,7 @@ public class SimulatorManager
try {
_locman.moveTo(bobj, _gobj.getOid());
} catch (Exception e) {
log.warning("Failed to move simulant into room " +
"[e=" + e + "].");
log.warning("Failed to move simulant into room", "e", e);
return;
}
}