From c32b1baa4170676519f2108618e85702eaee0826 Mon Sep 17 00:00:00 2001 From: Charlie Groves Date: Wed, 17 Aug 2011 20:04:57 +0000 Subject: [PATCH] Import ordering git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6695 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/bureau/client/BureauClient.as | 6 ++--- .../bureau/client/BureauDirector.as | 2 +- .../com/threerings/bureau/data/AgentObject.as | 1 + .../threerings/bureau/util/BureauContext.as | 1 + .../crowd/chat/client/BroadcastHandler.as | 3 +-- .../crowd/chat/client/ChatDirector.as | 22 +++++++++---------- .../crowd/chat/client/ClearHandler.as | 3 +-- .../crowd/chat/client/EmoteHandler.as | 3 +-- .../crowd/chat/client/HelpHandler.as | 3 +-- .../crowd/chat/client/SpeakHandler.as | 2 -- .../crowd/chat/client/TellHandler.as | 2 +- .../crowd/chat/client/ThinkHandler.as | 3 +-- .../threerings/crowd/chat/data/ChatChannel.as | 1 + .../threerings/crowd/chat/data/ChatCodes.as | 2 -- .../threerings/crowd/chat/data/ChatMessage.as | 6 ++--- .../crowd/chat/data/TellFeedbackMessage.as | 1 + .../threerings/crowd/chat/data/UserMessage.as | 4 ++-- .../crowd/chat/data/UserSystemMessage.as | 4 ++-- .../crowd/client/LocationDirector.as | 5 ++--- .../crowd/client/OccupantDirector.as | 2 +- .../threerings/crowd/client/PlaceViewUtil.as | 2 +- .../com/threerings/crowd/data/BodyObject.as | 9 +++----- .../com/threerings/crowd/data/OccupantInfo.as | 8 +++---- .../as/com/threerings/crowd/data/Place.as | 1 + .../com/threerings/crowd/data/PlaceConfig.as | 2 -- .../com/threerings/crowd/data/PlaceObject.as | 7 +++--- .../crowd/peer/data/CrowdClientInfo.as | 4 ++-- .../com/threerings/crowd/util/CrowdContext.as | 4 ++-- .../com/threerings/io/FrameAvailableEvent.as | 1 - src/main/as/com/threerings/io/FrameReader.as | 2 -- .../as/com/threerings/io/ObjectInputStream.as | 1 - .../com/threerings/io/ObjectOutputStream.as | 4 ++-- src/main/as/com/threerings/io/Streamer.as | 12 +++++----- .../threerings/io/streamers/ArrayStreamer.as | 3 ++- .../io/streamers/ByteEnumStreamer.as | 4 ++-- .../io/streamers/DelegatingStreamer.as | 8 +++---- .../threerings/io/streamers/EnumStreamer.as | 4 ++-- .../threerings/io/streamers/MapStreamer.as | 1 - .../threerings/io/streamers/SetStreamer.as | 1 - .../com/threerings/presents/client/Client.as | 3 --- .../presents/client/ClientDObjectMgr.as | 11 ++++------ .../presents/client/Communicator.as | 10 ++++----- .../presents/client/InvocationDirector.as | 8 +++---- .../threerings/presents/data/ClientObject.as | 6 ++--- .../presents/data/InvocationMarshaller.as | 6 ++--- ...InvocationMarshaller_ListenerMarshaller.as | 6 ++--- .../com/threerings/presents/dobj/DObject.as | 14 +++++------- .../as/com/threerings/presents/dobj/DSet.as | 10 ++++----- .../dobj/InvocationNotificationEvent.as | 1 - .../threerings/presents/dobj/MessageEvent.as | 1 - .../threerings/presents/dobj/NamedEvent.as | 4 ++-- .../presents/dobj/ObjectRemovedEvent.as | 3 +-- .../com/threerings/presents/dobj/OidList.as | 7 +++--- .../threerings/presents/net/AuthRequest.as | 1 - .../threerings/presents/net/AuthResponse.as | 1 - .../presents/net/AuthResponseData.as | 4 ++-- .../presents/net/CompoundDownstreamMessage.as | 4 ++-- .../presents/net/CompoundUpstreamMessage.as | 1 - .../threerings/presents/net/Credentials.as | 1 - .../presents/net/ForwardEventRequest.as | 5 ++--- .../threerings/presents/net/ObjectResponse.as | 4 ++-- .../threerings/presents/net/PongResponse.as | 6 ++--- .../threerings/presents/net/ServiceCreds.as | 1 - .../presents/net/UpstreamMessage.as | 2 +- .../presents/net/UsernamePasswordCreds.as | 5 ++--- .../presents/peer/data/ClientInfo.as | 1 + .../com/threerings/util/EmbeddedSwfLoader.as | 6 +---- .../as/com/threerings/util/MessageBundle.as | 2 +- .../as/com/threerings/util/MessageManager.as | 1 - src/main/as/com/threerings/util/Name.as | 2 -- .../com/threerings/util/ObjectMarshaller.as | 6 ++--- 71 files changed, 121 insertions(+), 176 deletions(-) diff --git a/src/main/as/com/threerings/bureau/client/BureauClient.as b/src/main/as/com/threerings/bureau/client/BureauClient.as index b94733e3e..e88cfbf99 100644 --- a/src/main/as/com/threerings/bureau/client/BureauClient.as +++ b/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 diff --git a/src/main/as/com/threerings/bureau/client/BureauDirector.as b/src/main/as/com/threerings/bureau/client/BureauDirector.as index f76885aba..55bfbc2c9 100644 --- a/src/main/as/com/threerings/bureau/client/BureauDirector.as +++ b/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; diff --git a/src/main/as/com/threerings/bureau/data/AgentObject.as b/src/main/as/com/threerings/bureau/data/AgentObject.as index c393119e9..5fd11b764 100644 --- a/src/main/as/com/threerings/bureau/data/AgentObject.as +++ b/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 diff --git a/src/main/as/com/threerings/bureau/util/BureauContext.as b/src/main/as/com/threerings/bureau/util/BureauContext.as index e08b6080b..4d542f968 100644 --- a/src/main/as/com/threerings/bureau/util/BureauContext.as +++ b/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; /** diff --git a/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as b/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as index a95d8f327..a7ae38f44 100644 --- a/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as +++ b/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 { diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as b/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as index 7a2aae154..2576598ab 100644 --- a/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as +++ b/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 diff --git a/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as b/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as index eb09a3b86..da4d1334a 100644 --- a/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as +++ b/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 { diff --git a/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as b/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as index bdccf788a..df1f82771 100644 --- a/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as +++ b/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 { diff --git a/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as b/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as index 221ffad2b..7bdffc27a 100644 --- a/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as +++ b/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 { diff --git a/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as b/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as index f0533dab9..7f8565fa0 100644 --- a/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as +++ b/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 ( diff --git a/src/main/as/com/threerings/crowd/chat/client/TellHandler.as b/src/main/as/com/threerings/crowd/chat/client/TellHandler.as index 1ca08b2e9..a6c72c18c 100644 --- a/src/main/as/com/threerings/crowd/chat/client/TellHandler.as +++ b/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 { diff --git a/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as b/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as index b17e08d31..501ff2b88 100644 --- a/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as +++ b/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 { diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as b/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as index a7fc6afbc..86d5c42c8 100644 --- a/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as +++ b/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; diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as b/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as index dac976c33..695cc30ee 100644 --- a/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as +++ b/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. */ diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as b/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as index c42792667..3844dd01e 100644 --- a/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as +++ b/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 com.threerings.util.ClassUtil; +import flash.utils.getTimer; 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. */ diff --git a/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as b/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as index aee34eba0..8b9681760 100644 --- a/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as +++ b/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; /** diff --git a/src/main/as/com/threerings/crowd/chat/data/UserMessage.as b/src/main/as/com/threerings/crowd/chat/data/UserMessage.as index 9f5a7c592..85d79ef84 100644 --- a/src/main/as/com/threerings/crowd/chat/data/UserMessage.as +++ b/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. */ diff --git a/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as b/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as index 2021abee3..690d0f371 100644 --- a/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as +++ b/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 diff --git a/src/main/as/com/threerings/crowd/client/LocationDirector.as b/src/main/as/com/threerings/crowd/client/LocationDirector.as index dc45a102f..2bbb9028b 100644 --- a/src/main/as/com/threerings/crowd/client/LocationDirector.as +++ b/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; diff --git a/src/main/as/com/threerings/crowd/client/OccupantDirector.as b/src/main/as/com/threerings/crowd/client/OccupantDirector.as index aee0f1af3..d77b5e515 100644 --- a/src/main/as/com/threerings/crowd/client/OccupantDirector.as +++ b/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; diff --git a/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as b/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as index bbda6383e..4c7cf1235 100644 --- a/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as +++ b/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; diff --git a/src/main/as/com/threerings/crowd/data/BodyObject.as b/src/main/as/com/threerings/crowd/data/BodyObject.as index 8cf441a2a..db97a8173 100644 --- a/src/main/as/com/threerings/crowd/data/BodyObject.as +++ b/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. */ diff --git a/src/main/as/com/threerings/crowd/data/OccupantInfo.as b/src/main/as/com/threerings/crowd/data/OccupantInfo.as index 92f2e259e..81ebb6c84 100644 --- a/src/main/as/com/threerings/crowd/data/OccupantInfo.as +++ b/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; diff --git a/src/main/as/com/threerings/crowd/data/Place.as b/src/main/as/com/threerings/crowd/data/Place.as index 91af81420..780959d6c 100644 --- a/src/main/as/com/threerings/crowd/data/Place.as +++ b/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; /** diff --git a/src/main/as/com/threerings/crowd/data/PlaceConfig.as b/src/main/as/com/threerings/crowd/data/PlaceConfig.as index cd8bf6653..ec7490602 100644 --- a/src/main/as/com/threerings/crowd/data/PlaceConfig.as +++ b/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; diff --git a/src/main/as/com/threerings/crowd/data/PlaceObject.as b/src/main/as/com/threerings/crowd/data/PlaceObject.as index 8d68aa5ab..8b558f579 100644 --- a/src/main/as/com/threerings/crowd/data/PlaceObject.as +++ b/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 diff --git a/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as b/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as index e073cd694..c730167d3 100644 --- a/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as +++ b/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; /** diff --git a/src/main/as/com/threerings/crowd/util/CrowdContext.as b/src/main/as/com/threerings/crowd/util/CrowdContext.as index 75d1098db..edd56d51e 100644 --- a/src/main/as/com/threerings/crowd/util/CrowdContext.as +++ b/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. diff --git a/src/main/as/com/threerings/io/FrameAvailableEvent.as b/src/main/as/com/threerings/io/FrameAvailableEvent.as index f02a4e406..98d032bb3 100644 --- a/src/main/as/com/threerings/io/FrameAvailableEvent.as +++ b/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 diff --git a/src/main/as/com/threerings/io/FrameReader.as b/src/main/as/com/threerings/io/FrameReader.as index aa474f19c..ba1cff9cd 100644 --- a/src/main/as/com/threerings/io/FrameReader.as +++ b/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; diff --git a/src/main/as/com/threerings/io/ObjectInputStream.as b/src/main/as/com/threerings/io/ObjectInputStream.as index ffec90a55..9cc74eedb 100644 --- a/src/main/as/com/threerings/io/ObjectInputStream.as +++ b/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; diff --git a/src/main/as/com/threerings/io/ObjectOutputStream.as b/src/main/as/com/threerings/io/ObjectOutputStream.as index e0451792d..970924889 100644 --- a/src/main/as/com/threerings/io/ObjectOutputStream.as +++ b/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 diff --git a/src/main/as/com/threerings/io/Streamer.as b/src/main/as/com/threerings/io/Streamer.as index b174e2eed..e2928849f 100644 --- a/src/main/as/com/threerings/io/Streamer.as +++ b/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 { diff --git a/src/main/as/com/threerings/io/streamers/ArrayStreamer.as b/src/main/as/com/threerings/io/streamers/ArrayStreamer.as index 24e2a4070..e66e48a5e 100644 --- a/src/main/as/com/threerings/io/streamers/ArrayStreamer.as +++ b/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; diff --git a/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as b/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as index 99e7589cd..740e8927f 100644 --- a/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as +++ b/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) diff --git a/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as b/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as index fa926091f..79e2fd9c5 100644 --- a/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as +++ b/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.ObjectOutputStream; -import com.threerings.io.Streamer; - +import com.threerings.io.ObjectInputStream; +import com.threerings.io.ObjectOutputStream; +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 diff --git a/src/main/as/com/threerings/io/streamers/EnumStreamer.as b/src/main/as/com/threerings/io/streamers/EnumStreamer.as index 89f349ed3..48fe0176c 100644 --- a/src/main/as/com/threerings/io/streamers/EnumStreamer.as +++ b/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) diff --git a/src/main/as/com/threerings/io/streamers/MapStreamer.as b/src/main/as/com/threerings/io/streamers/MapStreamer.as index cf0ccc6b9..894af0ce8 100644 --- a/src/main/as/com/threerings/io/streamers/MapStreamer.as +++ b/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; diff --git a/src/main/as/com/threerings/io/streamers/SetStreamer.as b/src/main/as/com/threerings/io/streamers/SetStreamer.as index a4e7c745c..45cfef0ae 100644 --- a/src/main/as/com/threerings/io/streamers/SetStreamer.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/client/Client.as b/src/main/as/com/threerings/presents/client/Client.as index 9e342bb54..01732630e 100644 --- a/src/main/as/com/threerings/presents/client/Client.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as b/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as index 5d863e63d..5d8eb61e9 100644 --- a/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/client/Communicator.as b/src/main/as/com/threerings/presents/client/Communicator.as index 88b968b55..96ea15ceb 100644 --- a/src/main/as/com/threerings/presents/client/Communicator.as +++ b/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 { diff --git a/src/main/as/com/threerings/presents/client/InvocationDirector.as b/src/main/as/com/threerings/presents/client/InvocationDirector.as index 43c4ccb1a..551fdb617 100644 --- a/src/main/as/com/threerings/presents/client/InvocationDirector.as +++ b/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 { diff --git a/src/main/as/com/threerings/presents/data/ClientObject.as b/src/main/as/com/threerings/presents/data/ClientObject.as index d3274164d..409f5633e 100644 --- a/src/main/as/com/threerings/presents/data/ClientObject.as +++ b/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 diff --git a/src/main/as/com/threerings/presents/data/InvocationMarshaller.as b/src/main/as/com/threerings/presents/data/InvocationMarshaller.as index ae7948b8b..75543c39a 100644 --- a/src/main/as/com/threerings/presents/data/InvocationMarshaller.as +++ b/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. diff --git a/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as b/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as index 9b5d1bc8c..8f2003ba0 100644 --- a/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as +++ b/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 diff --git a/src/main/as/com/threerings/presents/dobj/DObject.as b/src/main/as/com/threerings/presents/dobj/DObject.as index d4f9b5b42..ed2e4bb1c 100644 --- a/src/main/as/com/threerings/presents/dobj/DObject.as +++ b/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 com.threerings.util.Joiner; -import com.threerings.util.Log; +import org.osflash.signals.Signal; 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 { diff --git a/src/main/as/com/threerings/presents/dobj/DSet.as b/src/main/as/com/threerings/presents/dobj/DSet.as index d942fc49b..d950ab05e 100644 --- a/src/main/as/com/threerings/presents/dobj/DSet.as +++ b/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 diff --git a/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as b/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as index 6a6ab34a5..ec1279004 100644 --- a/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/dobj/MessageEvent.as b/src/main/as/com/threerings/presents/dobj/MessageEvent.as index 62667f1ce..c2e2a91bf 100644 --- a/src/main/as/com/threerings/presents/dobj/MessageEvent.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/dobj/NamedEvent.as b/src/main/as/com/threerings/presents/dobj/NamedEvent.as index beee2fe61..e7c3c5077 100644 --- a/src/main/as/com/threerings/presents/dobj/NamedEvent.as +++ b/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). diff --git a/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as b/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as index 8c184c7f7..20bdb9f5d 100644 --- a/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as +++ b/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 diff --git a/src/main/as/com/threerings/presents/dobj/OidList.as b/src/main/as/com/threerings/presents/dobj/OidList.as index 457012929..179f8bb8e 100644 --- a/src/main/as/com/threerings/presents/dobj/OidList.as +++ b/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 diff --git a/src/main/as/com/threerings/presents/net/AuthRequest.as b/src/main/as/com/threerings/presents/net/AuthRequest.as index 570c1a226..d290a3413 100644 --- a/src/main/as/com/threerings/presents/net/AuthRequest.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/net/AuthResponse.as b/src/main/as/com/threerings/presents/net/AuthResponse.as index bbc96180a..c41ddf0ac 100644 --- a/src/main/as/com/threerings/presents/net/AuthResponse.as +++ b/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 { diff --git a/src/main/as/com/threerings/presents/net/AuthResponseData.as b/src/main/as/com/threerings/presents/net/AuthResponseData.as index 3d158c19d..b25e28654 100644 --- a/src/main/as/com/threerings/presents/net/AuthResponseData.as +++ b/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. */ diff --git a/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as b/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as index 10695fae2..d251a276b 100644 --- a/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as +++ b/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 { diff --git a/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as b/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as index e083d33bb..6f8a5d325 100644 --- a/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/net/Credentials.as b/src/main/as/com/threerings/presents/net/Credentials.as index 3de030ba1..4d157eaab 100644 --- a/src/main/as/com/threerings/presents/net/Credentials.as +++ b/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 diff --git a/src/main/as/com/threerings/presents/net/ForwardEventRequest.as b/src/main/as/com/threerings/presents/net/ForwardEventRequest.as index 23dfcbae3..f6da2d857 100644 --- a/src/main/as/com/threerings/presents/net/ForwardEventRequest.as +++ b/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 { /** diff --git a/src/main/as/com/threerings/presents/net/ObjectResponse.as b/src/main/as/com/threerings/presents/net/ObjectResponse.as index 870d0d491..26b39d54b 100644 --- a/src/main/as/com/threerings/presents/net/ObjectResponse.as +++ b/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 diff --git a/src/main/as/com/threerings/presents/net/PongResponse.as b/src/main/as/com/threerings/presents/net/PongResponse.as index 5d7f14af1..935872f89 100644 --- a/src/main/as/com/threerings/presents/net/PongResponse.as +++ b/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 { diff --git a/src/main/as/com/threerings/presents/net/ServiceCreds.as b/src/main/as/com/threerings/presents/net/ServiceCreds.as index eca15cdd4..297b347d8 100644 --- a/src/main/as/com/threerings/presents/net/ServiceCreds.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/net/UpstreamMessage.as b/src/main/as/com/threerings/presents/net/UpstreamMessage.as index 7d06f9035..ec38dad0f 100644 --- a/src/main/as/com/threerings/presents/net/UpstreamMessage.as +++ b/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; diff --git a/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as b/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as index 74fe78b8b..7e254d82e 100644 --- a/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as +++ b/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 { /** diff --git a/src/main/as/com/threerings/presents/peer/data/ClientInfo.as b/src/main/as/com/threerings/presents/peer/data/ClientInfo.as index 198ef23b7..b038f790a 100644 --- a/src/main/as/com/threerings/presents/peer/data/ClientInfo.as +++ b/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; diff --git a/src/main/as/com/threerings/util/EmbeddedSwfLoader.as b/src/main/as/com/threerings/util/EmbeddedSwfLoader.as index f7046dd35..42cd3759b 100644 --- a/src/main/as/com/threerings/util/EmbeddedSwfLoader.as +++ b/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 diff --git a/src/main/as/com/threerings/util/MessageBundle.as b/src/main/as/com/threerings/util/MessageBundle.as index c181eeae8..127d61892 100644 --- a/src/main/as/com/threerings/util/MessageBundle.as +++ b/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 diff --git a/src/main/as/com/threerings/util/MessageManager.as b/src/main/as/com/threerings/util/MessageManager.as index 9f23b8164..f561e9680 100644 --- a/src/main/as/com/threerings/util/MessageManager.as +++ b/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; diff --git a/src/main/as/com/threerings/util/Name.as b/src/main/as/com/threerings/util/Name.as index a99f0910b..9595cc6e0 100644 --- a/src/main/as/com/threerings/util/Name.as +++ b/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; diff --git a/src/main/as/com/threerings/util/ObjectMarshaller.as b/src/main/as/com/threerings/util/ObjectMarshaller.as index eb57528f7..eed5f96cd 100644 --- a/src/main/as/com/threerings/util/ObjectMarshaller.as +++ b/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;