Imports cleanup

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@751 c613c5cb-e716-0410-b11b-feb51c14d237

src/java/com/threerings/micasa/client/ChatPanel.java

@@ -21,13 +21,13 @@
 
 package com.threerings.micasa.client;
 
+import java.util.StringTokenizer;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import java.util.StringTokenizer;
-
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -35,10 +35,8 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
-
 import javax.swing.event.AncestorEvent;
 import javax.swing.event.AncestorListener;
-
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.Style;
@@ -57,7 +55,6 @@ import com.threerings.crowd.chat.data.ChatCodes;
 import com.threerings.crowd.chat.data.ChatMessage;
 import com.threerings.crowd.chat.data.SystemMessage;
 import com.threerings.crowd.chat.data.UserMessage;
-
 import com.threerings.crowd.client.OccupantObserver;
 import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.data.OccupantInfo;

src/java/com/threerings/micasa/client/ClientController.java

@@ -22,6 +22,7 @@
 package com.threerings.micasa.client;
 
 import java.awt.event.ActionEvent;
+
 import com.samskivert.swing.Controller;
 
 import com.threerings.presents.client.Client;

src/java/com/threerings/micasa/client/MiCasaApp.java

@@ -24,6 +24,7 @@ package com.threerings.micasa.client;
 import java.io.IOException;
 
 import com.samskivert.swing.util.SwingUtil;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.Client;

src/java/com/threerings/micasa/client/MiCasaApplet.java

@@ -22,9 +22,11 @@
 package com.threerings.micasa.client;
 
 import java.applet.Applet;
+
 import java.io.IOException;
 
 import com.samskivert.swing.util.SwingUtil;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.Client;

src/java/com/threerings/micasa/client/MiCasaClient.java

@@ -21,25 +21,27 @@
 
 package com.threerings.micasa.client;
 
+import java.io.IOException;
+
 import java.awt.EventQueue;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.IOException;
+
 import javax.swing.JPanel;
 
 import com.samskivert.util.Config;
 import com.samskivert.util.RunQueue;
+
 import com.threerings.util.MessageManager;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.dobj.DObjectManager;
 
+import com.threerings.crowd.chat.client.ChatDirector;
 import com.threerings.crowd.client.LocationDirector;
 import com.threerings.crowd.client.OccupantDirector;
 import com.threerings.crowd.client.PlaceView;
 
-import com.threerings.crowd.chat.client.ChatDirector;
-
 import com.threerings.parlor.client.ParlorDirector;
 
 import com.threerings.micasa.util.MiCasaContext;

src/java/com/threerings/micasa/lobby/LobbyConfig.java

@@ -21,17 +21,20 @@
 
 package com.threerings.micasa.lobby;
 
+import java.util.Properties;
+
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 
-import java.util.Properties;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.crowd.client.PlaceController;
 import com.threerings.crowd.data.PlaceConfig;
-import com.threerings.micasa.util.MiCasaContext;
+
 import com.threerings.parlor.game.data.GameConfig;
 
