Import ordering

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6695 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/main/as/com/threerings/bureau/client/BureauClient.as

@@ -22,7 +22,6 @@
 package com.threerings.bureau.client {
 
 import com.threerings.presents.client.Client;
-import com.threerings.presents.dobj.DObjectManager;
 
 import com.threerings.bureau.data.BureauAuthName;
 import com.threerings.bureau.data.BureauCredentials;
@@ -77,10 +76,11 @@ public class BureauClient extends Client
 
 }
 
+import com.threerings.presents.client.Client;
+import com.threerings.presents.dobj.DObjectManager;
+
 import com.threerings.bureau.client.BureauClient;
 import com.threerings.bureau.client.BureauDirector;
-import com.threerings.presents.dobj.DObjectManager;
-import com.threerings.presents.client.Client;
 import com.threerings.bureau.util.BureauContext;
 
 class Context

src/main/as/com/threerings/bureau/client/BureauDirector.as

@@ -21,9 +21,9 @@
 
 package com.threerings.bureau.client {
 
+import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
-import com.threerings.util.Log;
 
 import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;

src/main/as/com/threerings/bureau/data/AgentObject.as

@@ -22,6 +22,7 @@
 package com.threerings.bureau.data {
 
 import com.threerings.io.ObjectInputStream;
+
 import com.threerings.presents.dobj.DObject;
 
 public class AgentObject extends DObject

src/main/as/com/threerings/bureau/util/BureauContext.as

@@ -22,6 +22,7 @@
 package com.threerings.bureau.util {
 
 import com.threerings.presents.util.PresentsContext;
+
 import com.threerings.bureau.client.BureauDirector;
 
 /**

src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as

@@ -22,12 +22,11 @@
 package com.threerings.crowd.chat.client {
 
 import com.threerings.util.MessageBundle;
-import com.threerings.util.Name;
 import com.threerings.util.StringUtil;
 
+import com.threerings.crowd.chat.data.ChatCodes;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.util.CrowdContext;
-import com.threerings.crowd.chat.data.ChatCodes;
 
 public class BroadcastHandler extends CommandHandler
 {

src/main/as/com/threerings/crowd/chat/client/ChatDirector.as

@@ -22,11 +22,16 @@
 package com.threerings.crowd.chat.client {
 import com.threerings.util.Arrays;
 import com.threerings.util.Log;
+import com.threerings.util.Long;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
+import com.threerings.util.MessageBundle;
+import com.threerings.util.MessageManager;
+import com.threerings.util.Name;
 import com.threerings.util.ObserverList;
 import com.threerings.util.ResultListener;
 import com.threerings.util.StringUtil;
+import com.threerings.util.TimeUtil;
 
 import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
@@ -36,18 +41,6 @@ import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.MessageEvent;
 import com.threerings.presents.dobj.MessageListener;
 
-import com.threerings.util.Long;
-import com.threerings.util.MessageBundle;
-import com.threerings.util.MessageManager;
-import com.threerings.util.Name;
-import com.threerings.util.TimeUtil;
-
-import com.threerings.crowd.client.CrowdClient;
-import com.threerings.crowd.data.BodyObject;
-import com.threerings.crowd.data.CrowdCodes;
-import com.threerings.crowd.data.PlaceObject;
-import com.threerings.crowd.util.CrowdContext;
-
 import com.threerings.crowd.chat.data.ChatChannel;
 import com.threerings.crowd.chat.data.ChatCodes;
 import com.threerings.crowd.chat.data.ChatMarshaller;
@@ -56,6 +49,11 @@ import com.threerings.crowd.chat.data.SystemMessage;
 import com.threerings.crowd.chat.data.TellFeedbackMessage;
 import com.threerings.crowd.chat.data.UserMessage;
 import com.threerings.crowd.chat.data.UserSystemMessage;
+import com.threerings.crowd.client.CrowdClient;
+import com.threerings.crowd.data.BodyObject;
+import com.threerings.crowd.data.CrowdCodes;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.util.CrowdContext;
 
 /**
  * The chat director is the client side coordinator of all chat related services. It handles both

src/main/as/com/threerings/crowd/chat/client/ClearHandler.as

@@ -21,9 +21,8 @@
 
 package com.threerings.crowd.chat.client {
 
-import com.threerings.crowd.util.CrowdContext;
-
 import com.threerings.crowd.chat.data.ChatCodes;
+import com.threerings.crowd.util.CrowdContext;
 
 public class ClearHandler extends CommandHandler
 {

src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as

@@ -23,9 +23,8 @@ package com.threerings.crowd.chat.client {
 
 import com.threerings.util.StringUtil;
 
-import com.threerings.crowd.util.CrowdContext;
-
 import com.threerings.crowd.chat.data.ChatCodes;
+import com.threerings.crowd.util.CrowdContext;
 
 public class EmoteHandler extends CommandHandler
 {

src/main/as/com/threerings/crowd/chat/client/HelpHandler.as

@@ -25,9 +25,8 @@ import com.threerings.util.Map;
 import com.threerings.util.MessageBundle;
 import com.threerings.util.StringUtil;
 
-import com.threerings.crowd.util.CrowdContext;
-
 import com.threerings.crowd.chat.data.ChatCodes;
+import com.threerings.crowd.util.CrowdContext;
 
 public class HelpHandler extends CommandHandler
 {

src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as

@@ -25,8 +25,6 @@ import com.threerings.util.StringUtil;
 
 import com.threerings.crowd.util.CrowdContext;
 
-import com.threerings.crowd.chat.data.ChatCodes;
-
 public class SpeakHandler extends CommandHandler
 {
     override public function handleCommand (

src/main/as/com/threerings/crowd/chat/client/TellHandler.as

@@ -26,10 +26,10 @@ import com.threerings.util.ResultAdapter;
 import com.threerings.util.ResultListener;
 import com.threerings.util.StringUtil;
 
+import com.threerings.crowd.chat.data.ChatCodes;
 import com.threerings.crowd.client.CrowdClient;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.util.CrowdContext;
-import com.threerings.crowd.chat.data.ChatCodes;
 
 public class TellHandler extends CommandHandler
 {

src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as

@@ -23,9 +23,8 @@ package com.threerings.crowd.chat.client {
 
 import com.threerings.util.StringUtil;
 
-import com.threerings.crowd.util.CrowdContext;
-
 import com.threerings.crowd.chat.data.ChatCodes;
+import com.threerings.crowd.util.CrowdContext;
 
 public class ThinkHandler extends CommandHandler
 {

src/main/as/com/threerings/crowd/chat/data/ChatChannel.as

@@ -22,6 +22,7 @@
 package com.threerings.crowd.chat.data {
 
 import com.threerings.io.SimpleStreamableObject;
+
 import com.threerings.util.Comparable;
 import com.threerings.util.Equalable;
 import com.threerings.util.Hashable;

src/main/as/com/threerings/crowd/chat/data/ChatCodes.as

@@ -24,8 +24,6 @@ package com.threerings.crowd.chat.data {
 import com.threerings.presents.data.InvocationCodes;
 import com.threerings.presents.data.Permission;
 
-import com.threerings.crowd.data.BodyObject;
-
 /**
  * Contains codes used by the chat invocation services.
  */

src/main/as/com/threerings/crowd/chat/data/ChatMessage.as

@@ -21,14 +21,14 @@
 
 package com.threerings.crowd.chat.data {
 
-import flash.utils.getTimer; // function import
+import flash.utils.getTimer;
-
-import com.threerings.util.ClassUtil;
 
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;
 
+import com.threerings.util.ClassUtil;
+
 /**
  * The abstract base class of all the client-side ChatMessage objects.
  */

src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as

@@ -23,6 +23,7 @@ package com.threerings.crowd.chat.data {
 
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
+
 import com.threerings.util.Name;
 
 /**

src/main/as/com/threerings/crowd/chat/data/UserMessage.as

@@ -21,11 +21,11 @@
 
 package com.threerings.crowd.chat.data {
 
-import com.threerings.util.Name;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.util.Name;
+
 /**
  * A ChatMessage representing a message that came from another user.
  */

src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as

@@ -21,11 +21,11 @@
 
 package com.threerings.crowd.chat.data {
 
-import com.threerings.util.Name;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.util.Name;
+
 /**
  * A system message triggered by the activity of another user.
  * If the user is muted we can suppress this message, unlike a normal

src/main/as/com/threerings/crowd/client/LocationDirector.as

@@ -21,16 +21,15 @@
 
 package com.threerings.crowd.client {
 
-import flash.utils.getTimer; // function import
+import flash.utils.getTimer;
 
-import com.threerings.util.ObserverList;
 import com.threerings.util.Log;
+import com.threerings.util.ObserverList;
 import com.threerings.util.ResultListener;
 
 import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.ClientEvent;
-
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.ObjectAccessError;
 import com.threerings.presents.dobj.Subscriber;

src/main/as/com/threerings/crowd/client/OccupantDirector.as

@@ -21,8 +21,8 @@
 
 package com.threerings.crowd.client {
 
-import com.threerings.util.ObserverList;
 import com.threerings.util.Name;
+import com.threerings.util.ObserverList;
 
 import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;

src/main/as/com/threerings/crowd/client/PlaceViewUtil.as

@@ -24,7 +24,7 @@ package com.threerings.crowd.client {
 import flash.display.DisplayObject;
 import flash.display.DisplayObjectContainer;
 
-import mx.core.IRawChildrenContainer; // a simple interface from flex
+import mx.core.IRawChildrenContainer;
 
 import com.threerings.util.Log;
 

src/main/as/com/threerings/crowd/data/BodyObject.as

@@ -21,18 +21,15 @@
 
 package com.threerings.crowd.data {
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+
 import com.threerings.util.Byte;
 import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.data.InvocationCodes;
 import com.threerings.presents.data.PermissionPolicy;
 
-import com.threerings.crowd.chat.data.ChatCodes;
-
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-
 /**
  * The basic user object class for Crowd users. Bodies have a location and a status.
  */

src/main/as/com/threerings/crowd/data/OccupantInfo.as

@@ -21,17 +21,15 @@
 
 package com.threerings.crowd.data {
 
-import flash.system.ApplicationDomain;
+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.Integer;
 import com.threerings.util.Name;
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.SimpleStreamableObject;
-
 import com.threerings.presents.dobj.DSet_Entry;
 
 import com.threerings.crowd.data.BodyObject;

src/main/as/com/threerings/crowd/data/Place.as

@@ -24,6 +24,7 @@ package com.threerings.crowd.data {
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
+
 import com.threerings.util.Hashable;
 
 /**

src/main/as/com/threerings/crowd/data/PlaceConfig.as

@@ -21,8 +21,6 @@
 
 package com.threerings.crowd.data {
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
 
 import com.threerings.crowd.client.PlaceController;

src/main/as/com/threerings/crowd/data/PlaceObject.as

@@ -21,18 +21,17 @@
 
 package com.threerings.crowd.data {
 
-import com.threerings.util.Iterator;
-import com.threerings.util.Name;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.util.Iterator;
+import com.threerings.util.Name;
+
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.OidList;
 
 import com.threerings.crowd.chat.data.SpeakMarshaller;
-//import com.threerings.crowd.chat.data.SpeakObject;
 
 /**
  * A distributed object that contains information on a place that is

src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as

@@ -21,11 +21,11 @@
 
 package com.threerings.crowd.peer.data {
 
-import com.threerings.util.Name;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.util.Name;
+
 import com.threerings.presents.peer.data.ClientInfo;
 
 /**

src/main/as/com/threerings/crowd/util/CrowdContext.as

@@ -22,12 +22,12 @@
 package com.threerings.crowd.util {
 
 import com.threerings.presents.util.PresentsContext;
+
+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;
-
 /**
  * The crowd context provides access to the various managers, etc. that
  * are needed by the crowd client code.

src/main/as/com/threerings/io/FrameAvailableEvent.as

@@ -22,7 +22,6 @@
 package com.threerings.io {
 
 import flash.events.Event;
-
 import flash.utils.ByteArray;
 
 public class FrameAvailableEvent extends Event

src/main/as/com/threerings/io/FrameReader.as

@@ -23,9 +23,7 @@ package com.threerings.io {
 
 import flash.events.EventDispatcher;
 import flash.events.ProgressEvent;
-
 import flash.net.Socket;
-
 import flash.utils.ByteArray;
 import flash.utils.Endian;
 

src/main/as/com/threerings/io/ObjectInputStream.as

@@ -23,7 +23,6 @@ package com.threerings.io {
 
 import flash.errors.IOError;
 import flash.errors.MemoryError;
-
 import flash.utils.ByteArray;
 import flash.utils.IDataInput;
 

src/main/as/com/threerings/io/ObjectOutputStream.as

@@ -25,10 +25,10 @@ import flash.utils.ByteArray;
 import flash.utils.IDataOutput;
 
 import com.threerings.util.ClassUtil;
-import com.threerings.util.Map;
-import com.threerings.util.Maps;
 import com.threerings.util.Log;
 import com.threerings.util.Long;
+import com.threerings.util.Map;
+import com.threerings.util.Maps;
 import com.threerings.util.Short;
 
 public class ObjectOutputStream

src/main/as/com/threerings/io/Streamer.as

@@ -24,20 +24,20 @@ package com.threerings.io {
 import flash.utils.ByteArray;
 import flash.utils.Dictionary;
 
-import com.threerings.util.ByteEnum;
-import com.threerings.util.ClassUtil;
-import com.threerings.util.Enum;
-import com.threerings.util.Log;
-
 import com.threerings.io.streamers.ArrayStreamer;
 import com.threerings.io.streamers.ByteArrayStreamer;
 import com.threerings.io.streamers.ByteEnumStreamer;
+import com.threerings.io.streamers.DelegatingStreamer;
 import com.threerings.io.streamers.EnumStreamer;
 import com.threerings.io.streamers.MapStreamer;
 import com.threerings.io.streamers.NumberStreamer;
 import com.threerings.io.streamers.SetStreamer;
 import com.threerings.io.streamers.StringStreamer;
-import com.threerings.io.streamers.DelegatingStreamer;
+
+import com.threerings.util.ByteEnum;
+import com.threerings.util.ClassUtil;
+import com.threerings.util.Enum;
+import com.threerings.util.Log;
 
 public class Streamer
 {

src/main/as/com/threerings/io/streamers/ArrayStreamer.as

@@ -27,9 +27,10 @@ import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamer;
 import com.threerings.io.Translations;
 import com.threerings.io.TypedArray;
+
+import com.threerings.util.Byte;
 import com.threerings.util.ClassUtil;
 import com.threerings.util.Enum;
-import com.threerings.util.Byte;
 import com.threerings.util.Float;
 import com.threerings.util.Integer;
 import com.threerings.util.Log;

src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as

@@ -21,12 +21,12 @@
 
 package com.threerings.io.streamers {
 
-import com.threerings.util.ByteEnum;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamer;
 
+import com.threerings.util.ByteEnum;
+
 public class ByteEnumStreamer extends Streamer
 {
     public function ByteEnumStreamer (enumClass :Class, jname :String = null)

src/main/as/com/threerings/io/streamers/DelegatingStreamer.as

@@ -20,10 +20,10 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.io.streamers {
-import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.Streamer;
+import com.threerings.io.Streamer;
-
+
 /**
  * A streamer that allows subclasses or implementations of the classes or interfaces supported by
  * other streamers to be included in upstream messages. All serialization support is impelemented

src/main/as/com/threerings/io/streamers/EnumStreamer.as

@@ -21,12 +21,12 @@
 
 package com.threerings.io.streamers {
 
-import com.threerings.util.Enum;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamer;
 
+import com.threerings.util.Enum;
+
 public class EnumStreamer extends Streamer
 {
     public function EnumStreamer (enumClass :Class, jname :String = null)

src/main/as/com/threerings/io/streamers/MapStreamer.as

@@ -26,7 +26,6 @@ import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamer;
 
 import com.threerings.util.ClassUtil;
-
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
 

src/main/as/com/threerings/io/streamers/SetStreamer.as

@@ -26,7 +26,6 @@ import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamer;
 
 import com.threerings.util.ClassUtil;
-
 import com.threerings.util.Set;
 import com.threerings.util.Sets;
 

src/main/as/com/threerings/presents/client/Client.as

@@ -22,7 +22,6 @@
 package com.threerings.presents.client {
 import flash.events.EventDispatcher;
 import flash.events.TimerEvent;
-
 import flash.utils.Timer;
 
 import com.threerings.util.DelayUtil;
@@ -33,9 +32,7 @@ import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationCodes;
 import com.threerings.presents.data.TimeBaseMarshaller;
-
 import com.threerings.presents.dobj.DObjectManager;
-
 import com.threerings.presents.net.AuthResponseData;
 import com.threerings.presents.net.BootstrapData;
 import com.threerings.presents.net.Credentials;

src/main/as/com/threerings/presents/client/ClientDObjectMgr.as

@@ -20,17 +20,14 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.presents.client {
-import com.threerings.presents.net.CompoundDownstreamMessage;
-
 import flash.events.Event;
 import flash.events.TimerEvent;
 import flash.utils.Timer;
-import flash.utils.getTimer; // function import
+import flash.utils.getTimer;
 
-import com.threerings.util.ClassUtil;
+import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
-import com.threerings.util.Log;
 
 import com.threerings.presents.dobj.CompoundEvent;
 import com.threerings.presents.dobj.DEvent;
@@ -39,10 +36,10 @@ import com.threerings.presents.dobj.DObjectManager;
 import com.threerings.presents.dobj.ObjectAccessError;
 import com.threerings.presents.dobj.ObjectDestroyedEvent;
 import com.threerings.presents.dobj.Subscriber;
-
 import com.threerings.presents.net.BootstrapNotification;
-import com.threerings.presents.net.EventNotification;
+import com.threerings.presents.net.CompoundDownstreamMessage;
 import com.threerings.presents.net.DownstreamMessage;
+import com.threerings.presents.net.EventNotification;
 import com.threerings.presents.net.FailureResponse;
 import com.threerings.presents.net.ForwardEventRequest;
 import com.threerings.presents.net.ObjectResponse;

src/main/as/com/threerings/presents/client/Communicator.as

@@ -20,33 +20,31 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.presents.client {
-import com.threerings.presents.net.CompoundUpstreamMessage;
-
 import flash.events.Event;
 import flash.events.IOErrorEvent;
 import flash.events.SecurityErrorEvent;
 import flash.events.TimerEvent;
-
 import flash.net.Socket;
 import flash.utils.ByteArray;
 import flash.utils.Endian;
 import flash.utils.Timer;
 
-import com.threerings.util.Log;
-
 import com.threerings.io.FrameAvailableEvent;
 import com.threerings.io.FrameReader;
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.util.Log;
+
 import com.threerings.presents.data.AuthCodes;
 import com.threerings.presents.net.AuthRequest;
 import com.threerings.presents.net.AuthResponse;
 import com.threerings.presents.net.AuthResponseData;
+import com.threerings.presents.net.CompoundUpstreamMessage;
 import com.threerings.presents.net.DownstreamMessage;
 import com.threerings.presents.net.LogoffRequest;
-import com.threerings.presents.net.UpstreamMessage;
 import com.threerings.presents.net.ThrottleUpdatedMessage;
+import com.threerings.presents.net.UpstreamMessage;
 
 public class Communicator
 {

src/main/as/com/threerings/presents/client/InvocationDirector.as

@@ -22,16 +22,16 @@
 package com.threerings.presents.client {
 
 import flash.errors.IllegalOperationError;
-import flash.utils.getTimer; // function import
+import flash.utils.getTimer;
 
 import com.threerings.util.Boxed;
+import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
-import com.threerings.util.Log;
 import com.threerings.util.Short;
 
+import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
-
 import com.threerings.presents.dobj.CompoundEvent;
 import com.threerings.presents.dobj.DEvent;
 import com.threerings.presents.dobj.DObject;
@@ -46,8 +46,6 @@ import com.threerings.presents.dobj.ObjectAccessError;
 import com.threerings.presents.dobj.Subscriber;
 import com.threerings.presents.dobj.SubscriberAdapter;
 
-import com.threerings.presents.data.ClientObject;
-
 public class InvocationDirector
     implements EventListener
 {

src/main/as/com/threerings/presents/data/ClientObject.as

@@ -21,15 +21,15 @@
 
 package com.threerings.presents.data {
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.DSet_Entry;
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-
 /**
  * Every client in the system has an associated client object to which
  * only they subscribe. The client object can be used to deliver messages

src/main/as/com/threerings/presents/data/InvocationMarshaller.as

@@ -21,18 +21,16 @@
 
 package com.threerings.presents.data {
 
-import com.threerings.util.ClassUtil;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;
 
+import com.threerings.util.ClassUtil;
+
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationDirector;
 import com.threerings.presents.client.InvocationService;
 
-import com.threerings.presents.dobj.DObjectManager;
-
 /**
  * Provides a base from which all invocation service marshallers extend.
  * Handles functionality common to all marshallers.

src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as

@@ -21,13 +21,13 @@
 
 package com.threerings.presents.data {
 
-import com.threerings.util.ClassUtil;
-import com.threerings.util.Log;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;
 
+import com.threerings.util.ClassUtil;
+import com.threerings.util.Log;
+
 import com.threerings.presents.client.InvocationService_InvocationListener;
 
 public class InvocationMarshaller_ListenerMarshaller

src/main/as/com/threerings/presents/dobj/DObject.as

@@ -20,20 +20,19 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.presents.dobj {
-import org.osflash.signals.Signal;
-
 import flash.errors.IllegalOperationError;
-
 import flash.events.EventDispatcher;
 
-import com.threerings.util.ClassUtil;
+import org.osflash.signals.Signal;
-import com.threerings.util.Joiner;
-import com.threerings.util.Log;
 
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;
 
+import com.threerings.util.ClassUtil;
+import com.threerings.util.Joiner;
+import com.threerings.util.Log;
+
 public class DObject // extends EventDispatcher
     implements Streamable
 {
@@ -427,13 +426,12 @@ public class DObject // extends EventDispatcher
 }
 }
 
+import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.MessageEvent;
 import com.threerings.presents.dobj.MessageListener;
 import com.threerings.presents.dobj.ObjectDeathListener;
 import com.threerings.presents.dobj.ObjectDestroyedEvent;
 
-import com.threerings.presents.dobj.DObject;
-
 class Signaller
     implements MessageListener, ObjectDeathListener
 {

src/main/as/com/threerings/presents/dobj/DSet.as

@@ -21,6 +21,11 @@
 
 package com.threerings.presents.dobj {
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.Streamable;
+import com.threerings.io.TypedArray;
+
 import com.threerings.util.ArrayIterator;
 import com.threerings.util.Cloneable;
 import com.threerings.util.Equalable;
@@ -28,11 +33,6 @@ import com.threerings.util.Iterator;
 import com.threerings.util.Log;
 import com.threerings.util.Util;
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.Streamable;
-import com.threerings.io.TypedArray;
-
 /**
  * The distributed set class provides a means by which an unordered set of
  * objects can be maintained as a distributed object field. Entries can be

src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as

@@ -23,7 +23,6 @@ package com.threerings.presents.dobj {
 
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.TypedArray;
 
 import com.threerings.util.Joiner;
 

src/main/as/com/threerings/presents/dobj/MessageEvent.as

@@ -23,7 +23,6 @@ package com.threerings.presents.dobj {
 
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.TypedArray;
 
 import com.threerings.util.Boxed;
 import com.threerings.util.Joiner;

src/main/as/com/threerings/presents/dobj/NamedEvent.as

@@ -21,11 +21,11 @@
 
 package com.threerings.presents.dobj {
 
-import com.threerings.util.Joiner;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.util.Joiner;
+
 /**
  * A common parent class for all events that are associated with a name
  * (in some cases a field name, in other cases just an identifying name).

src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as

@@ -21,11 +21,10 @@
 
 package com.threerings.presents.dobj {
 
-import com.threerings.util.Joiner;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.util.Joiner;
 
 /**
  * An object removed event is dispatched when an object is removed from an

src/main/as/com/threerings/presents/dobj/OidList.as

@@ -21,14 +21,13 @@
 
 package com.threerings.presents.dobj {
 
-import com.threerings.util.Arrays;
-
-import com.threerings.io.Streamable;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.Streamable;
 import com.threerings.io.TypedArray;
 
+import com.threerings.util.Arrays;
+
 /**
  * An oid list is used to store lists of object ids. The list will not
  * allow duplicate ids. This class is not synchronized, with the

src/main/as/com/threerings/presents/net/AuthRequest.as

@@ -21,7 +21,6 @@
 
 package com.threerings.presents.net {
 
-import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.TypedArray;
 

src/main/as/com/threerings/presents/net/AuthResponse.as

@@ -22,7 +22,6 @@
 package com.threerings.presents.net {
 
 import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
 
 public class AuthResponse extends DownstreamMessage
 {

src/main/as/com/threerings/presents/net/AuthResponseData.as

@@ -21,11 +21,11 @@
 
 package com.threerings.presents.net {
 
-import com.threerings.presents.dobj.DObject;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.presents.dobj.DObject;
+
 public class AuthResponseData extends DObject
 {
     /** A constant used to indicate a successful authentication. */

src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as

@@ -20,9 +20,9 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.presents.net {
-import com.threerings.io.streamers.ArrayStreamer;
-import com.threerings.io.TypedArray;
 import com.threerings.io.ObjectInputStream;
+import com.threerings.io.TypedArray;
+import com.threerings.io.streamers.ArrayStreamer;
 
 public class CompoundDownstreamMessage extends DownstreamMessage
 {

src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as

@@ -21,7 +21,6 @@
 
 package com.threerings.presents.net {
 
-import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.TypedArray;
 import com.threerings.io.streamers.ArrayStreamer;

src/main/as/com/threerings/presents/net/Credentials.as

@@ -22,7 +22,6 @@
 package com.threerings.presents.net {
 
 import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
 
 public /* abstract */ class Credentials extends SimpleStreamableObject

src/main/as/com/threerings/presents/net/ForwardEventRequest.as

@@ -21,11 +21,10 @@
 
 package com.threerings.presents.net {
 
-import com.threerings.presents.dobj.DEvent;
-
-import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.presents.dobj.DEvent;
+
 public class ForwardEventRequest extends UpstreamMessage
 {
     /**

src/main/as/com/threerings/presents/net/ObjectResponse.as

@@ -21,10 +21,10 @@
 
 package com.threerings.presents.net {
 
-import com.threerings.presents.dobj.DObject;
-
 import com.threerings.io.ObjectInputStream;
 
+import com.threerings.presents.dobj.DObject;
+
 public class ObjectResponse extends DownstreamMessage
 {
     public function getObject () :DObject

src/main/as/com/threerings/presents/net/PongResponse.as

@@ -23,11 +23,9 @@ package com.threerings.presents.net {
 
 import flash.utils.getTimer;
 
-import com.threerings.util.Long;
-
 import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
+
-import com.threerings.io.Streamable;
+import com.threerings.util.Long;
 
 public class PongResponse extends DownstreamMessage
 {

src/main/as/com/threerings/presents/net/ServiceCreds.as

@@ -23,7 +23,6 @@ package com.threerings.presents.net {
 
 import com.adobe.crypto.MD5;
 
-import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
 import com.threerings.util.Joiner;

src/main/as/com/threerings/presents/net/UpstreamMessage.as

@@ -21,9 +21,9 @@
 
 package com.threerings.presents.net {
 
-import com.threerings.io.Streamable;
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.Streamable;
 
 import com.threerings.util.Short;
 

src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as

@@ -21,12 +21,11 @@
 
 package com.threerings.presents.net {
 
+import com.threerings.io.ObjectOutputStream;
+
 import com.threerings.util.Joiner;
 import com.threerings.util.Name;
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-
 public class UsernamePasswordCreds extends Credentials
 {
     /**

src/main/as/com/threerings/presents/peer/data/ClientInfo.as

@@ -24,6 +24,7 @@ package com.threerings.presents.peer.data {
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.SimpleStreamableObject;
+
 import com.threerings.util.Name;
 
 import com.threerings.presents.dobj.DSet_Entry;

src/main/as/com/threerings/util/EmbeddedSwfLoader.as

@@ -24,17 +24,13 @@ package com.threerings.util {
 import flash.display.DisplayObject;
 import flash.display.Loader;
 import flash.display.LoaderInfo;
-
 import flash.errors.IllegalOperationError;
-
 import flash.events.Event;
 import flash.events.EventDispatcher;
 import flash.events.IOErrorEvent;
-
-import flash.utils.ByteArray;
-
 import flash.system.ApplicationDomain;
 import flash.system.LoaderContext;
+import flash.utils.ByteArray;
 
 /**
  * Allows you to load an embeded SWF stored as a ByteArray then access any stored classes

src/main/as/com/threerings/util/MessageBundle.as

@@ -22,8 +22,8 @@
 package com.threerings.util {
 
 import mx.resources.IResourceBundle;
-import mx.resources.ResourceManager;
 import mx.resources.IResourceManager;
+import mx.resources.ResourceManager;
 
 /**
  * A message bundle provides an easy mechanism by which to obtain

src/main/as/com/threerings/util/MessageManager.as

@@ -21,7 +21,6 @@
 
 package com.threerings.util {
 
-import mx.resources.IResourceBundle;
 import mx.resources.Locale;
 import mx.resources.ResourceManager;
 

src/main/as/com/threerings/util/Name.as

@@ -21,8 +21,6 @@
 
 package com.threerings.util {
 
-import com.threerings.util.Equalable;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;

src/main/as/com/threerings/util/ObjectMarshaller.as

@@ -21,12 +21,10 @@
 
 package com.threerings.util {
 
-import flash.net.registerClassAlias; // function import
-import flash.net.ObjectEncoding;
-
 import flash.geom.Point;
 import flash.geom.Rectangle;
-
+import flash.net.ObjectEncoding;
+import flash.net.registerClassAlias;
 import flash.utils.ByteArray;
 import flash.utils.Dictionary;
 import flash.utils.Endian;