diff --git a/src/main/as/com/threerings/parlor/card/data/Card.as b/src/main/as/com/threerings/parlor/card/data/Card.as index d1b2bb82..ae550675 100644 --- a/src/main/as/com/threerings/parlor/card/data/Card.as +++ b/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; diff --git a/src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as b/src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as index 8deaf8ea..facc9c96 100644 --- a/src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as +++ b/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. */ diff --git a/src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as b/src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as index 8db04e14..ba11fb08 100644 --- a/src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as +++ b/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 TrickCardGameService interface diff --git a/src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as b/src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as index fbfb083f..110a663a 100644 --- a/src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as +++ b/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; diff --git a/src/main/as/com/threerings/parlor/client/ParlorDecoder.as b/src/main/as/com/threerings/parlor/client/ParlorDecoder.as index 15186f0a..befc021b 100644 --- a/src/main/as/com/threerings/parlor/client/ParlorDecoder.as +++ b/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. diff --git a/src/main/as/com/threerings/parlor/client/ParlorDirector.as b/src/main/as/com/threerings/parlor/client/ParlorDirector.as index 519e446f..cf35a0dc 100644 --- a/src/main/as/com/threerings/parlor/client/ParlorDirector.as +++ b/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; diff --git a/src/main/as/com/threerings/parlor/client/ParlorService.as b/src/main/as/com/threerings/parlor/client/ParlorService.as index 42ba3a61..34f86d96 100644 --- a/src/main/as/com/threerings/parlor/client/ParlorService.as +++ b/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.presents.client.Client; +import com.threerings.util.Name; + 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. diff --git a/src/main/as/com/threerings/parlor/client/TableConfigurator.as b/src/main/as/com/threerings/parlor/client/TableConfigurator.as index 80230639..5e60874c 100644 --- a/src/main/as/com/threerings/parlor/client/TableConfigurator.as +++ b/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 diff --git a/src/main/as/com/threerings/parlor/client/TableDirector.as b/src/main/as/com/threerings/parlor/client/TableDirector.as index e0507234..289ea3bf 100644 --- a/src/main/as/com/threerings/parlor/client/TableDirector.as +++ b/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; diff --git a/src/main/as/com/threerings/parlor/client/TableService.as b/src/main/as/com/threerings/parlor/client/TableService.as index 87ff24f5..f7050059 100644 --- a/src/main/as/com/threerings/parlor/client/TableService.as +++ b/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.parlor.game.data.GameConfig; -import com.threerings.presents.client.Client; +import com.threerings.util.Name; + 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. diff --git a/src/main/as/com/threerings/parlor/data/ParlorMarshaller.as b/src/main/as/com/threerings/parlor/data/ParlorMarshaller.as index 3da7b910..b70459a1 100644 --- a/src/main/as/com/threerings/parlor/data/ParlorMarshaller.as +++ b/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.parlor.client.ParlorService_InviteListener; -import com.threerings.parlor.game.data.GameConfig; -import com.threerings.presents.client.Client; +import com.threerings.util.Integer; +import com.threerings.util.Name; + 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 ParlorService interface diff --git a/src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as b/src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as index ffd4d335..b3932df5 100644 --- a/src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as +++ b/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. */ diff --git a/src/main/as/com/threerings/parlor/data/Table.as b/src/main/as/com/threerings/parlor/data/Table.as index a6eb58d9..39f8bf97 100644 --- a/src/main/as/com/threerings/parlor/data/Table.as +++ b/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; /** diff --git a/src/main/as/com/threerings/parlor/data/TableMarshaller.as b/src/main/as/com/threerings/parlor/data/TableMarshaller.as index afe8afed..1b4e7809 100644 --- a/src/main/as/com/threerings/parlor/data/TableMarshaller.as +++ b/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.parlor.game.data.GameConfig; -import com.threerings.presents.client.Client; +import com.threerings.util.Integer; +import com.threerings.util.Name; + 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 TableService interface diff --git a/src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as b/src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as index 57e097b0..5d033c80 100644 --- a/src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as +++ b/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 com.threerings.flex.GridUtil; +import mx.core.Container; +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. diff --git a/src/main/as/com/threerings/parlor/game/data/GameConfig.as b/src/main/as/com/threerings/parlor/game/data/GameConfig.as index 24145b0d..6163c030 100644 --- a/src/main/as/com/threerings/parlor/game/data/GameConfig.as +++ b/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; diff --git a/src/main/as/com/threerings/parlor/game/data/GameObject.as b/src/main/as/com/threerings/parlor/game/data/GameObject.as index 5630ea76..764bfc01 100644 --- a/src/main/as/com/threerings/parlor/game/data/GameObject.as +++ b/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; /** diff --git a/src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as b/src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as index aa608104..7dc25e87 100644 --- a/src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as +++ b/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; /** diff --git a/src/main/as/com/threerings/parlor/util/ParlorContext.as b/src/main/as/com/threerings/parlor/util/ParlorContext.as index 563bcb04..301ce488 100644 --- a/src/main/as/com/threerings/parlor/util/ParlorContext.as +++ b/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; /** diff --git a/src/main/as/com/threerings/stage/client/CharacterIsoSprite.as b/src/main/as/com/threerings/stage/client/CharacterIsoSprite.as index 995c828a..2b0c757e 100644 --- a/src/main/as/com/threerings/stage/client/CharacterIsoSprite.as +++ b/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 as3isolib.display.scene.IsoScene; -import as3isolib.graphics.SolidColorFill; +import com.threerings.stage.data.StageLocation; public class CharacterIsoSprite extends IsoSprite implements Pathable, PriorityIsoDisplayObject diff --git a/src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as b/src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as index f479d033..87b7ee8e 100644 --- a/src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as +++ b/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 com.threerings.crowd.client.OccupantObserver; +import as3isolib.geom.Pt; -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 diff --git a/src/main/as/com/threerings/stage/client/PortalIsoSprite.as b/src/main/as/com/threerings/stage/client/PortalIsoSprite.as index 0e09b66a..1a2db3b1 100644 --- a/src/main/as/com/threerings/stage/client/PortalIsoSprite.as +++ b/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 diff --git a/src/main/as/com/threerings/stage/client/SceneColorizer.as b/src/main/as/com/threerings/stage/client/SceneColorizer.as index aebd1fba..9232767b 100644 --- a/src/main/as/com/threerings/stage/client/SceneColorizer.as +++ b/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.util.Map; + +import com.threerings.miso.data.ObjectInfo; + +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 { diff --git a/src/main/as/com/threerings/stage/client/StageSceneBlock.as b/src/main/as/com/threerings/stage/client/StageSceneBlock.as index 27c4adec..471d3077 100644 --- a/src/main/as/com/threerings/stage/client/StageSceneBlock.as +++ b/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, diff --git a/src/main/as/com/threerings/stage/client/StageSceneController.as b/src/main/as/com/threerings/stage/client/StageSceneController.as index 55393809..2026301a 100644 --- a/src/main/as/com/threerings/stage/client/StageSceneController.as +++ b/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); diff --git a/src/main/as/com/threerings/stage/client/StageScenePanel.as b/src/main/as/com/threerings/stage/client/StageScenePanel.as index 55d53d2f..e65adac6 100644 --- a/src/main/as/com/threerings/stage/client/StageScenePanel.as +++ b/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. */ diff --git a/src/main/as/com/threerings/stage/client/StageSceneService.as b/src/main/as/com/threerings/stage/client/StageSceneService.as index 65e2c756..f68c578f 100644 --- a/src/main/as/com/threerings/stage/client/StageSceneService.as +++ b/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. */ diff --git a/src/main/as/com/threerings/stage/data/DefaultColorUpdate.as b/src/main/as/com/threerings/stage/data/DefaultColorUpdate.as index 07555941..7e506fc4 100644 --- a/src/main/as/com/threerings/stage/data/DefaultColorUpdate.as +++ b/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 diff --git a/src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as b/src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as index 5cefcd96..09ec37c7 100644 --- a/src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as +++ b/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. diff --git a/src/main/as/com/threerings/stage/data/StageLocation.as b/src/main/as/com/threerings/stage/data/StageLocation.as index 8d6310eb..a3edad66 100644 --- a/src/main/as/com/threerings/stage/data/StageLocation.as +++ b/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.io.ObjectInputStream; -import com.threerings.io.ObjectOutputStream; +import com.threerings.whirled.spot.data.Location; import com.threerings.stage.data.StageLocation; -import com.threerings.whirled.spot.data.Location; /** * Contains information on a scene occupant's position and orientation. diff --git a/src/main/as/com/threerings/stage/data/StageMisoSceneModel.as b/src/main/as/com/threerings/stage/data/StageMisoSceneModel.as index 6c3de1aa..6ba1eeb1 100644 --- a/src/main/as/com/threerings/stage/data/StageMisoSceneModel.as +++ b/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; /** diff --git a/src/main/as/com/threerings/stage/data/StageOccupantInfo.as b/src/main/as/com/threerings/stage/data/StageOccupantInfo.as index 388e69cc..da000dcd 100644 --- a/src/main/as/com/threerings/stage/data/StageOccupantInfo.as +++ b/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. diff --git a/src/main/as/com/threerings/stage/data/StageScene.as b/src/main/as/com/threerings/stage/data/StageScene.as index f0c87947..d77a572e 100644 --- a/src/main/as/com/threerings/stage/data/StageScene.as +++ b/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; diff --git a/src/main/as/com/threerings/stage/data/StageSceneConfig.as b/src/main/as/com/threerings/stage/data/StageSceneConfig.as index fe15a12e..1b9e0291 100644 --- a/src/main/as/com/threerings/stage/data/StageSceneConfig.as +++ b/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. diff --git a/src/main/as/com/threerings/stage/data/StageSceneMarshaller.as b/src/main/as/com/threerings/stage/data/StageSceneMarshaller.as index 1a030e30..0669f23d 100644 --- a/src/main/as/com/threerings/stage/data/StageSceneMarshaller.as +++ b/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; /** diff --git a/src/main/as/com/threerings/stage/data/StageSceneModel.as b/src/main/as/com/threerings/stage/data/StageSceneModel.as index 583e8c6c..53cb0540 100644 --- a/src/main/as/com/threerings/stage/data/StageSceneModel.as +++ b/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 diff --git a/src/main/as/com/threerings/stage/data/StageSceneObject.as b/src/main/as/com/threerings/stage/data/StageSceneObject.as index 9a7b9e49..880718ff 100644 --- a/src/main/as/com/threerings/stage/data/StageSceneObject.as +++ b/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 diff --git a/src/main/as/com/threerings/stage/util/StageContext.as b/src/main/as/com/threerings/stage/util/StageContext.as index 056a5094..02fd4f7b 100644 --- a/src/main/as/com/threerings/stage/util/StageContext.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/client/SceneDecoder.as b/src/main/as/com/threerings/whirled/client/SceneDecoder.as index 01bdea0c..ef6a7c43 100644 --- a/src/main/as/com/threerings/whirled/client/SceneDecoder.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/client/SceneDirector.as b/src/main/as/com/threerings/whirled/client/SceneDirector.as index 2f228e58..ac485e8a 100644 --- a/src/main/as/com/threerings/whirled/client/SceneDirector.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/client/SceneService.as b/src/main/as/com/threerings/whirled/client/SceneService.as index 0e5436c2..c033c926 100644 --- a/src/main/as/com/threerings/whirled/client/SceneService.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as b/src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as index d1c027b4..9686b758 100644 --- a/src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/data/AuxModel.as b/src/main/as/com/threerings/whirled/data/AuxModel.as index f8e879e2..b5a584fd 100644 --- a/src/main/as/com/threerings/whirled/data/AuxModel.as +++ b/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. */ diff --git a/src/main/as/com/threerings/whirled/data/SceneMarshaller.as b/src/main/as/com/threerings/whirled/data/SceneMarshaller.as index a89be9fa..989b8b15 100644 --- a/src/main/as/com/threerings/whirled/data/SceneMarshaller.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as b/src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as index 25ea0daf..fbcb1c4f 100644 --- a/src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/data/SceneModel.as b/src/main/as/com/threerings/whirled/data/SceneModel.as index 32d175aa..2a739725 100644 --- a/src/main/as/com/threerings/whirled/data/SceneModel.as +++ b/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 diff --git a/src/main/as/com/threerings/whirled/data/SceneUpdate.as b/src/main/as/com/threerings/whirled/data/SceneUpdate.as index ffbd0d1f..6d4dc8fb 100644 --- a/src/main/as/com/threerings/whirled/data/SceneUpdate.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as b/src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as index 937f0199..a51c066c 100644 --- a/src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/spot/client/SpotService.as b/src/main/as/com/threerings/whirled/spot/client/SpotService.as index b573dad4..98f50282 100644 --- a/src/main/as/com/threerings/whirled/spot/client/SpotService.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as b/src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as index 6d79daed..edb9d66a 100644 --- a/src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/spot/data/Cluster.as b/src/main/as/com/threerings/whirled/spot/data/Cluster.as index 4c901a66..8967d3d1 100644 --- a/src/main/as/com/threerings/whirled/spot/data/Cluster.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/spot/data/Portal.as b/src/main/as/com/threerings/whirled/spot/data/Portal.as index 2f9e2d86..1ce4d639 100644 --- a/src/main/as/com/threerings/whirled/spot/data/Portal.as +++ b/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 diff --git a/src/main/as/com/threerings/whirled/spot/data/SceneLocation.as b/src/main/as/com/threerings/whirled/spot/data/SceneLocation.as index 9e8128ca..d7cd0de3 100644 --- a/src/main/as/com/threerings/whirled/spot/data/SceneLocation.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as b/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as index f6948cc8..dc940ccc 100644 --- a/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as b/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as index 39db03e3..0167d72c 100644 --- a/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as b/src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as index 0fd56d6f..38c29d97 100644 --- a/src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as +++ b/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. diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as b/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as index ea9d6553..2d9df425 100644 --- a/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as b/src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as index c6914031..b3501528 100644 --- a/src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/util/SceneFactory.as b/src/main/as/com/threerings/whirled/util/SceneFactory.as index ca426e3a..213d9238 100644 --- a/src/main/as/com/threerings/whirled/util/SceneFactory.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/util/WhirledContext.as b/src/main/as/com/threerings/whirled/util/WhirledContext.as index fa4736c4..73404e63 100644 --- a/src/main/as/com/threerings/whirled/util/WhirledContext.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as b/src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as index f55c645e..424f46c1 100644 --- a/src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as b/src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as index c2429c4c..d75b1cc7 100644 --- a/src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as +++ b/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 { diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneService.as b/src/main/as/com/threerings/whirled/zone/client/ZoneService.as index b77f35c1..61445aa8 100644 --- a/src/main/as/com/threerings/whirled/zone/client/ZoneService.as +++ b/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; /** diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as b/src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as index 7bef6ee8..f3c3ba0e 100644 --- a/src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as b/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as index 31a9778a..66037ea7 100644 --- a/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as b/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as index ec5a7639..277dcf88 100644 --- a/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as +++ b/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; diff --git a/src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as b/src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as index c3fc1640..0a559b38 100644 --- a/src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as +++ b/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