Imports cleanup

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@751 c613c5cb-e716-0410-b11b-feb51c14d237
2008-09-26 17:36:37 +00:00
parent 4ddb11c5bb
commit 8b03be111e
180 changed files with 512 additions and 342 deletions
@@ -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.
@@ -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.
@@ -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;
@@ -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;

 /**
@@ -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.
@@ -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
@@ -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
@@ -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.
 */
@@ -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
@@ -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}.
 */
@@ -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;

@@ -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}.
 */
@@ -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;

 /**
@@ -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.
 */
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;

@@ -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
@@ -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
@@ -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;

@@ -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;
@@ -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;

 /**
@@ -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.
 */
@@ -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;

 /**
@@ -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 })
 })
@@ -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;
@@ -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;
@@ -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}.
@@ -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;
@@ -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}.
@@ -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
@@ -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
@@ -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}.
@@ -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;
@@ -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}.
@@ -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.
 */
@@ -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.
 */
@@ -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;

 /**
@@ -22,6 +22,7 @@
 package com.threerings.parlor.tourney.data;

 import com.threerings.io.SimpleStreamableObject;
+
 import com.threerings.util.Name;

 /**
@@ -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
@@ -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
@@ -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}.
 */
@@ -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.
 */
@@ -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}.
 */
@@ -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}.
 */
@@ -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;
@@ -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}.
 */
@@ -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;
@@ -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.
@@ -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
@@ -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;

 /**
@@ -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
@@ -22,6 +22,7 @@
 package com.threerings.parlor.util;

 import com.threerings.crowd.util.CrowdContext;
+
 import com.threerings.parlor.client.ParlorDirector;

 /**
@@ -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;

 /**