Style fixes and import pruning. Beware, CheckStyle is (finally) coming to town.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5240 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-07-18 18:32:59 +00:00
parent 45f0f9d8b7
commit e41dda3018
37 changed files with 103 additions and 110 deletions
@@ -57,8 +57,8 @@ import static com.threerings.bureau.Log.log;
public class BureauRegistry
{
/**
* Defines how a bureau is launched. Instances are associated to bureau types by the server on
* startup. The instances are used whenever the registry needs to launch a bureau for an agent
* Defines how a bureau is launched. Instances are associated to bureau types by the server on
* startup. The instances are used whenever the registry needs to launch a bureau for an agent
* with the assocated bureau type.
*/
public static interface Launcher
@@ -168,7 +168,7 @@ public class BureauRegistry
}
if (!bureau.token.equals(creds.sessionToken)) {
return "Bureau " + creds.bureauId +
return "Bureau " + creds.bureauId +
" does not match credentials token";
}
@@ -183,11 +183,11 @@ public class BureauRegistry
* @param cmdGenerator the generator to be used for bureaus of <code>bureauType</code>
*/
public void setCommandGenerator (
String bureauType,
String bureauType,
final CommandGenerator cmdGenerator)
{
setLauncher(bureauType, new Launcher () {
public void launchBureau (String bureauId, String token)
public void launchBureau (String bureauId, String token)
throws IOException {
ProcessBuilder builder = new ProcessBuilder(
cmdGenerator.createCommand(bureauId, token));
@@ -338,7 +338,7 @@ public class BureauRegistry
}
if (bureau.client != null) {
log.warning(
"Multiple sessions for the same bureau", "id", id, "client", client, "bureau",
"Multiple sessions for the same bureau", "id", id, "client", client, "bureau",
bureau);
}
bureau.client = client;
@@ -353,7 +353,7 @@ public class BureauRegistry
}
if (bureau.client == null) {
log.warning(
"Multiple logouts from the same bureau", "id", id, "client", client, "bureau",
"Multiple logouts from the same bureau", "id", id, "client", client, "bureau",
bureau);
}
bureau.client = null;
@@ -564,12 +564,12 @@ public class BureauRegistry
}
/**
* Create a hard-to-guess token that the bureau can use to authenticate itself when it tries
* Create a hard-to-guess token that the bureau can use to authenticate itself when it tries
* to log in.
*/
protected String generateToken (String bureauId)
{
String tokenSource = bureauId + "@" +
String tokenSource = bureauId + "@" +
System.currentTimeMillis() + "r" + Math.random();
return StringUtil.md5hex(tokenSource);
}
@@ -581,7 +581,7 @@ public class BureauRegistry
{
LauncherUnit (Bureau bureau)
{
super("LauncherUnit for " + bureau + ": " +
super("LauncherUnit for " + bureau + ": " +
StringUtil.toString(bureau.launcher));
_bureau = bureau;
}