Import ordering

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

src/main/as/com/threerings/parlor/card/data/Card.as

@@ -27,8 +27,6 @@ import com.threerings.io.ObjectOutputStream;
 import com.threerings.util.Byte;
 import com.threerings.util.Comparable;
 import com.threerings.util.Hashable;
-import com.threerings.util.Integer;
-import com.threerings.util.Joiner;
 
 import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.DSet_Entry;

src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as

@@ -22,10 +22,11 @@
 package com.threerings.parlor.card.trick.client {
 
 import com.threerings.io.TypedArray;
-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;
+
 /**
  * An ActionScript version of the Java TrickCardGameService interface.
  */

src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as

@@ -22,11 +22,13 @@
 package com.threerings.parlor.card.trick.data {
 
 import com.threerings.io.TypedArray;
+
+import com.threerings.util.Integer;
+
+import com.threerings.presents.data.InvocationMarshaller;
+
 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.util.Integer;
 
 /**
  * Provides the implementation of the <code>TrickCardGameService</code> interface

src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as

@@ -21,19 +21,13 @@
 
 package com.threerings.parlor.client {
 
-import mx.containers.Grid;
-
 import mx.controls.CheckBox;
 import mx.controls.ComboBox;
 import mx.controls.Label;
 
-import com.threerings.flex.GridUtil;
-
 import com.threerings.parlor.data.RangeParameter;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.data.ToggleParameter;
-import com.threerings.parlor.util.ParlorContext;
-
 import com.threerings.parlor.game.client.FlexGameConfigurator;
 import com.threerings.parlor.game.data.GameConfig;
 

src/main/as/com/threerings/parlor/client/ParlorDecoder.as

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

src/main/as/com/threerings/parlor/client/ParlorDirector.as

@@ -22,9 +22,9 @@
 package com.threerings.parlor.client {
 
 import com.threerings.util.Arrays;
+import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
-import com.threerings.util.Log;
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.BasicDirector;

src/main/as/com/threerings/parlor/client/ParlorService.as

@@ -21,12 +21,13 @@
 
 package com.threerings.parlor.client {
 
-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.client.InvocationService_ConfirmListener;
 import com.threerings.presents.client.InvocationService_InvocationListener;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * An ActionScript version of the Java ParlorService interface.

src/main/as/com/threerings/parlor/client/TableConfigurator.as

@@ -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/main/as/com/threerings/parlor/client/TableDirector.as

@@ -31,7 +31,6 @@ import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.ClientEvent;
 import com.threerings.presents.client.InvocationService_ResultListener;
-
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.EntryAddedEvent;
 import com.threerings.presents.dobj.EntryRemovedEvent;
@@ -39,7 +38,6 @@ import com.threerings.presents.dobj.EntryUpdatedEvent;
 import com.threerings.presents.dobj.SetListener;
 
 import com.threerings.crowd.data.BodyObject;
-import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.parlor.data.Table;
 import com.threerings.parlor.data.TableConfig;

src/main/as/com/threerings/parlor/client/TableService.as

@@ -21,13 +21,14 @@
 
 package com.threerings.parlor.client {
 
-import com.threerings.parlor.data.TableConfig;
+import com.threerings.util.Name;
-import com.threerings.parlor.game.data.GameConfig;
+
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.client.InvocationService_ResultListener;
-import com.threerings.util.Name;
+
+import com.threerings.parlor.data.TableConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * An ActionScript version of the Java TableService interface.

src/main/as/com/threerings/parlor/data/ParlorMarshaller.as

@@ -21,17 +21,18 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.parlor.client.ParlorService;
+import com.threerings.util.Integer;
-import com.threerings.parlor.client.ParlorService_InviteListener;
+import com.threerings.util.Name;
-import com.threerings.parlor.game.data.GameConfig;
+
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
-import com.threerings.util.Integer;
+
-import com.threerings.util.Name;
+import com.threerings.parlor.client.ParlorService;
+import com.threerings.parlor.client.ParlorService_InviteListener;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Provides the implementation of the <code>ParlorService</code> interface

src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as

@@ -21,9 +21,10 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.parlor.client.ParlorService_InviteListener;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 
+import com.threerings.parlor.client.ParlorService_InviteListener;
+
 /**
  * Marshalls instances of the ParlorService_InviteMarshaller interface.
  */

src/main/as/com/threerings/parlor/data/Table.as

@@ -21,21 +21,18 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.util.Arrays;
-import com.threerings.util.ClassUtil;
-import com.threerings.util.Hashable;
-import com.threerings.util.Joiner;
-import com.threerings.util.Name;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.TypedArray;
 
+import com.threerings.util.Arrays;
+import com.threerings.util.Hashable;
+import com.threerings.util.Joiner;
+import com.threerings.util.Name;
+
 import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.DSet_Entry;
 
-import com.threerings.crowd.data.BodyObject;
-
 import com.threerings.parlor.game.data.GameConfig;
 
 /**

src/main/as/com/threerings/parlor/data/TableMarshaller.as

@@ -21,16 +21,17 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.parlor.client.TableService;
+import com.threerings.util.Integer;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
-import com.threerings.presents.client.Client;
+
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.client.InvocationService_ResultListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller;
-import com.threerings.util.Integer;
+
-import com.threerings.util.Name;
+import com.threerings.parlor.client.TableService;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Provides the implementation of the <code>TableService</code> interface

src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as

@@ -21,17 +21,15 @@
 
 package com.threerings.parlor.game.client {
 
-import mx.core.Container;
-import mx.core.UIComponent;
-
 import mx.containers.Grid;
 import mx.containers.GridItem;
 import mx.containers.GridRow;
-
+import mx.core.Container;
-import com.threerings.flex.GridUtil;
+import mx.core.UIComponent;
 
 import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.parlor.util.ParlorContext;
+
+import com.threerings.flex.GridUtil;
 
 /**
  * Provides the base from which interfaces can be built to configure games prior to starting them.

src/main/as/com/threerings/parlor/game/data/GameConfig.as

@@ -21,16 +21,16 @@
 
 package com.threerings.parlor.game.data {
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.TypedArray;
+
 import com.threerings.util.ClassUtil;
 import com.threerings.util.Cloneable;
 import com.threerings.util.Hashable;
 import com.threerings.util.Name;
 import com.threerings.util.StringUtil;
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.TypedArray;
-
 import com.threerings.crowd.data.PlaceConfig;
 
 import com.threerings.parlor.client.TableConfigurator;

src/main/as/com/threerings/parlor/game/data/GameObject.as

@@ -21,16 +21,16 @@
 
 package com.threerings.parlor.game.data {
 
-import com.threerings.util.Arrays;
-import com.threerings.util.Integer;
-import com.threerings.util.Joiner;
-import com.threerings.util.langBoolean;
-import com.threerings.util.Name;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.TypedArray;
 
+import com.threerings.util.Arrays;
+import com.threerings.util.Integer;
+import com.threerings.util.Joiner;
+import com.threerings.util.Name;
+import com.threerings.util.langBoolean;
+
 import com.threerings.crowd.data.PlaceObject;
 
 /**

src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as

@@ -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/main/as/com/threerings/parlor/util/ParlorContext.as

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

src/main/as/com/threerings/stage/client/CharacterIsoSprite.as

@@ -24,19 +24,20 @@ package com.threerings.stage.client {
 import flash.display.DisplayObject;
 import flash.display.Sprite;
 
-import com.threerings.cast.CharacterSprite;
+import as3isolib.display.IsoSprite;
+
 import com.threerings.util.DirectionCodes;
-import com.threerings.media.Tickable;
+
 import com.threerings.media.util.Path;
 import com.threerings.media.util.Pathable;
+
+import com.threerings.cast.CharacterSprite;
+
 import com.threerings.miso.client.PriorityIsoDisplayObject;
 import com.threerings.miso.util.MisoSceneMetrics;
 import com.threerings.miso.util.MisoUtil;
-import com.threerings.stage.data.StageLocation;
 
-import as3isolib.display.IsoSprite;
+import com.threerings.stage.data.StageLocation;
-import as3isolib.display.scene.IsoScene;
-import as3isolib.graphics.SolidColorFill;
 
 public class CharacterIsoSprite extends IsoSprite
     implements Pathable, PriorityIsoDisplayObject

src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as

@@ -21,48 +21,47 @@
 
 package com.threerings.stage.client {
 
-import flash.display.DisplayObject;
-
-import flash.geom.Point;
-import flash.geom.Rectangle;
-
 import flash.events.Event;
 import flash.events.MouseEvent;
+import flash.geom.Point;
 
-import com.threerings.cast.CharacterSprite;
+import as3isolib.geom.Pt;
-import com.threerings.crowd.client.OccupantObserver;
 
-import com.threerings.crowd.data.OccupantInfo;
-import com.threerings.crowd.data.PlaceObject;
-import com.threerings.media.Tickable;
-import com.threerings.media.util.LineSegmentPath;
-import com.threerings.media.util.Path;
 import com.threerings.util.Controller;
-import com.threerings.util.Integer;
 import com.threerings.util.Iterator;
 import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
 import com.threerings.util.MathUtil;
 import com.threerings.util.StringUtil;
+
+import com.threerings.presents.dobj.EntryUpdatedEvent;
+import com.threerings.presents.dobj.SetAdapter;
+import com.threerings.presents.dobj.SetListener;
+
+import com.threerings.crowd.client.OccupantObserver;
+import com.threerings.crowd.data.OccupantInfo;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.util.CrowdContext;
+
+import com.threerings.media.Tickable;
+import com.threerings.media.util.LineSegmentPath;
+import com.threerings.media.util.Path;
+
+import com.threerings.cast.CharacterSprite;
+
+import com.threerings.miso.util.MisoSceneMetrics;
+import com.threerings.miso.util.MisoUtil;
+
 import com.threerings.whirled.spot.data.Location;
 import com.threerings.whirled.spot.data.Portal;
 import com.threerings.whirled.spot.data.SceneLocation;
 import com.threerings.whirled.spot.data.SpotCodes;
 import com.threerings.whirled.spot.data.SpotSceneObject;
-import com.threerings.whirled.util.WhirledContext;
+
-import com.threerings.stage.data.StageSceneObject;
 import com.threerings.stage.data.StageLocation;
+import com.threerings.stage.data.StageSceneObject;
 import com.threerings.stage.util.StageContext;
-import com.threerings.crowd.util.CrowdContext;
-import com.threerings.presents.dobj.EntryUpdatedEvent;
-import com.threerings.presents.dobj.SetAdapter;
-import com.threerings.presents.dobj.SetListener;
-
-import com.threerings.miso.util.MisoSceneMetrics;
-import com.threerings.miso.util.MisoUtil;
-
-import as3isolib.geom.Pt;
 
 public class CrowdStageScenePanel extends StageScenePanel
     implements OccupantObserver, Tickable

src/main/as/com/threerings/stage/client/PortalIsoSprite.as

@@ -22,14 +22,13 @@
 package com.threerings.stage.client {
 
 import flash.display.Bitmap;
-import flash.display.BitmapData;
 import flash.display.DisplayObject;
-
 import flash.geom.Point;
 
 import as3isolib.display.IsoSprite;
 
 import com.threerings.miso.client.PriorityIsoDisplayObject;
+
 import com.threerings.whirled.spot.data.Portal;
 
 public class PortalIsoSprite extends IsoSprite

src/main/as/com/threerings/stage/client/SceneColorizer.as

@@ -21,16 +21,19 @@
 
 package com.threerings.stage.client {
 
+import com.threerings.util.Log;
+import com.threerings.util.Map;
+import com.threerings.util.Maps;
+
 import com.threerings.media.image.ClassRecord;
 import com.threerings.media.image.ColorPository;
 import com.threerings.media.image.ColorRecord;
 import com.threerings.media.image.Colorization;
-import com.threerings.stage.data.StageScene;
-import com.threerings.miso.data.ObjectInfo;
 import com.threerings.media.tile.Colorizer;
-import com.threerings.util.Log;
+
-import com.threerings.util.Maps;
+import com.threerings.miso.data.ObjectInfo;
-import com.threerings.util.Map;
+
+import com.threerings.stage.data.StageScene;
 
 /**
  * Handles colorization of object tiles in a scene.
@@ -135,10 +138,12 @@ public class SceneColorizer implements Colorizer
 }
 }
 
-import com.threerings.media.image.Colorization;
 import com.threerings.media.image.ColorPository;
+import com.threerings.media.image.Colorization;
 import com.threerings.media.tile.Colorizer;
+
 import com.threerings.miso.data.ObjectInfo;
+
 import com.threerings.stage.client.SceneColorizer;
 
 class BaseColorizer implements Colorizer {

src/main/as/com/threerings/stage/client/StageSceneBlock.as

@@ -23,23 +23,24 @@ package com.threerings.stage.client {
 
 import flash.display.DisplayObject;
 
-import com.threerings.miso.client.MisoScenePanel;
-import com.threerings.miso.util.MisoContext;
-import com.threerings.miso.util.MisoSceneMetrics;
-import com.threerings.miso.util.MisoUtil;
-import com.threerings.miso.client.SceneBlock;
-import com.threerings.miso.data.MisoSceneModel;
-import com.threerings.util.Iterator;
-import com.threerings.util.MathUtil;
-import com.threerings.whirled.spot.data.Portal;
-import com.threerings.whirled.spot.data.SpotScene;
-import com.threerings.whirled.spot.data.SpotSceneModel;
-import com.threerings.stage.data.StageLocation;
-
 import as3isolib.display.IsoSprite;
 import as3isolib.display.IsoView;
 import as3isolib.display.scene.IsoScene;
 
+import com.threerings.util.Iterator;
+
+import com.threerings.miso.client.MisoScenePanel;
+import com.threerings.miso.client.SceneBlock;
+import com.threerings.miso.data.MisoSceneModel;
+import com.threerings.miso.util.MisoContext;
+import com.threerings.miso.util.MisoSceneMetrics;
+import com.threerings.miso.util.MisoUtil;
+
+import com.threerings.whirled.spot.data.Portal;
+import com.threerings.whirled.spot.data.SpotScene;
+
+import com.threerings.stage.data.StageLocation;
+
 public class StageSceneBlock extends SceneBlock
 {
     public function StageSceneBlock (key :int, objScene :IsoScene, portalScene :IsoScene,

src/main/as/com/threerings/stage/client/StageSceneController.as

@@ -21,15 +21,19 @@
 
 package com.threerings.stage.client {
 
+import com.threerings.util.Log;
+
 import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.util.CrowdContext;
+
 import com.threerings.miso.util.MisoSceneMetrics;
-import com.threerings.stage.data.StageLocation;
+
-import com.threerings.stage.util.StageContext;
-import com.threerings.util.Log;
 import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.spot.client.SpotSceneController;
 
+import com.threerings.stage.data.StageLocation;
+import com.threerings.stage.util.StageContext;
+
 public class StageSceneController extends SpotSceneController
 {
     public var log :Log = Log.getLog(StageSceneController);

src/main/as/com/threerings/stage/client/StageScenePanel.as

@@ -23,26 +23,27 @@ package com.threerings.stage.client {
 
 import flash.display.DisplayObject;
 
+import as3isolib.display.IsoSprite;
+import as3isolib.display.scene.IsoScene;
+
 import com.threerings.util.Controller;
-import com.threerings.util.Iterator;
 import com.threerings.util.Log;
-import com.threerings.whirled.data.SceneUpdate;
+
-import com.threerings.whirled.spot.data.Portal;
 import com.threerings.media.tile.Colorizer;
-import com.threerings.media.tile.Tile;
+
 import com.threerings.miso.client.MisoScenePanel;
 import com.threerings.miso.client.PriorityIsoDisplayObject;
 import com.threerings.miso.client.SceneBlock;
-import com.threerings.miso.client.TileIsoSprite;
 import com.threerings.miso.data.ObjectInfo;
 import com.threerings.miso.util.MisoSceneMetrics;
+
+import com.threerings.whirled.data.SceneUpdate;
+import com.threerings.whirled.spot.data.Portal;
+
 import com.threerings.stage.data.StageMisoSceneModel;
 import com.threerings.stage.data.StageScene;
 import com.threerings.stage.util.StageContext;
 
-import as3isolib.display.IsoSprite;
-import as3isolib.display.scene.IsoScene;
-
 /**
  * Eventually responsible for rendering a stage scene - but for now it's a stub.
  */

src/main/as/com/threerings/stage/client/StageSceneService.as

@@ -22,11 +22,12 @@
 package com.threerings.stage.client {
 
 import com.threerings.io.TypedArray;
-import com.threerings.miso.data.ObjectInfo;
+
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 
+import com.threerings.miso.data.ObjectInfo;
+
 /**
  * An ActionScript version of the Java StageSceneService interface.
  */

src/main/as/com/threerings/stage/data/DefaultColorUpdate.as

@@ -24,8 +24,8 @@ package com.threerings.stage.data {
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
-import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.data.SceneModel;
+import com.threerings.whirled.data.SceneUpdate;
 
 /**
  * Update to change the default colorization for objects in a scene which

src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as

@@ -25,10 +25,11 @@ import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.TypedArray;
 
-import com.threerings.whirled.data.SceneUpdate;
-import com.threerings.whirled.data.SceneModel;
 import com.threerings.miso.data.ObjectInfo;
 
+import com.threerings.whirled.data.SceneModel;
+import com.threerings.whirled.data.SceneUpdate;
+
 /**
  * A scene update that is broadcast when objects have been added to or removed
  * from the scene.

src/main/as/com/threerings/stage/data/StageLocation.as

@@ -21,17 +21,18 @@
 
 package com.threerings.stage.data {
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.SimpleStreamableObject;
+
 import com.threerings.util.ClassUtil;
 import com.threerings.util.DirectionCodes;
 import com.threerings.util.DirectionUtil;
 import com.threerings.util.Hashable;
 
-import com.threerings.io.SimpleStreamableObject;
+import com.threerings.whirled.spot.data.Location;
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
 
 import com.threerings.stage.data.StageLocation;
-import com.threerings.whirled.spot.data.Location;
 
 /**
  * Contains information on a scene occupant's position and orientation.

src/main/as/com/threerings/stage/data/StageMisoSceneModel.as

@@ -21,13 +21,14 @@
 
 package com.threerings.stage.data {
 
+import com.threerings.util.Integer;
+
 import com.threerings.miso.data.SparseMisoSceneModel;
+import com.threerings.miso.data.SparseMisoSceneModel_Section;
+
 import com.threerings.whirled.data.AuxModel;
 import com.threerings.whirled.data.SceneModel;
-import com.threerings.io.ObjectInputStream;
+
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.miso.data.SparseMisoSceneModel_Section;
-import com.threerings.util.Integer;
 import com.threerings.stage.data.StageMisoSceneModel;
 
 /**

src/main/as/com/threerings/stage/data/StageOccupantInfo.as

@@ -21,11 +21,7 @@
 
 package com.threerings.stage.data {
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-
 import com.threerings.crowd.data.OccupantInfo;
-import com.threerings.crowd.data.BodyObject;
 
 /**
  * Extends the standard occupant info with stage specific business.

src/main/as/com/threerings/stage/data/StageScene.as

@@ -21,8 +21,10 @@
 
 package com.threerings.stage.data {
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.util.Iterator;
+
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.data.SceneImpl;
 import com.threerings.whirled.spot.data.Portal;
 import com.threerings.whirled.spot.data.SpotScene;

src/main/as/com/threerings/stage/data/StageSceneConfig.as

@@ -21,11 +21,10 @@
 
 package com.threerings.stage.data {
 
-import com.threerings.crowd.data.PlaceConfig;
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.stage.client.StageSceneController;
 import com.threerings.crowd.client.PlaceController;
+import com.threerings.crowd.data.PlaceConfig;
+
+import com.threerings.stage.client.StageSceneController;
 
 /**
  * Place configuration for the main isometric scenes in Stage.

src/main/as/com/threerings/stage/data/StageSceneMarshaller.as

@@ -22,11 +22,13 @@
 package com.threerings.stage.data {
 
 import com.threerings.io.TypedArray;
-import com.threerings.miso.data.ObjectInfo;
+
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
+
+import com.threerings.miso.data.ObjectInfo;
+
 import com.threerings.stage.client.StageSceneService;
 
 /**

src/main/as/com/threerings/stage/data/StageSceneModel.as

@@ -24,11 +24,13 @@ package com.threerings.stage.data {
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
-import com.threerings.stage.data.StageSceneModel;
 import com.threerings.util.Integer;
 import com.threerings.util.StreamableHashMap;
-import com.threerings.whirled.spot.data.SpotSceneModel;
+
 import com.threerings.whirled.data.SceneModel;
+import com.threerings.whirled.spot.data.SpotSceneModel;
+
+import com.threerings.stage.data.StageSceneModel;
 
 /**
  * Extends the basic scene model with the notion of a scene type and

src/main/as/com/threerings/stage/data/StageSceneObject.as

@@ -22,6 +22,7 @@
 package com.threerings.stage.data {
 
 import com.threerings.io.ObjectInputStream;
+
 import com.threerings.whirled.spot.data.SpotSceneObject;
 
 public class StageSceneObject extends SpotSceneObject

src/main/as/com/threerings/stage/util/StageContext.as

@@ -22,6 +22,7 @@
 package com.threerings.stage.util {
 
 import com.threerings.media.image.ColorPository;
+
 import com.threerings.miso.util.MisoContext;
 
 /**

src/main/as/com/threerings/whirled/client/SceneDecoder.as

@@ -22,6 +22,7 @@
 package com.threerings.whirled.client {
 
 import com.threerings.presents.client.InvocationDecoder;
+
 import com.threerings.whirled.client.SceneReceiver;
 
 /**

src/main/as/com/threerings/whirled/client/SceneDirector.as

@@ -24,13 +24,13 @@ package com.threerings.whirled.client {
 import flash.errors.IOError;
 import flash.errors.IllegalOperationError;
 
+import com.threerings.io.TypedArray;
+
 import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
 import com.threerings.util.ResultListener;
 
-import com.threerings.io.TypedArray;
-
 import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.ClientEvent;

src/main/as/com/threerings/whirled/client/SceneService.as

@@ -21,7 +21,6 @@
 
 package com.threerings.whirled.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**

src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as

@@ -21,9 +21,12 @@
 
 package com.threerings.whirled.client {
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.io.TypedArray;
+
 import com.threerings.presents.client.InvocationService_InvocationListener;
+
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.data.SceneModel;
 
 /**

src/main/as/com/threerings/whirled/data/AuxModel.as

@@ -21,10 +21,10 @@
 
 package com.threerings.whirled.data {
 
-import com.threerings.util.Cloneable;
-
 import com.threerings.io.Streamable;
 
+import com.threerings.util.Cloneable;
+
 /**
  * An interface that must be implemented by auxiliary scene models.
  */

src/main/as/com/threerings/whirled/data/SceneMarshaller.as

@@ -21,9 +21,10 @@
 
 package com.threerings.whirled.data {
 
-import com.threerings.presents.client.Client;
-import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.Integer;
+
+import com.threerings.presents.data.InvocationMarshaller;
+
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.client.SceneService_SceneMoveListener;
 

src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as

@@ -21,9 +21,12 @@
 
 package com.threerings.whirled.data {
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.io.TypedArray;
+
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
+
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.client.SceneService_SceneMoveListener;
 
 /**

src/main/as/com/threerings/whirled/data/SceneModel.as

@@ -21,14 +21,14 @@
 
 package com.threerings.whirled.data {
 
-import com.threerings.util.ClassUtil;
-import com.threerings.util.Cloneable;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
 import com.threerings.io.TypedArray;
 
+import com.threerings.util.ClassUtil;
+import com.threerings.util.Cloneable;
+
 /**
  * The scene model is the bare bones representation of the data for a
  * scene in the Whirled system. From the scene model, one would create an

src/main/as/com/threerings/whirled/data/SceneUpdate.as

@@ -23,13 +23,12 @@ package com.threerings.whirled.data {
 
 import flash.errors.IllegalOperationError;
 
-import com.threerings.util.Joiner;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;
 
 import com.threerings.util.Cloneable;
+import com.threerings.util.Joiner;
 import com.threerings.util.Log;
 
 /**

src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as

@@ -20,7 +20,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.whirled.spot.client {
-import com.threerings.crowd.client.CrowdClient;
 import com.threerings.util.Log;
 import com.threerings.util.ResultListener;
 
@@ -28,7 +27,6 @@ import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.ClientEvent;
 import com.threerings.presents.client.ConfirmAdapter;
-import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.AttributeChangeListener;
 import com.threerings.presents.dobj.AttributeChangedEvent;
 import com.threerings.presents.dobj.DObject;
@@ -38,6 +36,7 @@ import com.threerings.presents.dobj.Subscriber;
 
 import com.threerings.crowd.chat.client.ChatDirector;
 import com.threerings.crowd.chat.data.ChatCodes;
+import com.threerings.crowd.client.CrowdClient;
 import com.threerings.crowd.client.LocationAdapter;
 import com.threerings.crowd.client.LocationDirector;
 import com.threerings.crowd.data.BodyObject;
@@ -46,8 +45,6 @@ import com.threerings.crowd.data.PlaceObject;
 import com.threerings.whirled.client.SceneDirector;
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.ScenePlace;
-import com.threerings.whirled.util.WhirledContext;
-
 import com.threerings.whirled.spot.data.ClusteredBodyObject;
 import com.threerings.whirled.spot.data.Location;
 import com.threerings.whirled.spot.data.Portal;
@@ -56,6 +53,7 @@ import com.threerings.whirled.spot.data.SpotCodes;
 import com.threerings.whirled.spot.data.SpotMarshaller;
 import com.threerings.whirled.spot.data.SpotScene;
 import com.threerings.whirled.spot.data.SpotSceneObject;
+import com.threerings.whirled.util.WhirledContext;
 
 /**
  * Extends the standard scene director with facilities to move between locations within a scene.
@@ -463,7 +461,9 @@ public class SpotSceneDirector extends BasicDirector
 }
 
 import com.threerings.io.TypedArray;
+
 import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.client.SceneDirector;
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener;

src/main/as/com/threerings/whirled/spot/client/SpotService.as

@@ -21,9 +21,9 @@
 
 package com.threerings.whirled.spot.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
+
 import com.threerings.whirled.spot.data.Location;
 
 /**

src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as

@@ -21,9 +21,12 @@
 
 package com.threerings.whirled.spot.client {
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.io.TypedArray;
+
 import com.threerings.presents.client.InvocationService_InvocationListener;
+
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.data.SceneModel;
 
 /**

src/main/as/com/threerings/whirled/spot/data/Cluster.as

@@ -21,13 +21,11 @@
 
 package com.threerings.whirled.spot.data {
 
-import flash.geom.Rectangle;
-
-import com.threerings.util.Hashable;
-
-import com.threerings.io.Streamable;
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.Streamable;
+
+import com.threerings.util.Hashable;
 
 import com.threerings.presents.dobj.DSet_Entry;
 

src/main/as/com/threerings/whirled/spot/data/Portal.as

@@ -21,16 +21,14 @@
 
 package com.threerings.whirled.spot.data {
 
-import com.threerings.util.ClassUtil;
-import com.threerings.util.Cloneable;
-import com.threerings.util.Hashable;
-import com.threerings.util.Joiner;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
 
+import com.threerings.util.ClassUtil;
+import com.threerings.util.Cloneable;
 import com.threerings.util.Hashable;
+import com.threerings.util.Joiner;
 
 /**
  * Represents an exit to another scene. A body sprite would walk over to a

src/main/as/com/threerings/whirled/spot/data/SceneLocation.as

@@ -21,12 +21,12 @@
 
 package com.threerings.whirled.spot.data {
 
-import com.threerings.util.Hashable;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
 
+import com.threerings.util.Hashable;
+
 import com.threerings.presents.dobj.DSet_Entry;
 
 /**

src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as

@@ -21,12 +21,13 @@
 
 package com.threerings.whirled.spot.data {
 
-import com.threerings.presents.client.Client;
+import com.threerings.util.Byte;
+import com.threerings.util.Integer;
+
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
-import com.threerings.util.Byte;
+
-import com.threerings.util.Integer;
 import com.threerings.whirled.spot.client.SpotService;
 import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener;
 

src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as

@@ -21,9 +21,12 @@
 
 package com.threerings.whirled.spot.data {
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.io.TypedArray;
+
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
+
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener;
 

src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as

@@ -23,9 +23,9 @@ package com.threerings.whirled.spot.data {
 
 import com.threerings.util.ArrayIterator;
 import com.threerings.util.Iterator;
+import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
-import com.threerings.util.Log;
 
 /**
  * An implementation of the {@link SpotScene} interface.

src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as

@@ -21,14 +21,14 @@
 
 package com.threerings.whirled.spot.data {
 
-import com.threerings.util.Arrays;
-import com.threerings.util.ClassUtil;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
 import com.threerings.io.TypedArray;
 
+import com.threerings.util.Arrays;
+import com.threerings.util.ClassUtil;
+
 import com.threerings.whirled.data.AuxModel;
 import com.threerings.whirled.data.SceneModel;
 

src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as

@@ -26,6 +26,7 @@ import com.threerings.io.ObjectOutputStream;
 
 import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.DSet_Entry;
+
 import com.threerings.whirled.data.SceneObject;
 import com.threerings.whirled.spot.data.SceneLocation;
 

src/main/as/com/threerings/whirled/util/SceneFactory.as

@@ -22,6 +22,7 @@
 package com.threerings.whirled.util {
 
 import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.data.Scene;
 import com.threerings.whirled.data.SceneModel;
 

src/main/as/com/threerings/whirled/util/WhirledContext.as

@@ -22,6 +22,7 @@
 package com.threerings.whirled.util {
 
 import com.threerings.crowd.util.CrowdContext;
+
 import com.threerings.whirled.client.SceneDirector;
 
 /**

src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as

@@ -22,6 +22,7 @@
 package com.threerings.whirled.zone.client {
 
 import com.threerings.presents.client.InvocationDecoder;
+
 import com.threerings.whirled.zone.client.ZoneReceiver;
 
 /**

src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as

@@ -22,6 +22,7 @@
 package com.threerings.whirled.zone.client {
 
 import com.threerings.io.TypedArray;
+
 import com.threerings.util.Log;
 import com.threerings.util.ResultListener;
 
@@ -38,12 +39,10 @@ import com.threerings.whirled.client.SceneDirector_MoveHandler;
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.util.WhirledContext;
-
 import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
 import com.threerings.whirled.zone.data.ZoneSummary;
 import com.threerings.whirled.zone.util.ZoneUtil;
 
-
 public class ZoneDirector extends BasicDirector
     implements ZoneReceiver, ZoneService_ZoneMoveListener, SceneDirector_MoveHandler
 {

src/main/as/com/threerings/whirled/zone/client/ZoneService.as

@@ -21,7 +21,6 @@
 
 package com.threerings.whirled.zone.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**

src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as

@@ -21,9 +21,12 @@
 
 package com.threerings.whirled.zone.client {
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.io.TypedArray;
+
 import com.threerings.presents.client.InvocationService_InvocationListener;
+
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.zone.data.ZoneSummary;
 

src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as

@@ -21,9 +21,10 @@
 
 package com.threerings.whirled.zone.data {
 
-import com.threerings.presents.client.Client;
-import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.Integer;
+
+import com.threerings.presents.data.InvocationMarshaller;
+
 import com.threerings.whirled.zone.client.ZoneService;
 import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
 

src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as

@@ -21,9 +21,12 @@
 
 package com.threerings.whirled.zone.data {
 
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.io.TypedArray;
+
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
+
+import com.threerings.crowd.data.PlaceConfig;
+
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
 

src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as

@@ -21,13 +21,13 @@
 
 package com.threerings.whirled.zone.data {
 
-import com.threerings.util.Name;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
 import com.threerings.io.TypedArray;
 
+import com.threerings.util.Name;
+
 /**
  * The zone summary contains information on a zone, including its name and
  * summary info on all of the scenes in this zone (which can be used to