From d59010a2761efbd31eb1e1bb617a087199e8044c Mon Sep 17 00:00:00 2001
From: Dave Hoover <dhoover@threerings.net>
Date: Thu, 26 May 2011 17:31:27 +0000
Subject: [PATCH] Whitespace

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1090 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../parlor/game/client/GameController.java           |  3 +--
 .../java/com/threerings/parlor/game/data/GameAI.java |  6 ++----
 .../parlor/turn/server/TurnGameManagerDelegate.java  | 12 ++++++------
 .../puzzle/drop/client/DropControllerDelegate.java   |  5 ++---
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/threerings/parlor/game/client/GameController.java b/src/main/java/com/threerings/parlor/game/client/GameController.java
index cb9fe028..f4ece5a0 100644
--- a/src/main/java/com/threerings/parlor/game/client/GameController.java
+++ b/src/main/java/com/threerings/parlor/game/client/GameController.java
@@ -198,8 +198,7 @@ public abstract class GameController extends PlaceController
         if (event.getName().equals(GameObject.STATE)) {
             int newState = event.getIntValue();
             if (!stateDidChange(newState)) {
-                log.warning("Game transitioned to unknown state [gobj=" + _gobj +
-                            ", state=" + newState + "].");
+                log.warning("Game transitioned to unknown state", "gobj", _gobj, "state", newState);
             }
         }
     }
diff --git a/src/main/java/com/threerings/parlor/game/data/GameAI.java b/src/main/java/com/threerings/parlor/game/data/GameAI.java
index bb4d1303..2e07c006 100644
--- a/src/main/java/com/threerings/parlor/game/data/GameAI.java
+++ b/src/main/java/com/threerings/parlor/game/data/GameAI.java
@@ -28,8 +28,7 @@ import com.threerings.io.SimpleStreamableObject;
  */
 public class GameAI extends SimpleStreamableObject
 {
-    /** The "personality" of the AI, which can be interpreted by
-     * each puzzle. */
+    /** The "personality" of the AI, which can be interpreted by each puzzle. */
     public int personality;
 
     /** The skill level of the AI. */
@@ -41,8 +40,7 @@ public class GameAI extends SimpleStreamableObject
     }
 
     /**
-     * Constructs an AI with the specified (game-interpreted) skill and
-     * personality.
+     * Constructs an AI with the specified (game-interpreted) skill and personality.
      */
     public GameAI (int personality, int skill)
     {
diff --git a/src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java b/src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java
index 6f378ef7..2cb3aa07 100644
--- a/src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java
+++ b/src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java
@@ -91,8 +91,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
     {
         // sanity check
         if (_turnIdx < 0 || _turnIdx >= _turnGame.getPlayers().length) {
-            log.warning("startTurn() called with invalid turn index [game=" + where() +
-                        ", turnIdx=" + _turnIdx + "].");
+            log.warning("startTurn() called with invalid turn index", "game", where(),
+                "turnIdx", _turnIdx);
             // abort, abort
             return;
         }
@@ -223,8 +223,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
             if (_turnIdx == oturnIdx) {
                 // if we've wrapped all the way around, stop where we are even if the current
                 // player is not active.
-                log.warning("1 or less active players. Unable to properly change turn. " +
-                            "[game=" + where() + "].");
+                log.warning("1 or less active players. Unable to properly change turn.",
+                    "game", where());
                 break;
             }
         } while (!_tgmgr.isActivePlayer(_turnIdx));
@@ -241,8 +241,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
             while (!_tgmgr.isActivePlayer(_turnIdx)) {
                 _turnIdx = (_turnIdx + 1) % size;
                 if (_turnIdx == firstPick) {
-                    log.warning("No players eligible for randomly-assigned turn. Choking. " +
-                                "[game=" + where() + "].");
+                    log.warning("No players eligible for randomly-assigned turn. Choking.",
+                        "game", where());
                     return;
                 }
             }
diff --git a/src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java b/src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java
index bc9cf5fa..f517fc52 100644
--- a/src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java
+++ b/src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java
@@ -332,7 +332,7 @@ public abstract class DropControllerDelegate extends PuzzleControllerDelegate
 
         // if the sprite has made it to the bottom of the board then we don't want to allow it to
         // "virtually" fall any further because of the bounce interval
-         float pctdone = (row >= (_bhei - 1)) ? 0 :
+        float pctdone = (row >= (_bhei - 1)) ? 0 :
              _blocksprite.getPercentDone(_dview.getTimeStamp());
 
         // get the drop block position resulting from the move
@@ -1140,8 +1140,7 @@ public abstract class DropControllerDelegate extends PuzzleControllerDelegate
     };
 
     /** A piece operation that will update piece sprites as board positions are updated. */
-    protected DropBoard.PieceOperation _updateBoardOp =
-        new DropBoard.PieceOperation() {
+    protected DropBoard.PieceOperation _updateBoardOp = new DropBoard.PieceOperation() {
         public boolean execute (DropBoard board, int col, int row) {
             _dview.updatePiece(col, row);
             return true;