+import com.threerings.micasa.util.MiCasaContext;
+
 public class LobbyConfig extends PlaceConfig
 {
     @Override

src/java/com/threerings/micasa/lobby/LobbyController.java

@@ -23,13 +23,15 @@ package com.threerings.micasa.lobby;
 
 import com.threerings.util.Name;
 
-import com.threerings.crowd.data.PlaceConfig;
-import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.client.PlaceController;
 import com.threerings.crowd.client.PlaceView;
+import com.threerings.crowd.data.PlaceConfig;
+import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.util.CrowdContext;
 
-import com.threerings.parlor.client.*;
+import com.threerings.parlor.client.Invitation;
+import com.threerings.parlor.client.InvitationHandler;
+import com.threerings.parlor.client.InvitationResponseObserver;
 import com.threerings.parlor.game.data.GameConfig;
 
 import com.threerings.micasa.util.MiCasaContext;

src/java/com/threerings/micasa/lobby/LobbyManager.java

@@ -22,6 +22,7 @@
 package com.threerings.micasa.lobby;
 
 import java.util.Properties;
+
 import com.samskivert.util.StringUtil;
 
 import com.threerings.crowd.data.PlaceObject;

src/java/com/threerings/micasa/lobby/LobbyMarshaller.java

@@ -21,10 +21,11 @@
 
 package com.threerings.micasa.lobby;
 
+import java.util.List;
+
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-import java.util.List;
 
 /**
  * Provides the implementation of the {@link LobbyService} interface

src/java/com/threerings/micasa/lobby/LobbyPanel.java

@@ -21,7 +21,10 @@
 
 package com.threerings.micasa.lobby;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 
 import com.samskivert.swing.Controller;
 import com.samskivert.swing.HGroupLayout;
@@ -30,7 +33,8 @@ import com.samskivert.swing.VGroupLayout;
 import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.data.PlaceObject;
 
-import com.threerings.micasa.client.*;
+import com.threerings.micasa.client.ChatPanel;
+import com.threerings.micasa.client.OccupantList;
 import com.threerings.micasa.util.MiCasaContext;
 
 /**

src/java/com/threerings/micasa/lobby/LobbyRegistry.java

@@ -29,9 +29,10 @@ import java.util.StringTokenizer;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.samskivert.util.StringUtil;
 import com.google.inject.Inject;
 
+import com.samskivert.util.StringUtil;
+
 import com.threerings.util.StreamableArrayList;
 
 import com.threerings.presents.data.ClientObject;

src/java/com/threerings/micasa/lobby/LobbySelector.java

@@ -21,6 +21,10 @@
 
 package com.threerings.micasa.lobby;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -28,9 +32,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.DefaultListModel;
@@ -39,6 +40,7 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 
 import com.threerings.crowd.data.PlaceObject;
+
 import com.threerings.micasa.util.MiCasaContext;
 
 import static com.threerings.micasa.Log.log;

src/java/com/threerings/micasa/lobby/table/TableItem.java

@@ -22,10 +22,9 @@
 package com.threerings.micasa.lobby.table;
 
 import java.awt.Color;
-import java.awt.GridBagLayout;
 import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.awt.Insets;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -38,8 +37,8 @@ import com.threerings.util.Name;
 
 import com.threerings.crowd.data.BodyObject;
 
-import com.threerings.parlor.client.TableDirector;
 import com.threerings.parlor.client.SeatednessObserver;
+import com.threerings.parlor.client.TableDirector;
 import com.threerings.parlor.data.Table;
 
 import com.threerings.micasa.util.MiCasaContext;

src/java/com/threerings/micasa/lobby/table/TableListView.java

@@ -34,8 +34,8 @@ import com.samskivert.swing.HGroupLayout;
 import com.samskivert.swing.VGroupLayout;
 import com.samskivert.swing.util.SwingUtil;
 
-import com.threerings.micasa.lobby.LobbyConfig;
-import com.threerings.micasa.util.MiCasaContext;
+import com.threerings.crowd.client.PlaceView;
+import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.parlor.client.SeatednessObserver;
 import com.threerings.parlor.client.TableConfigurator;
@@ -46,8 +46,8 @@ import com.threerings.parlor.game.client.GameConfigurator;
 import com.threerings.parlor.game.client.SwingGameConfigurator;
 import com.threerings.parlor.game.data.GameConfig;
 
-import com.threerings.crowd.client.PlaceView;
-import com.threerings.crowd.data.PlaceObject;
+import com.threerings.micasa.lobby.LobbyConfig;
+import com.threerings.micasa.util.MiCasaContext;
 
 import static com.threerings.micasa.Log.log;
 

src/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java

@@ -22,6 +22,7 @@
 package com.threerings.micasa.lobby.table;
 
 import javax.swing.JComponent;
+
 import com.threerings.micasa.lobby.LobbyConfig;
 import com.threerings.micasa.util.MiCasaContext;
 

src/java/com/threerings/micasa/lobby/table/TableLobbyManager.java

@@ -22,7 +22,9 @@
 package com.threerings.micasa.lobby.table;
 
 import com.threerings.crowd.data.PlaceObject;
+
 import com.threerings.parlor.server.TableManager;
+
 import com.threerings.micasa.lobby.LobbyManager;
 
 /**

src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java

@@ -21,9 +21,10 @@
 
 package com.threerings.micasa.lobby.table;
 
+import com.threerings.presents.dobj.DSet;
+
 import com.threerings.parlor.data.Table;
 import com.threerings.parlor.data.TableMarshaller;
-import com.threerings.presents.dobj.DSet;
 
 import com.threerings.micasa.lobby.LobbyObject;
 

src/java/com/threerings/micasa/server/MiCasaClient.java

@@ -24,6 +24,7 @@ package com.threerings.micasa.server;
 import com.google.inject.Inject;
 
 import com.threerings.presents.net.BootstrapData;
+
 import com.threerings.crowd.server.CrowdClient;
 
 import com.threerings.micasa.data.MiCasaBootstrapData;

src/java/com/threerings/micasa/simulator/client/SimpleClient.java

@@ -21,27 +21,27 @@
 
 package com.threerings.micasa.simulator.client;
 
+import java.io.IOException;
+
 import java.awt.EventQueue;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
-import java.io.IOException;
-
 import javax.swing.JPanel;
 
 import com.samskivert.util.Config;
 import com.samskivert.util.RunQueue;
+
 import com.threerings.util.MessageManager;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.dobj.DObjectManager;
 
+import com.threerings.crowd.chat.client.ChatDirector;
 import com.threerings.crowd.client.LocationDirector;
 import com.threerings.crowd.client.OccupantDirector;
 import com.threerings.crowd.client.PlaceView;
 
-import com.threerings.crowd.chat.client.ChatDirector;
-
 import com.threerings.parlor.client.ParlorDirector;
 import com.threerings.parlor.util.ParlorContext;
 

src/java/com/threerings/micasa/simulator/client/SimulatorApp.java

@@ -26,11 +26,12 @@ import javax.swing.JFrame;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-import com.samskivert.swing.Controller;
-import com.samskivert.swing.util.SwingUtil;
 import com.samskivert.util.Interval;
 import com.samskivert.util.ResultListener;
 
+import com.samskivert.swing.Controller;
+import com.samskivert.swing.util.SwingUtil;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.Client;

src/java/com/threerings/micasa/simulator/client/SimulatorController.java

@@ -22,6 +22,7 @@
 package com.threerings.micasa.simulator.client;
 
 import java.awt.event.ActionEvent;
+
 import com.samskivert.swing.Controller;
 
 import com.threerings.presents.client.Client;

src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java

@@ -21,11 +21,13 @@
 
 package com.threerings.micasa.simulator.data;
 
-import com.threerings.micasa.simulator.client.SimulatorService;
-import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 
+import com.threerings.parlor.game.data.GameConfig;
+
+import com.threerings.micasa.simulator.client.SimulatorService;
+
 /**
  * Provides the implementation of the {@link SimulatorService} interface
  * that marshalls the arguments and delivers the request to the provider

src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java

@@ -21,12 +21,14 @@
 
 package com.threerings.micasa.simulator.server;
 
-import com.threerings.micasa.simulator.data.SimulatorMarshaller;
-import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
+import com.threerings.parlor.game.data.GameConfig;
+
+import com.threerings.micasa.simulator.data.SimulatorMarshaller;
+
 /**
  * Dispatches requests to the {@link SimulatorProvider}.
  */

src/java/com/threerings/micasa/simulator/server/SimulatorManager.java

@@ -26,6 +26,7 @@ import java.util.List;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;

src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java

@@ -25,6 +25,7 @@ import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
 
 import com.threerings.crowd.data.BodyObject;
+
 import com.threerings.parlor.game.data.GameConfig;
 
 import static com.threerings.micasa.Log.log;

src/java/com/threerings/micasa/util/MiCasaContext.java

@@ -22,7 +22,9 @@
 package com.threerings.micasa.util;
 
 import com.threerings.util.MessageManager;
+
 import com.threerings.parlor.util.ParlorContext;
+
 import com.threerings.micasa.client.MiCasaFrame;
 
 /**

src/java/com/threerings/parlor/card/client/CardGameDecoder.java

@@ -21,9 +21,10 @@
 
 package com.threerings.parlor.card.client;
 
+import com.threerings.presents.client.InvocationDecoder;
+
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.Hand;
-import com.threerings.presents.client.InvocationDecoder;
 
 /**
  * Dispatches calls to a {@link CardGameReceiver} instance.

src/java/com/threerings/parlor/card/client/CardGameReceiver.java

@@ -21,11 +21,11 @@
 
 package com.threerings.parlor.card.client;
 
+import com.threerings.presents.client.InvocationReceiver;
+
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.Hand;
 
-import com.threerings.presents.client.InvocationReceiver;
-
 /**
  * Defines, for the card game services, a set of notifications delivered
  * asynchronously by the server to the client.

src/java/com/threerings/parlor/card/client/CardPanel.java

@@ -21,17 +21,17 @@
 
 package com.threerings.parlor.card.client;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
 import javax.swing.event.MouseInputAdapter;
 
 import com.samskivert.util.ObserverList;
@@ -46,6 +46,7 @@ import com.threerings.media.sprite.Sprite;
 import com.threerings.media.util.LinePath;
 import com.threerings.media.util.Path;
 import com.threerings.media.util.PathSequence;
+
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.CardCodes;
 import com.threerings.parlor.card.data.Hand;

src/java/com/threerings/parlor/card/client/CardSprite.java

@@ -25,6 +25,7 @@ import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 
 import com.threerings.media.sprite.FadableImageSprite;
+
 import com.threerings.parlor.card.data.Card;
 
 /**

src/java/com/threerings/parlor/card/server/CardGameManager.java

@@ -21,6 +21,8 @@
 
 package com.threerings.parlor.card.server;
 
+import com.threerings.presents.data.ClientObject;
+
 import com.threerings.crowd.data.OccupantInfo;
 import com.threerings.crowd.server.OccupantOp;
 
@@ -33,8 +35,6 @@ import com.threerings.parlor.game.data.GameObject;
 import com.threerings.parlor.game.server.GameManager;
 import com.threerings.parlor.turn.server.TurnGameManager;
 
-import com.threerings.presents.data.ClientObject;
-
 /**
  * A manager class for card games.  Handles common functions like dealing
  * hands of cards to all players.

src/java/com/threerings/parlor/card/server/CardGameSender.java

@@ -21,12 +21,13 @@
 
 package com.threerings.parlor.card.server;
 
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationSender;
+
 import com.threerings.parlor.card.client.CardGameDecoder;
 import com.threerings.parlor.card.client.CardGameReceiver;
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.Hand;
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationSender;
 
 /**
  * Used to issue notifications to a {@link CardGameReceiver} instance on a

src/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java

@@ -21,9 +21,8 @@
 
 package com.threerings.parlor.card.trick.client;
 
-import com.threerings.parlor.turn.client.TurnGameControllerDelegate;
-
 import com.threerings.parlor.card.client.CardGameController;
+import com.threerings.parlor.turn.client.TurnGameControllerDelegate;
 
 /**
  * A card game controller delegate for trick-based card games, such as

src/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java

@@ -21,11 +21,11 @@
 
 package com.threerings.parlor.card.trick.client;
 
-import com.threerings.parlor.card.data.Card;
-
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
+import com.threerings.parlor.card.data.Card;
+
 /**
  * Service calls related to trick card games.
  */

src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java

@@ -21,11 +21,12 @@
 
 package com.threerings.parlor.card.trick.data;
 
-import com.threerings.parlor.card.data.Card;
-import com.threerings.parlor.card.trick.client.TrickCardGameService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 
+import com.threerings.parlor.card.data.Card;
+import com.threerings.parlor.card.trick.client.TrickCardGameService;
+
 /**
  * Provides the implementation of the {@link TrickCardGameService} interface
  * that marshalls the arguments and delivers the request to the provider

src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java

@@ -21,12 +21,13 @@
 
 package com.threerings.parlor.card.trick.server;
 
-import com.threerings.parlor.card.data.Card;
-import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
+import com.threerings.parlor.card.data.Card;
+import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller;
+
 /**
  * Dispatches requests to the {@link TrickCardGameProvider}.
  */

src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java

@@ -39,8 +39,6 @@ import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.data.PlaceObject;
 
-import com.threerings.parlor.turn.server.TurnGameManagerDelegate;
-
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.CardGameObject;
 import com.threerings.parlor.card.data.Deck;
@@ -48,6 +46,7 @@ import com.threerings.parlor.card.data.Hand;
 import com.threerings.parlor.card.data.PlayerCard;
 import com.threerings.parlor.card.server.CardGameManager;
 import com.threerings.parlor.card.trick.data.TrickCardGameObject;
+import com.threerings.parlor.turn.server.TurnGameManagerDelegate;
 
 import static com.threerings.parlor.card.Log.log;
 

src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java

@@ -21,11 +21,12 @@
 
 package com.threerings.parlor.card.trick.server;
 
-import com.threerings.parlor.card.data.Card;
-import com.threerings.parlor.card.trick.client.TrickCardGameService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
 
+import com.threerings.parlor.card.data.Card;
+import com.threerings.parlor.card.trick.client.TrickCardGameService;
+
 /**
  * Defines the server-side of the {@link TrickCardGameService}.
  */

src/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java

@@ -23,7 +23,9 @@ package com.threerings.parlor.client;
 
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
+
 import com.samskivert.swing.SimpleSlider;
+
 import com.threerings.parlor.game.client.SwingGameConfigurator;
 
 /**

src/java/com/threerings/parlor/client/ParlorDecoder.java

@@ -21,10 +21,12 @@
 
 package com.threerings.parlor.client;
 
-import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.presents.client.InvocationDecoder;
 import com.threerings.util.Name;
 
+import com.threerings.presents.client.InvocationDecoder;
+
+import com.threerings.parlor.game.data.GameConfig;
+
 /**
  * Dispatches calls to a {@link ParlorReceiver} instance.
  */

src/java/com/threerings/parlor/client/ParlorDirector.java

@@ -26,6 +26,7 @@ import java.util.List;
 import com.google.common.collect.Lists;
 
 import com.samskivert.util.HashIntMap;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.BasicDirector;

src/java/com/threerings/parlor/client/TableConfigurator.java

@@ -21,11 +21,9 @@
 
 package com.threerings.parlor.client;
 
-import com.threerings.parlor.util.ParlorContext;
-
 import com.threerings.parlor.data.TableConfig;
-
 import com.threerings.parlor.game.client.GameConfigurator;
+import com.threerings.parlor.util.ParlorContext;
 
 /**
  * This should be implemented some user-interface element that allows

src/java/com/threerings/parlor/client/TableDirector.java

@@ -23,11 +23,11 @@ package com.threerings.parlor.client;
 
 import com.samskivert.util.ObjectUtil;
 import com.samskivert.util.ObserverList;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
-
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.EntryAddedEvent;
 import com.threerings.presents.dobj.EntryRemovedEvent;

src/java/com/threerings/parlor/data/ParlorMarshaller.java

@@ -21,13 +21,15 @@
 
 package com.threerings.parlor.data;
 
-import com.threerings.parlor.client.ParlorService;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
+
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.client.ParlorService;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Provides the implementation of the {@link ParlorService} interface

src/java/com/threerings/parlor/data/Table.java

@@ -21,8 +21,8 @@
 
 package com.threerings.parlor.data;
 
-import java.util.List;
 import java.util.HashSet;
+import java.util.List;
 
 import com.google.common.collect.Lists;
 
@@ -38,7 +38,6 @@ import com.threerings.presents.dobj.DSet;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.OccupantInfo;
 
-import com.threerings.parlor.data.ParlorCodes;
 import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.parlor.game.data.GameObject;
 

src/java/com/threerings/parlor/data/TableMarshaller.java

@@ -21,12 +21,14 @@
 
 package com.threerings.parlor.data;
 
-import com.threerings.parlor.client.TableService;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
+
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.client.TableService;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Provides the implementation of the {@link TableService} interface

src/java/com/threerings/parlor/game/client/GameConfigurator.java

@@ -21,11 +21,11 @@
 
 package com.threerings.parlor.game.client;
 
-import static com.threerings.parlor.Log.log;
-
 import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.parlor.util.ParlorContext;
 
+import static com.threerings.parlor.Log.log;
+
 /**
  * Provides the base from which interfaces can be built to configure games prior to starting
  * them. Derived classes would extend the base configurator adding interface elements and wiring

src/java/com/threerings/parlor/game/data/GameConfig.java

@@ -24,9 +24,10 @@ package com.threerings.parlor.game.data;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.util.Name;
 
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.parlor.client.TableConfigurator;
 import com.threerings.parlor.game.client.GameConfigurator;
 

src/java/com/threerings/parlor/game/data/GameObject.java

@@ -22,6 +22,7 @@
 package com.threerings.parlor.game.data;
 
 import com.samskivert.util.StringUtil;
+
 import com.threerings.util.Name;
 
 import com.threerings.crowd.data.PlaceObject;

src/java/com/threerings/parlor/game/server/GameManager.java

@@ -21,8 +21,9 @@
 
 package com.threerings.parlor.game.server;
 
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
+
 import com.google.common.collect.Lists;
 
 import com.samskivert.util.ArrayIntSet;
@@ -31,14 +32,16 @@ import com.samskivert.util.Interval;
 import com.samskivert.util.RepeatCallTracker;
 import com.samskivert.util.StringUtil;
 import com.samskivert.util.Tuple;
+
+import com.threerings.util.MessageBundle;
 import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.AttributeChangeListener;
 import com.threerings.presents.dobj.AttributeChangedEvent;
 import com.threerings.presents.dobj.DObject;
-import com.threerings.crowd.chat.server.SpeakUtil;
 
+import com.threerings.crowd.chat.server.SpeakUtil;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.server.PlaceManager;
 import com.threerings.crowd.server.PlaceManagerDelegate;
@@ -51,8 +54,6 @@ import com.threerings.parlor.game.data.GameObject;
 import com.threerings.parlor.server.ParlorSender;
 import com.threerings.parlor.server.PlayManager;
 
-import com.threerings.util.MessageBundle;
-
 import static com.threerings.parlor.Log.log;
 
 /**

src/java/com/threerings/parlor/rating/server/RatingDelegate.java

@@ -21,8 +21,6 @@
 
 package com.threerings.parlor.rating.server;
 
-import static com.threerings.parlor.Log.log;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -30,15 +28,14 @@ import java.util.List;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 
-import com.samskivert.jdbc.RepositoryUnit;
-
 import com.samskivert.util.IntMap;
 import com.samskivert.util.IntMaps;
 import com.samskivert.util.Invoker;
 import com.samskivert.util.StringUtil;
 
+import com.samskivert.jdbc.RepositoryUnit;
+
 import com.threerings.util.Name;
-import com.threerings.media.util.MathUtil;
 
 import com.threerings.presents.annotation.MainInvoker;
 
@@ -46,14 +43,17 @@ import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.data.PlaceObject;
 
+import com.threerings.media.util.MathUtil;
+
 import com.threerings.parlor.game.data.GameObject;
 import com.threerings.parlor.game.server.GameManager;
 import com.threerings.parlor.game.server.GameManagerDelegate;
-
 import com.threerings.parlor.rating.data.RatingCodes;
 import com.threerings.parlor.rating.server.persist.RatingRecord;
 import com.threerings.parlor.rating.server.persist.RatingRepository;
 
+import static com.threerings.parlor.Log.log;
+
 /**
  * Rates players after each game and handles persisting the results.
  */

src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java

@@ -26,6 +26,7 @@ import com.samskivert.jdbc.depot.PersistentRecord;
 import com.samskivert.jdbc.depot.annotation.Column;
 import com.samskivert.jdbc.depot.annotation.Id;
 import com.samskivert.jdbc.depot.expression.ColumnExp;
+
 import com.threerings.parlor.rating.util.Percentiler;
 
 /**

src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java

@@ -23,6 +23,8 @@ package com.threerings.parlor.rating.server.persist;
 
 import java.sql.Timestamp;
 
+import com.samskivert.util.StringUtil;
+
 import com.samskivert.jdbc.depot.Key;
 import com.samskivert.jdbc.depot.PersistentRecord;
 import com.samskivert.jdbc.depot.annotation.Column;
@@ -31,8 +33,6 @@ import com.samskivert.jdbc.depot.annotation.Id;
 import com.samskivert.jdbc.depot.annotation.Index;
 import com.samskivert.jdbc.depot.expression.ColumnExp;
 
-import com.samskivert.util.StringUtil;
-
 @Entity(indices={
     @Index(name="ixPlayerId", fields={ RatingRecord.PLAYER_ID })
 })

src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java

@@ -42,7 +42,9 @@ import com.samskivert.jdbc.depot.clause.OrderBy;
 import com.samskivert.jdbc.depot.clause.QueryClause;
 import com.samskivert.jdbc.depot.clause.Where;
 import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.Conditionals.*;
+import com.samskivert.jdbc.depot.operator.Conditionals.Equals;
+import com.samskivert.jdbc.depot.operator.Conditionals.GreaterThan;
+import com.samskivert.jdbc.depot.operator.Conditionals.In;
 import com.samskivert.jdbc.depot.operator.Logic.And;
 
 import com.threerings.parlor.rating.util.Percentiler;

src/java/com/threerings/parlor/rating/util/Percentiler.java

@@ -22,6 +22,7 @@
 package com.threerings.parlor.rating.util;
 
 import java.io.PrintStream;
+
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.nio.LongBuffer;

src/java/com/threerings/parlor/server/ParlorDispatcher.java

@@ -21,14 +21,16 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.parlor.client.ParlorService;
-import com.threerings.parlor.data.ParlorMarshaller;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
+
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.client.ParlorService;
+import com.threerings.parlor.data.ParlorMarshaller;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Dispatches requests to the {@link ParlorProvider}.

src/java/com/threerings/parlor/server/ParlorManager.java

@@ -25,6 +25,7 @@ import com.google.inject.Inject;
 
 import com.samskivert.util.IntMap;
 import com.samskivert.util.IntMaps;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;

src/java/com/threerings/parlor/server/ParlorProvider.java

@@ -21,13 +21,15 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.parlor.client.ParlorService;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
+
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.client.ParlorService;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Defines the server-side of the {@link ParlorService}.

src/java/com/threerings/parlor/server/ParlorSender.java

@@ -21,12 +21,14 @@
 
 package com.threerings.parlor.server;
 
+import com.threerings.util.Name;
+
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationSender;
+
 import com.threerings.parlor.client.ParlorDecoder;
 import com.threerings.parlor.client.ParlorReceiver;
 import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationSender;
-import com.threerings.util.Name;
 
 /**
  * Used to issue notifications to a {@link ParlorReceiver} instance on a

src/java/com/threerings/parlor/server/PlayManager.java

@@ -21,10 +21,10 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.crowd.data.BodyObject;
-
 import com.threerings.presents.data.ClientObject;
 
+import com.threerings.crowd.data.BodyObject;
+
 /**
  * An interface to be implemented by a {@code PlaceManager} that wishes to host
  * places that have players. This generalizes the idea of a game further than what

src/java/com/threerings/parlor/server/TableDispatcher.java

@@ -21,14 +21,16 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.parlor.data.TableConfig;
-import com.threerings.parlor.data.TableMarshaller;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
+
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.data.TableConfig;
+import com.threerings.parlor.data.TableMarshaller;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Dispatches requests to the {@link TableProvider}.

src/java/com/threerings/parlor/server/TableManager.java

@@ -24,6 +24,7 @@ package com.threerings.parlor.server;
 import com.samskivert.util.IntMap;
 import com.samskivert.util.IntMaps;
 import com.samskivert.util.ListUtil;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;
@@ -43,8 +44,8 @@ import com.threerings.presents.server.InvocationManager;
 
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.OccupantInfo;
-import com.threerings.crowd.server.PlaceRegistry;
 import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.server.PlaceRegistry;
 
 import com.threerings.parlor.client.TableService;
 import com.threerings.parlor.data.ParlorCodes;

src/java/com/threerings/parlor/server/TableProvider.java

@@ -21,14 +21,16 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.parlor.client.TableService;
-import com.threerings.parlor.data.TableConfig;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
+
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.client.TableService;
+import com.threerings.parlor.data.TableConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Defines the server-side of the {@link TableService}.

src/java/com/threerings/parlor/tourney/client/TourniesService.java

@@ -21,11 +21,11 @@
 
 package com.threerings.parlor.tourney.client;
 
-import com.threerings.parlor.tourney.data.TourneyConfig;
-
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
+import com.threerings.parlor.tourney.data.TourneyConfig;
+
 /**
  * Provices services for creating/modifying tournies.
  */

src/java/com/threerings/parlor/tourney/data/EntryFee.java

@@ -23,10 +23,10 @@ package com.threerings.parlor.tourney.data;
 
 import com.samskivert.util.ResultListener;
 
-import com.threerings.crowd.data.BodyObject;
-
 import com.threerings.io.SimpleStreamableObject;
 
+import com.threerings.crowd.data.BodyObject;
+
 /**
  * Extensible entry fee class that specifies entry requirements for a tourney.
  */

src/java/com/threerings/parlor/tourney/data/Participant.java

@@ -21,10 +21,10 @@
 
 package com.threerings.parlor.tourney.data;
 
-import java.lang.Comparable;
+import com.threerings.io.SimpleStreamableObject;
 
 import com.threerings.util.Name;
-import com.threerings.io.SimpleStreamableObject;
+
 import com.threerings.presents.dobj.DSet;
 
 /**

src/java/com/threerings/parlor/tourney/data/TourneyConfig.java

@@ -22,6 +22,7 @@
 package com.threerings.parlor.tourney.data;
 
 import com.threerings.io.SimpleStreamableObject;
+
 import com.threerings.util.Name;
 
 /**

src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java

@@ -21,11 +21,12 @@
 
 package com.threerings.parlor.tourney.data;
 
-import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 
+import com.threerings.parlor.tourney.client.TourneyService;
+
 /**
  * Provides the implementation of the {@link TourneyService} interface
  * that marshalls the arguments and delivers the request to the provider

src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java

@@ -21,11 +21,12 @@
 
 package com.threerings.parlor.tourney.data;
 
-import com.threerings.parlor.tourney.client.TourniesService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 
+import com.threerings.parlor.tourney.client.TourniesService;
+
 /**
  * Provides the implementation of the {@link TourniesService} interface
  * that marshalls the arguments and delivers the request to the provider

src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java

@@ -21,12 +21,13 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.data.TourneyMarshaller;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
+import com.threerings.parlor.tourney.data.TourneyMarshaller;
+
 /**
  * Dispatches requests to the {@link TourneyProvider}.
  */

src/java/com/threerings/parlor/tourney/server/TourneyManager.java

@@ -22,23 +22,24 @@
 package com.threerings.parlor.tourney.server;
 
 import com.google.inject.Inject;
+
 import com.samskivert.util.Interval;
 import com.samskivert.util.ResultListener;
 
-import com.threerings.crowd.data.BodyObject;
-import com.threerings.crowd.server.BodyLocator;
-
-import com.threerings.parlor.tourney.data.Participant;
-import com.threerings.parlor.tourney.data.TourneyConfig;
-import com.threerings.parlor.tourney.data.TourneyCodes;
-import com.threerings.parlor.tourney.data.TourneyObject;
-
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.RootDObjectManager;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationManager;
 
+import com.threerings.crowd.data.BodyObject;
+import com.threerings.crowd.server.BodyLocator;
+
+import com.threerings.parlor.tourney.data.Participant;
+import com.threerings.parlor.tourney.data.TourneyCodes;
+import com.threerings.parlor.tourney.data.TourneyConfig;
+import com.threerings.parlor.tourney.data.TourneyObject;
+
 /**
  * Controls a running tourney.
  */

src/java/com/threerings/parlor/tourney/server/TourneyProvider.java

@@ -21,12 +21,13 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
+import com.threerings.parlor.tourney.client.TourneyService;
+
 /**
  * Defines the server-side of the {@link TourneyService}.
  */

src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java

@@ -21,13 +21,14 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.data.TourneyConfig;
-import com.threerings.parlor.tourney.data.TourniesMarshaller;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
+import com.threerings.parlor.tourney.data.TourneyConfig;
+import com.threerings.parlor.tourney.data.TourniesMarshaller;
+
 /**
  * Dispatches requests to the {@link TourniesProvider}.
  */

src/java/com/threerings/parlor/tourney/server/TourniesManager.java

@@ -31,6 +31,7 @@ import com.google.inject.Singleton;
 
 import com.samskivert.io.PersistenceException;
 import com.samskivert.util.Interval;
+
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.RootDObjectManager;

src/java/com/threerings/parlor/tourney/server/TourniesProvider.java

@@ -21,13 +21,14 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.client.TourniesService;
-import com.threerings.parlor.tourney.data.TourneyConfig;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
+import com.threerings.parlor.tourney.client.TourniesService;
+import com.threerings.parlor.tourney.data.TourneyConfig;
+
 /**
  * Defines the server-side of the {@link TourniesService}.
  */

src/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java

@@ -21,15 +21,15 @@
 
 package com.threerings.parlor.tourney.server.persist;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+
 import java.util.ArrayList;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -39,7 +39,6 @@ import com.samskivert.jdbc.ConnectionProvider;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
 import com.samskivert.jdbc.JORARepository;
-
 import com.samskivert.jdbc.jora.Table;
 
 import com.threerings.io.ObjectInputStream;

src/java/com/threerings/parlor/turn/client/TurnDisplay.java

@@ -21,31 +21,31 @@
 
 package com.threerings.parlor.turn.client;
 
+import java.util.HashMap;
+
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 
-import java.util.HashMap;
-
+import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.Icon;
 
 import com.samskivert.swing.util.SwingUtil;
 
 import com.threerings.util.Name;
 
+import com.threerings.presents.dobj.AttributeChangeListener;
+import com.threerings.presents.dobj.AttributeChangedEvent;
+import com.threerings.presents.dobj.ElementUpdateListener;
+import com.threerings.presents.dobj.ElementUpdatedEvent;
+
 import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.parlor.game.data.GameObject;
 import com.threerings.parlor.turn.data.TurnGameObject;
 
-import com.threerings.presents.dobj.AttributeChangeListener;
-import com.threerings.presents.dobj.AttributeChangedEvent;
-import com.threerings.presents.dobj.ElementUpdateListener;
-import com.threerings.presents.dobj.ElementUpdatedEvent;
-
 /**
  * Automatically display a list of players and turn change information
  * in a turn-based game.

src/java/com/threerings/parlor/turn/client/TurnGameController.java

@@ -21,9 +21,10 @@
 
 package com.threerings.parlor.turn.client;
 
-import com.threerings.crowd.client.PlaceController;
 import com.threerings.util.Name;
 
+import com.threerings.crowd.client.PlaceController;
+
 /**
  * Games that wish to make use of the turn game services should have their
  * controller implement this interface and create an instance of {@link

src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java

@@ -23,8 +23,8 @@ package com.threerings.parlor.turn.client;
 
 import com.threerings.util.Name;
 
-import com.threerings.presents.dobj.AttributeChangedEvent;
 import com.threerings.presents.dobj.AttributeChangeListener;
+import com.threerings.presents.dobj.AttributeChangedEvent;
 
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceConfig;
@@ -34,7 +34,6 @@ import com.threerings.crowd.util.CrowdContext;
 import com.threerings.parlor.game.client.GameController;
 import com.threerings.parlor.game.client.GameControllerDelegate;
 import com.threerings.parlor.game.data.GameObject;
-
 import com.threerings.parlor.turn.data.TurnGameObject;
 
 /**

src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java

@@ -21,16 +21,19 @@
 
 package com.threerings.parlor.turn.server;
 
-import static com.threerings.parlor.Log.log;
-
 import com.samskivert.util.RandomUtil;
+
+import com.threerings.util.Name;
+
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.server.PlaceManager;
+
 import com.threerings.parlor.game.server.GameManager;
 import com.threerings.parlor.game.server.GameManagerDelegate;
 import com.threerings.parlor.turn.data.TurnGameObject;
-import com.threerings.util.Name;
+
+import static com.threerings.parlor.Log.log;
 
 /**
  * Performs the server-side turn-based game processing for a turn based game.  Game managers which

src/java/com/threerings/parlor/util/ParlorContext.java

@@ -22,6 +22,7 @@
 package com.threerings.parlor.util;
 
 import com.threerings.crowd.util.CrowdContext;
+
 import com.threerings.parlor.client.ParlorDirector;
 
 /**

src/java/com/threerings/parlor/util/RobotPlayer.java

@@ -21,15 +21,17 @@
 
 package com.threerings.parlor.util;
 
-import java.awt.Component;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.samskivert.swing.Controller;
+import java.awt.Component;
+
 import com.samskivert.util.CollectionUtil;
 import com.samskivert.util.Interval;
 import com.samskivert.util.RandomUtil;
 
+import com.samskivert.swing.Controller;
+
 import com.threerings.util.KeyTranslator;
 
 /**

src/java/com/threerings/puzzle/client/PuzzleBoardView.java

@@ -21,17 +21,19 @@
 
 package com.threerings.puzzle.client;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
+
+import com.samskivert.util.StringUtil;
 
 import com.samskivert.swing.Label;
-import com.samskivert.util.StringUtil;
 
 import com.threerings.media.VirtualMediaPanel;
 import com.threerings.media.animation.Animation;

src/java/com/threerings/puzzle/client/PuzzleController.java

@@ -21,22 +21,22 @@
 
 package com.threerings.puzzle.client;
 
+import java.util.List;
+
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.awt.event.KeyAdapter;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-import com.samskivert.swing.util.MouseHijacker;
 
 import com.samskivert.util.CollectionUtil;
 import com.samskivert.util.ObserverList;
-import com.threerings.media.FrameParticipant;
+
+import com.samskivert.swing.util.MouseHijacker;
 
 import com.threerings.presents.dobj.AttributeChangeListener;
 import com.threerings.presents.dobj.AttributeChangedEvent;
@@ -46,6 +46,8 @@ import com.threerings.presents.dobj.ElementUpdatedEvent;
 import com.threerings.crowd.client.PlaceControllerDelegate;
 import com.threerings.crowd.data.PlaceObject;
 
+import com.threerings.media.FrameParticipant;
+
 import com.threerings.parlor.game.client.GameController;
 import com.threerings.parlor.game.data.GameObject;
 

src/java/com/threerings/puzzle/client/PuzzlePanel.java

@@ -22,6 +22,7 @@
 package com.threerings.puzzle.client;
 
 import java.awt.BorderLayout;
+
 import javax.swing.JPanel;
 
 import com.samskivert.swing.Controller;

src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java

@@ -23,6 +23,7 @@ package com.threerings.puzzle.data;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
+
 import com.threerings.puzzle.client.PuzzleGameService;
 
 /**

src/java/com/threerings/puzzle/drop/client/DropBoardView.java

@@ -21,6 +21,8 @@
 
 package com.threerings.puzzle.drop.client;
 
+import java.util.Iterator;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -28,8 +30,6 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
 
-import java.util.Iterator;
-
 import com.threerings.media.image.Mirage;
 import com.threerings.media.sprite.ImageSprite;
 import com.threerings.media.sprite.PathAdapter;
@@ -42,11 +42,10 @@ import com.threerings.parlor.media.ScoreAnimation;
 
 import com.threerings.puzzle.client.PuzzleBoardView;
 import com.threerings.puzzle.data.Board;
-import com.threerings.puzzle.util.PuzzleContext;
-
 import com.threerings.puzzle.drop.data.DropBoard;
 import com.threerings.puzzle.drop.data.DropConfig;
 import com.threerings.puzzle.drop.data.DropPieceCodes;
+import com.threerings.puzzle.util.PuzzleContext;
 
 import static com.threerings.puzzle.Log.log;
 

src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java

@@ -21,20 +21,21 @@
 
 package com.threerings.puzzle.drop.client;
 
-import static com.threerings.puzzle.Log.log;
-
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 
 import com.samskivert.util.IntListUtil;
+
 import com.threerings.crowd.client.PlaceController;
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.util.CrowdContext;
+
 import com.threerings.media.FrameParticipant;
 import com.threerings.media.animation.Animation;
 import com.threerings.media.animation.AnimationAdapter;
+
 import com.threerings.puzzle.client.PuzzleController;
 import com.threerings.puzzle.client.PuzzleControllerDelegate;
 import com.threerings.puzzle.client.PuzzlePanel;
@@ -49,6 +50,8 @@ import com.threerings.puzzle.drop.util.PieceDropLogic;
 import com.threerings.puzzle.drop.util.PieceDropper;
 import com.threerings.puzzle.util.PuzzleContext;
 
+import static com.threerings.puzzle.Log.log;
+
 /**
  * Games that wish to make use of the drop puzzle services will need to
  * create an extension of this delegate class, customizing it for their

src/java/com/threerings/puzzle/drop/client/DropSprite.java

@@ -27,6 +27,7 @@ import java.awt.Point;
 import java.awt.Shape;
 
 import com.samskivert.util.ObserverList;
+
 import com.threerings.util.DirectionUtil;
 
 import com.threerings.media.image.Mirage;

src/java/com/threerings/puzzle/drop/client/NextBlockView.java

@@ -27,9 +27,10 @@ import java.awt.Graphics2D;
 
 import javax.swing.JComponent;
 
-import com.threerings.media.image.Mirage;
 import com.threerings.util.DirectionCodes;
 
+import com.threerings.media.image.Mirage;
+
 /**
  * The next block view displays an image representing the next drop block
  * to appear in the game.

src/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java

@@ -30,6 +30,7 @@ import com.threerings.media.animation.Animation;
 import com.threerings.media.sprite.PathObserver;
 import com.threerings.media.sprite.Sprite;
 import com.threerings.media.util.Path;
+
 import com.threerings.puzzle.drop.data.DropBoard;
 
 /**

src/java/com/threerings/puzzle/drop/data/DropBoard.java

@@ -21,9 +21,10 @@
 
 package com.threerings.puzzle.drop.data;
 
+import java.util.Arrays;
+
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.util.Arrays;
 
 import org.apache.commons.lang.StringUtils;
 

src/java/com/threerings/puzzle/drop/data/SegmentInfo.java

@@ -22,6 +22,7 @@
 package com.threerings.puzzle.drop.data;
 
 import com.samskivert.util.StringUtil;
+
 import com.threerings.util.DirectionCodes;
 
 /**

src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java

@@ -21,11 +21,10 @@
 
 package com.threerings.puzzle.drop.server;
 
-import static com.threerings.puzzle.Log.log;
-
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.server.PlaceManager;
+
 import com.threerings.puzzle.data.Board;
 import com.threerings.puzzle.data.PuzzleCodes;
 import com.threerings.puzzle.drop.data.DropBoard;
@@ -37,6 +36,8 @@ import com.threerings.puzzle.drop.util.PieceDropper;
 import com.threerings.puzzle.server.PuzzleManager;
 import com.threerings.puzzle.server.PuzzleManagerDelegate;
 
+import static com.threerings.puzzle.Log.log;
+
 /**
  * Provides the necessary support for a puzzle game that involves a
  * two-dimensional board containing pieces, with new pieces either falling

src/java/com/threerings/puzzle/drop/util/PieceDestroyer.java

@@ -26,9 +26,9 @@ import java.util.List;
 import com.google.common.collect.Lists;
 
 import com.threerings.puzzle.drop.data.DropBoard;
-import com.threerings.puzzle.drop.data.DropBoard.PieceOperation;
 import com.threerings.puzzle.drop.data.DropPieceCodes;
 import com.threerings.puzzle.drop.data.SegmentInfo;
+import com.threerings.puzzle.drop.data.DropBoard.PieceOperation;
 
 /**
  * Handles destroying contiguous piece segments in a drop board.

src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java

@@ -24,6 +24,7 @@ package com.threerings.puzzle.server;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
+
 import com.threerings.puzzle.data.Board;
 import com.threerings.puzzle.data.PuzzleGameMarshaller;
 

src/java/com/threerings/puzzle/server/PuzzleGameProvider.java

@@ -23,6 +23,7 @@ package com.threerings.puzzle.server;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
+
 import com.threerings.puzzle.client.PuzzleGameService;
 import com.threerings.puzzle.data.Board;
 

src/java/com/threerings/puzzle/server/PuzzleManager.java

@@ -28,6 +28,7 @@ import com.samskivert.util.Interval;
 import com.samskivert.util.RandomUtil;
 
 import com.threerings.presents.data.ClientObject;
+
 import com.threerings.parlor.game.server.GameManager;
 
 import com.threerings.puzzle.data.Board;

src/java/com/threerings/puzzle/util/PointSet.java

@@ -21,9 +21,10 @@
 
 package com.threerings.puzzle.util;
 
-import java.awt.Point;
 import java.util.Iterator;
 
+import java.awt.Point;
+
 import static com.threerings.puzzle.Log.log;
 
 /**

src/java/com/threerings/puzzle/util/PuzzleGameUtil.java

@@ -24,6 +24,7 @@ package com.threerings.puzzle.util;
 import java.awt.event.KeyEvent;
 
 import com.threerings.util.KeyTranslatorImpl;
+
 import com.threerings.puzzle.client.PuzzleController;
 import com.threerings.puzzle.client.PuzzlePanel;