From 8b03be111eb9ca023302dbecec665937d4013829 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Fri, 26 Sep 2008 17:36:37 +0000 Subject: [PATCH] Imports cleanup git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@751 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../threerings/micasa/client/ChatPanel.java | 7 ++---- .../micasa/client/ClientController.java | 1 + .../threerings/micasa/client/MiCasaApp.java | 1 + .../micasa/client/MiCasaApplet.java | 2 ++ .../micasa/client/MiCasaClient.java | 8 ++++--- .../threerings/micasa/lobby/LobbyConfig.java | 7 ++++-- .../micasa/lobby/LobbyController.java | 8 ++++--- .../threerings/micasa/lobby/LobbyManager.java | 1 + .../micasa/lobby/LobbyMarshaller.java | 3 ++- .../threerings/micasa/lobby/LobbyPanel.java | 8 +++++-- .../micasa/lobby/LobbyRegistry.java | 3 ++- .../micasa/lobby/LobbySelector.java | 8 ++++--- .../micasa/lobby/table/TableItem.java | 5 ++-- .../micasa/lobby/table/TableListView.java | 8 +++---- .../micasa/lobby/table/TableLobbyConfig.java | 1 + .../micasa/lobby/table/TableLobbyManager.java | 2 ++ .../micasa/lobby/table/TableLobbyObject.java | 3 ++- .../micasa/server/MiCasaClient.java | 1 + .../micasa/simulator/client/SimpleClient.java | 8 +++---- .../micasa/simulator/client/SimulatorApp.java | 5 ++-- .../simulator/client/SimulatorController.java | 1 + .../simulator/data/SimulatorMarshaller.java | 6 +++-- .../simulator/server/SimulatorDispatcher.java | 6 +++-- .../simulator/server/SimulatorManager.java | 1 + .../simulator/server/SimulatorProvider.java | 1 + .../threerings/micasa/util/MiCasaContext.java | 2 ++ .../parlor/card/client/CardGameDecoder.java | 3 ++- .../parlor/card/client/CardGameReceiver.java | 4 ++-- .../parlor/card/client/CardPanel.java | 11 +++++---- .../parlor/card/client/CardSprite.java | 1 + .../parlor/card/server/CardGameManager.java | 4 ++-- .../parlor/card/server/CardGameSender.java | 5 ++-- .../TrickCardGameControllerDelegate.java | 3 +-- .../trick/client/TrickCardGameService.java | 4 ++-- .../trick/data/TrickCardGameMarshaller.java | 5 ++-- .../trick/server/TrickCardGameDispatcher.java | 5 ++-- .../server/TrickCardGameManagerDelegate.java | 3 +-- .../trick/server/TrickCardGameProvider.java | 5 ++-- .../client/DefaultSwingTableConfigurator.java | 2 ++ .../parlor/client/ParlorDecoder.java | 6 +++-- .../parlor/client/ParlorDirector.java | 1 + .../parlor/client/TableConfigurator.java | 4 +--- .../parlor/client/TableDirector.java | 2 +- .../parlor/data/ParlorMarshaller.java | 8 ++++--- .../com/threerings/parlor/data/Table.java | 3 +-- .../parlor/data/TableMarshaller.java | 8 ++++--- .../parlor/game/client/GameConfigurator.java | 4 ++-- .../parlor/game/data/GameConfig.java | 3 ++- .../parlor/game/data/GameObject.java | 1 + .../parlor/game/server/GameManager.java | 9 +++---- .../parlor/rating/server/RatingDelegate.java | 12 +++++----- .../server/persist/PercentileRecord.java | 1 + .../rating/server/persist/RatingRecord.java | 4 ++-- .../server/persist/RatingRepository.java | 4 +++- .../parlor/rating/util/Percentiler.java | 1 + .../parlor/server/ParlorDispatcher.java | 10 ++++---- .../parlor/server/ParlorManager.java | 1 + .../parlor/server/ParlorProvider.java | 8 ++++--- .../parlor/server/ParlorSender.java | 8 ++++--- .../threerings/parlor/server/PlayManager.java | 4 ++-- .../parlor/server/TableDispatcher.java | 10 ++++---- .../parlor/server/TableManager.java | 3 ++- .../parlor/server/TableProvider.java | 10 ++++---- .../tourney/client/TourniesService.java | 4 ++-- .../parlor/tourney/data/EntryFee.java | 4 ++-- .../parlor/tourney/data/Participant.java | 4 ++-- .../parlor/tourney/data/TourneyConfig.java | 1 + .../tourney/data/TourneyMarshaller.java | 3 ++- .../tourney/data/TourniesMarshaller.java | 3 ++- .../tourney/server/TourneyDispatcher.java | 3 ++- .../parlor/tourney/server/TourneyManager.java | 17 ++++++------- .../tourney/server/TourneyProvider.java | 3 ++- .../tourney/server/TourniesDispatcher.java | 5 ++-- .../tourney/server/TourniesManager.java | 1 + .../tourney/server/TourniesProvider.java | 5 ++-- .../server/persist/TourneyRepository.java | 7 +++--- .../parlor/turn/client/TurnDisplay.java | 16 ++++++------- .../turn/client/TurnGameController.java | 3 ++- .../client/TurnGameControllerDelegate.java | 3 +-- .../turn/server/TurnGameManagerDelegate.java | 9 ++++--- .../threerings/parlor/util/ParlorContext.java | 1 + .../threerings/parlor/util/RobotPlayer.java | 6 +++-- .../puzzle/client/PuzzleBoardView.java | 8 ++++--- .../puzzle/client/PuzzleController.java | 12 ++++++---- .../threerings/puzzle/client/PuzzlePanel.java | 1 + .../puzzle/data/PuzzleGameMarshaller.java | 1 + .../puzzle/drop/client/DropBoardView.java | 7 +++--- .../drop/client/DropControllerDelegate.java | 7 ++++-- .../puzzle/drop/client/DropSprite.java | 1 + .../puzzle/drop/client/NextBlockView.java | 3 ++- .../drop/client/PieceGroupAnimation.java | 1 + .../puzzle/drop/data/DropBoard.java | 3 ++- .../puzzle/drop/data/SegmentInfo.java | 1 + .../drop/server/DropManagerDelegate.java | 5 ++-- .../puzzle/drop/util/PieceDestroyer.java | 2 +- .../puzzle/server/PuzzleGameDispatcher.java | 1 + .../puzzle/server/PuzzleGameProvider.java | 1 + .../puzzle/server/PuzzleManager.java | 1 + .../com/threerings/puzzle/util/PointSet.java | 3 ++- .../puzzle/util/PuzzleGameUtil.java | 1 + .../stage/client/StageScenePanel.java | 23 +++++++++++------- .../com/threerings/stage/data/StageScene.java | 4 ++-- .../stage/data/StageSceneMarshaller.java | 4 +++- .../stage/server/StageSceneDispatcher.java | 4 +++- .../stage/server/StageSceneManager.java | 22 ++++++++++------- .../stage/server/StageSceneProvider.java | 4 +++- .../stage/tools/editor/DirectionButton.java | 5 ++-- .../stage/tools/editor/EditorApp.java | 24 ++++++++++--------- .../stage/tools/editor/EditorDialog.java | 1 + .../stage/tools/editor/EditorFrame.java | 10 +++++--- .../stage/tools/editor/EditorModel.java | 4 ++-- .../stage/tools/editor/EditorScenePanel.java | 24 ++++++++++++------- .../stage/tools/editor/EditorScrollBox.java | 10 +++----- .../stage/tools/editor/EditorTileManager.java | 7 +++--- .../tools/editor/EditorToolBarPanel.java | 3 ++- .../tools/editor/ObjectEditorDialog.java | 6 ++--- .../stage/tools/editor/PortalDialog.java | 6 +++-- .../stage/tools/editor/PortalTool.java | 8 ++++--- .../stage/tools/editor/PreferencesDialog.java | 3 ++- .../stage/tools/editor/SceneInfoPanel.java | 18 +++++++------- .../stage/tools/editor/TestTileLoader.java | 14 ++++++----- .../stage/tools/editor/TileInfoPanel.java | 11 ++++----- .../stage/tools/editor/util/TileSetUtil.java | 1 + .../stage/tools/viewer/ViewerApp.java | 15 ++++++------ .../stage/tools/viewer/ViewerFrame.java | 7 +++--- .../stage/tools/viewer/ViewerScenePanel.java | 14 +++++------ .../stage/tools/xml/StageSceneParser.java | 7 +++--- .../stage/tools/xml/StageSceneWriter.java | 4 +--- .../stage/util/PlacementConstraints.java | 5 ++-- .../threerings/stage/util/StageContext.java | 6 +++-- .../threerings/stage/util/StageSceneUtil.java | 6 +++-- .../threerings/stats/data/IntArrayStat.java | 4 ++-- .../com/threerings/stats/data/IntSetStat.java | 2 ++ .../com/threerings/stats/data/MaxIntStat.java | 2 +- src/java/com/threerings/stats/data/Stat.java | 4 +++- .../stats/server/persist/StatRepository.java | 6 ++--- .../whirled/client/SceneDirector.java | 5 ++-- .../whirled/data/DefaultSceneConfig.java | 1 + .../whirled/data/SceneMarshaller.java | 4 +++- .../threerings/whirled/data/SceneUpdate.java | 1 + .../whirled/server/SceneDispatcher.java | 1 + .../whirled/server/SceneManager.java | 3 ++- .../whirled/server/SceneProvider.java | 1 + .../whirled/server/SceneRegistry.java | 5 ++-- .../whirled/server/SceneSender.java | 1 + .../server/persist/SceneUpdateMarshaller.java | 5 ++-- .../spot/client/SpotSceneDirector.java | 3 +-- .../threerings/whirled/spot/data/Cluster.java | 1 + .../whirled/spot/data/SpotMarshaller.java | 1 + .../whirled/spot/data/SpotSceneObject.java | 1 + .../whirled/spot/server/SpotDispatcher.java | 1 + .../whirled/spot/server/SpotProvider.java | 1 + .../whirled/spot/server/SpotSceneManager.java | 4 ++-- .../spot/server/SpotSceneMoveHandler.java | 1 - .../spot/server/SpotSceneRegistry.java | 4 ++-- .../spot/tools/xml/SpotSceneRuleSet.java | 12 +++++----- .../spot/tools/xml/SpotSceneWriter.java | 1 + .../whirled/tools/xml/SceneParser.java | 5 +++- .../whirled/tools/xml/SceneRuleSet.java | 1 + .../whirled/tools/xml/SceneWriter.java | 6 +++-- .../threerings/whirled/util/SceneFactory.java | 1 + .../whirled/util/WhirledContext.java | 1 + .../whirled/zone/client/ZoneDirector.java | 1 - .../whirled/zone/client/ZoneService.java | 2 +- .../whirled/zone/data/ZoneMarshaller.java | 4 +++- .../whirled/zone/data/ZoneSummary.java | 1 + .../whirled/zone/server/ZoneDispatcher.java | 1 + .../whirled/zone/server/ZoneManager.java | 1 + .../whirled/zone/server/ZoneMoveHandler.java | 1 - .../whirled/zone/server/ZoneProvider.java | 1 + .../whirled/zone/server/ZoneRegistry.java | 2 +- .../whirled/zone/server/ZoneSender.java | 1 + .../com/threerings/parlor/TestClient.java | 10 +++++--- .../com/threerings/parlor/TestConfig.java | 1 + .../com/threerings/parlor/TestController.java | 1 + .../com/threerings/whirled/TestClient.java | 2 +- .../com/threerings/whirled/TestConfig.java | 1 + .../threerings/whirled/TestController.java | 3 ++- .../spot/tools/xml/SpotSceneParserTest.java | 4 ++-- .../whirled/tools/xml/SceneParserTest.java | 4 ++-- 180 files changed, 512 insertions(+), 342 deletions(-) diff --git a/src/java/com/threerings/micasa/client/ChatPanel.java b/src/java/com/threerings/micasa/client/ChatPanel.java index 717c9bb8..7536ba26 100644 --- a/src/java/com/threerings/micasa/client/ChatPanel.java +++ b/src/java/com/threerings/micasa/client/ChatPanel.java @@ -21,13 +21,13 @@ package com.threerings.micasa.client; +import java.util.StringTokenizer; + import java.awt.Color; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.StringTokenizer; - import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JLabel; @@ -35,10 +35,8 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.JTextPane; - import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; - import javax.swing.text.BadLocationException; import javax.swing.text.Document; import javax.swing.text.Style; @@ -57,7 +55,6 @@ import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.ChatMessage; import com.threerings.crowd.chat.data.SystemMessage; import com.threerings.crowd.chat.data.UserMessage; - import com.threerings.crowd.client.OccupantObserver; import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.data.OccupantInfo; diff --git a/src/java/com/threerings/micasa/client/ClientController.java b/src/java/com/threerings/micasa/client/ClientController.java index 2413f75d..28da3dfc 100644 --- a/src/java/com/threerings/micasa/client/ClientController.java +++ b/src/java/com/threerings/micasa/client/ClientController.java @@ -22,6 +22,7 @@ package com.threerings.micasa.client; import java.awt.event.ActionEvent; + import com.samskivert.swing.Controller; import com.threerings.presents.client.Client; diff --git a/src/java/com/threerings/micasa/client/MiCasaApp.java b/src/java/com/threerings/micasa/client/MiCasaApp.java index d553d7ca..507e16da 100644 --- a/src/java/com/threerings/micasa/client/MiCasaApp.java +++ b/src/java/com/threerings/micasa/client/MiCasaApp.java @@ -24,6 +24,7 @@ package com.threerings.micasa.client; import java.io.IOException; import com.samskivert.swing.util.SwingUtil; + import com.threerings.util.Name; import com.threerings.presents.client.Client; diff --git a/src/java/com/threerings/micasa/client/MiCasaApplet.java b/src/java/com/threerings/micasa/client/MiCasaApplet.java index 99731711..b180406e 100644 --- a/src/java/com/threerings/micasa/client/MiCasaApplet.java +++ b/src/java/com/threerings/micasa/client/MiCasaApplet.java @@ -22,9 +22,11 @@ package com.threerings.micasa.client; import java.applet.Applet; + import java.io.IOException; import com.samskivert.swing.util.SwingUtil; + import com.threerings.util.Name; import com.threerings.presents.client.Client; diff --git a/src/java/com/threerings/micasa/client/MiCasaClient.java b/src/java/com/threerings/micasa/client/MiCasaClient.java index 2c4882fa..80531ac1 100644 --- a/src/java/com/threerings/micasa/client/MiCasaClient.java +++ b/src/java/com/threerings/micasa/client/MiCasaClient.java @@ -21,25 +21,27 @@ package com.threerings.micasa.client; +import java.io.IOException; + import java.awt.EventQueue; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; + import javax.swing.JPanel; import com.samskivert.util.Config; import com.samskivert.util.RunQueue; + import com.threerings.util.MessageManager; import com.threerings.presents.client.Client; import com.threerings.presents.dobj.DObjectManager; +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; - import com.threerings.parlor.client.ParlorDirector; import com.threerings.micasa.util.MiCasaContext; diff --git a/src/java/com/threerings/micasa/lobby/LobbyConfig.java b/src/java/com/threerings/micasa/lobby/LobbyConfig.java index 3912886e..ae07d38a 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyConfig.java +++ b/src/java/com/threerings/micasa/lobby/LobbyConfig.java @@ -21,17 +21,20 @@ package com.threerings.micasa.lobby; +import java.util.Properties; + import javax.swing.JComponent; import javax.swing.JLabel; -import java.util.Properties; import com.samskivert.util.StringUtil; import com.threerings.crowd.client.PlaceController; import com.threerings.crowd.data.PlaceConfig; -import com.threerings.micasa.util.MiCasaContext; + import com.threerings.parlor.game.data.GameConfig; +import com.threerings.micasa.util.MiCasaContext; + public class LobbyConfig extends PlaceConfig { @Override diff --git a/src/java/com/threerings/micasa/lobby/LobbyController.java b/src/java/com/threerings/micasa/lobby/LobbyController.java index 4c612cd9..9412f9c9 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyController.java +++ b/src/java/com/threerings/micasa/lobby/LobbyController.java @@ -23,13 +23,15 @@ package com.threerings.micasa.lobby; import com.threerings.util.Name; -import com.threerings.crowd.data.PlaceConfig; -import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.client.PlaceController; import com.threerings.crowd.client.PlaceView; +import com.threerings.crowd.data.PlaceConfig; +import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.util.CrowdContext; -import com.threerings.parlor.client.*; +import com.threerings.parlor.client.Invitation; +import com.threerings.parlor.client.InvitationHandler; +import com.threerings.parlor.client.InvitationResponseObserver; import com.threerings.parlor.game.data.GameConfig; import com.threerings.micasa.util.MiCasaContext; diff --git a/src/java/com/threerings/micasa/lobby/LobbyManager.java b/src/java/com/threerings/micasa/lobby/LobbyManager.java index 9283b6ee..255fcbb5 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyManager.java +++ b/src/java/com/threerings/micasa/lobby/LobbyManager.java @@ -22,6 +22,7 @@ package com.threerings.micasa.lobby; import java.util.Properties; + import com.samskivert.util.StringUtil; import com.threerings.crowd.data.PlaceObject; diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java index 49e8be0c..fa972332 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java +++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java @@ -21,10 +21,11 @@ package com.threerings.micasa.lobby; +import java.util.List; + import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; -import java.util.List; /** * Provides the implementation of the {@link LobbyService} interface diff --git a/src/java/com/threerings/micasa/lobby/LobbyPanel.java b/src/java/com/threerings/micasa/lobby/LobbyPanel.java index 4da9d91c..e967ea9c 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyPanel.java +++ b/src/java/com/threerings/micasa/lobby/LobbyPanel.java @@ -21,7 +21,10 @@ package com.threerings.micasa.lobby; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; import com.samskivert.swing.Controller; import com.samskivert.swing.HGroupLayout; @@ -30,7 +33,8 @@ import com.samskivert.swing.VGroupLayout; import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.data.PlaceObject; -import com.threerings.micasa.client.*; +import com.threerings.micasa.client.ChatPanel; +import com.threerings.micasa.client.OccupantList; import com.threerings.micasa.util.MiCasaContext; /** diff --git a/src/java/com/threerings/micasa/lobby/LobbyRegistry.java b/src/java/com/threerings/micasa/lobby/LobbyRegistry.java index 9806da9c..4be9835a 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyRegistry.java +++ b/src/java/com/threerings/micasa/lobby/LobbyRegistry.java @@ -29,9 +29,10 @@ import java.util.StringTokenizer; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.samskivert.util.StringUtil; import com.google.inject.Inject; +import com.samskivert.util.StringUtil; + import com.threerings.util.StreamableArrayList; import com.threerings.presents.data.ClientObject; diff --git a/src/java/com/threerings/micasa/lobby/LobbySelector.java b/src/java/com/threerings/micasa/lobby/LobbySelector.java index 8ffc721e..dc0e9dda 100644 --- a/src/java/com/threerings/micasa/lobby/LobbySelector.java +++ b/src/java/com/threerings/micasa/lobby/LobbySelector.java @@ -21,6 +21,10 @@ package com.threerings.micasa.lobby; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import java.awt.BorderLayout; import java.awt.Component; import java.awt.event.ActionEvent; @@ -28,9 +32,6 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; @@ -39,6 +40,7 @@ import javax.swing.JList; import javax.swing.JPanel; import com.threerings.crowd.data.PlaceObject; + import com.threerings.micasa.util.MiCasaContext; import static com.threerings.micasa.Log.log; diff --git a/src/java/com/threerings/micasa/lobby/table/TableItem.java b/src/java/com/threerings/micasa/lobby/table/TableItem.java index 4ffad666..52bda2ad 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableItem.java +++ b/src/java/com/threerings/micasa/lobby/table/TableItem.java @@ -22,10 +22,9 @@ package com.threerings.micasa.lobby.table; import java.awt.Color; -import java.awt.GridBagLayout; import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; import java.awt.Insets; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -38,8 +37,8 @@ import com.threerings.util.Name; import com.threerings.crowd.data.BodyObject; -import com.threerings.parlor.client.TableDirector; import com.threerings.parlor.client.SeatednessObserver; +import com.threerings.parlor.client.TableDirector; import com.threerings.parlor.data.Table; import com.threerings.micasa.util.MiCasaContext; diff --git a/src/java/com/threerings/micasa/lobby/table/TableListView.java b/src/java/com/threerings/micasa/lobby/table/TableListView.java index 8980f36d..ffab8032 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableListView.java +++ b/src/java/com/threerings/micasa/lobby/table/TableListView.java @@ -34,8 +34,8 @@ import com.samskivert.swing.HGroupLayout; import com.samskivert.swing.VGroupLayout; import com.samskivert.swing.util.SwingUtil; -import com.threerings.micasa.lobby.LobbyConfig; -import com.threerings.micasa.util.MiCasaContext; +import com.threerings.crowd.client.PlaceView; +import com.threerings.crowd.data.PlaceObject; import com.threerings.parlor.client.SeatednessObserver; import com.threerings.parlor.client.TableConfigurator; @@ -46,8 +46,8 @@ import com.threerings.parlor.game.client.GameConfigurator; import com.threerings.parlor.game.client.SwingGameConfigurator; import com.threerings.parlor.game.data.GameConfig; -import com.threerings.crowd.client.PlaceView; -import com.threerings.crowd.data.PlaceObject; +import com.threerings.micasa.lobby.LobbyConfig; +import com.threerings.micasa.util.MiCasaContext; import static com.threerings.micasa.Log.log; diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java index f158dea8..723f3f44 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java +++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java @@ -22,6 +22,7 @@ package com.threerings.micasa.lobby.table; import javax.swing.JComponent; + import com.threerings.micasa.lobby.LobbyConfig; import com.threerings.micasa.util.MiCasaContext; diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyManager.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyManager.java index 4fe8c8a8..58a4c49d 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableLobbyManager.java +++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyManager.java @@ -22,7 +22,9 @@ package com.threerings.micasa.lobby.table; import com.threerings.crowd.data.PlaceObject; + import com.threerings.parlor.server.TableManager; + import com.threerings.micasa.lobby.LobbyManager; /** diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java index 2cc3ca69..ffe27058 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java +++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java @@ -21,9 +21,10 @@ package com.threerings.micasa.lobby.table; +import com.threerings.presents.dobj.DSet; + import com.threerings.parlor.data.Table; import com.threerings.parlor.data.TableMarshaller; -import com.threerings.presents.dobj.DSet; import com.threerings.micasa.lobby.LobbyObject; diff --git a/src/java/com/threerings/micasa/server/MiCasaClient.java b/src/java/com/threerings/micasa/server/MiCasaClient.java index 80b439b6..0c64680d 100644 --- a/src/java/com/threerings/micasa/server/MiCasaClient.java +++ b/src/java/com/threerings/micasa/server/MiCasaClient.java @@ -24,6 +24,7 @@ package com.threerings.micasa.server; import com.google.inject.Inject; import com.threerings.presents.net.BootstrapData; + import com.threerings.crowd.server.CrowdClient; import com.threerings.micasa.data.MiCasaBootstrapData; diff --git a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java index 5e1df539..ca97ee5e 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java +++ b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java @@ -21,27 +21,27 @@ package com.threerings.micasa.simulator.client; +import java.io.IOException; + import java.awt.EventQueue; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; - import javax.swing.JPanel; import com.samskivert.util.Config; import com.samskivert.util.RunQueue; + import com.threerings.util.MessageManager; import com.threerings.presents.client.Client; import com.threerings.presents.dobj.DObjectManager; +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; - import com.threerings.parlor.client.ParlorDirector; import com.threerings.parlor.util.ParlorContext; diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java b/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java index 08215d46..e1c9db8f 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java +++ b/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java @@ -26,11 +26,12 @@ import javax.swing.JFrame; import com.google.inject.Guice; import com.google.inject.Injector; -import com.samskivert.swing.Controller; -import com.samskivert.swing.util.SwingUtil; import com.samskivert.util.Interval; import com.samskivert.util.ResultListener; +import com.samskivert.swing.Controller; +import com.samskivert.swing.util.SwingUtil; + import com.threerings.util.Name; import com.threerings.presents.client.Client; diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorController.java b/src/java/com/threerings/micasa/simulator/client/SimulatorController.java index cea41c88..7edba263 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorController.java +++ b/src/java/com/threerings/micasa/simulator/client/SimulatorController.java @@ -22,6 +22,7 @@ package com.threerings.micasa.simulator.client; import java.awt.event.ActionEvent; + import com.samskivert.swing.Controller; import com.threerings.presents.client.Client; diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java index b9a7e715..62b82b8b 100644 --- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java +++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java @@ -21,11 +21,13 @@ package com.threerings.micasa.simulator.data; -import com.threerings.micasa.simulator.client.SimulatorService; -import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.parlor.game.data.GameConfig; + +import com.threerings.micasa.simulator.client.SimulatorService; + /** * Provides the implementation of the {@link SimulatorService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java index b67c3c25..1e1830e4 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java @@ -21,12 +21,14 @@ package com.threerings.micasa.simulator.server; -import com.threerings.micasa.simulator.data.SimulatorMarshaller; -import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.parlor.game.data.GameConfig; + +import com.threerings.micasa.simulator.data.SimulatorMarshaller; + /** * Dispatches requests to the {@link SimulatorProvider}. */ diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java index 30f9e546..e82525e9 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java @@ -26,6 +26,7 @@ import java.util.List; import com.google.inject.Inject; import com.google.inject.Singleton; + import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java b/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java index e881d77c..89ac4d8c 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java @@ -25,6 +25,7 @@ import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; import com.threerings.crowd.data.BodyObject; + import com.threerings.parlor.game.data.GameConfig; import static com.threerings.micasa.Log.log; diff --git a/src/java/com/threerings/micasa/util/MiCasaContext.java b/src/java/com/threerings/micasa/util/MiCasaContext.java index 5a3d1b78..37dd7326 100644 --- a/src/java/com/threerings/micasa/util/MiCasaContext.java +++ b/src/java/com/threerings/micasa/util/MiCasaContext.java @@ -22,7 +22,9 @@ package com.threerings.micasa.util; import com.threerings.util.MessageManager; + import com.threerings.parlor.util.ParlorContext; + import com.threerings.micasa.client.MiCasaFrame; /** diff --git a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java index 42756d24..e78813b1 100644 --- a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java +++ b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java @@ -21,9 +21,10 @@ package com.threerings.parlor.card.client; +import com.threerings.presents.client.InvocationDecoder; + import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.Hand; -import com.threerings.presents.client.InvocationDecoder; /** * Dispatches calls to a {@link CardGameReceiver} instance. diff --git a/src/java/com/threerings/parlor/card/client/CardGameReceiver.java b/src/java/com/threerings/parlor/card/client/CardGameReceiver.java index 7d3887ae..28150a9b 100644 --- a/src/java/com/threerings/parlor/card/client/CardGameReceiver.java +++ b/src/java/com/threerings/parlor/card/client/CardGameReceiver.java @@ -21,11 +21,11 @@ package com.threerings.parlor.card.client; +import com.threerings.presents.client.InvocationReceiver; + import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.Hand; -import com.threerings.presents.client.InvocationReceiver; - /** * Defines, for the card game services, a set of notifications delivered * asynchronously by the server to the client. diff --git a/src/java/com/threerings/parlor/card/client/CardPanel.java b/src/java/com/threerings/parlor/card/client/CardPanel.java index 95d715c6..7a5e7376 100644 --- a/src/java/com/threerings/parlor/card/client/CardPanel.java +++ b/src/java/com/threerings/parlor/card/client/CardPanel.java @@ -21,17 +21,17 @@ package com.threerings.parlor.card.client; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; + import java.awt.Color; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; - import javax.swing.event.MouseInputAdapter; import com.samskivert.util.ObserverList; @@ -46,6 +46,7 @@ import com.threerings.media.sprite.Sprite; import com.threerings.media.util.LinePath; import com.threerings.media.util.Path; import com.threerings.media.util.PathSequence; + import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.CardCodes; import com.threerings.parlor.card.data.Hand; diff --git a/src/java/com/threerings/parlor/card/client/CardSprite.java b/src/java/com/threerings/parlor/card/client/CardSprite.java index 6a69a155..930063b0 100644 --- a/src/java/com/threerings/parlor/card/client/CardSprite.java +++ b/src/java/com/threerings/parlor/card/client/CardSprite.java @@ -25,6 +25,7 @@ import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import com.threerings.media.sprite.FadableImageSprite; + import com.threerings.parlor.card.data.Card; /** diff --git a/src/java/com/threerings/parlor/card/server/CardGameManager.java b/src/java/com/threerings/parlor/card/server/CardGameManager.java index 34434aec..afbaf36b 100644 --- a/src/java/com/threerings/parlor/card/server/CardGameManager.java +++ b/src/java/com/threerings/parlor/card/server/CardGameManager.java @@ -21,6 +21,8 @@ package com.threerings.parlor.card.server; +import com.threerings.presents.data.ClientObject; + import com.threerings.crowd.data.OccupantInfo; import com.threerings.crowd.server.OccupantOp; @@ -33,8 +35,6 @@ import com.threerings.parlor.game.data.GameObject; import com.threerings.parlor.game.server.GameManager; import com.threerings.parlor.turn.server.TurnGameManager; -import com.threerings.presents.data.ClientObject; - /** * A manager class for card games. Handles common functions like dealing * hands of cards to all players. diff --git a/src/java/com/threerings/parlor/card/server/CardGameSender.java b/src/java/com/threerings/parlor/card/server/CardGameSender.java index 7e4c55b5..fee8aba3 100644 --- a/src/java/com/threerings/parlor/card/server/CardGameSender.java +++ b/src/java/com/threerings/parlor/card/server/CardGameSender.java @@ -21,12 +21,13 @@ package com.threerings.parlor.card.server; +import com.threerings.presents.data.ClientObject; +import com.threerings.presents.server.InvocationSender; + import com.threerings.parlor.card.client.CardGameDecoder; import com.threerings.parlor.card.client.CardGameReceiver; import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.Hand; -import com.threerings.presents.data.ClientObject; -import com.threerings.presents.server.InvocationSender; /** * Used to issue notifications to a {@link CardGameReceiver} instance on a diff --git a/src/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java b/src/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java index 817dd6aa..02a01923 100644 --- a/src/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java +++ b/src/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java @@ -21,9 +21,8 @@ package com.threerings.parlor.card.trick.client; -import com.threerings.parlor.turn.client.TurnGameControllerDelegate; - import com.threerings.parlor.card.client.CardGameController; +import com.threerings.parlor.turn.client.TurnGameControllerDelegate; /** * A card game controller delegate for trick-based card games, such as diff --git a/src/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java b/src/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java index 075602e6..c07efd7a 100644 --- a/src/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java +++ b/src/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java @@ -21,11 +21,11 @@ package com.threerings.parlor.card.trick.client; -import com.threerings.parlor.card.data.Card; - import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; +import com.threerings.parlor.card.data.Card; + /** * Service calls related to trick card games. */ diff --git a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java index 04f262ed..7408e1f9 100644 --- a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java +++ b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java @@ -21,11 +21,12 @@ package com.threerings.parlor.card.trick.data; -import com.threerings.parlor.card.data.Card; -import com.threerings.parlor.card.trick.client.TrickCardGameService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.parlor.card.data.Card; +import com.threerings.parlor.card.trick.client.TrickCardGameService; + /** * Provides the implementation of the {@link TrickCardGameService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java index fe9e28b6..cec7b507 100644 --- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java +++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java @@ -21,12 +21,13 @@ package com.threerings.parlor.card.trick.server; -import com.threerings.parlor.card.data.Card; -import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.parlor.card.data.Card; +import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller; + /** * Dispatches requests to the {@link TrickCardGameProvider}. */ diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java index 7f5ea32e..ef8cf3b2 100644 --- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java +++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java @@ -39,8 +39,6 @@ import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; -import com.threerings.parlor.turn.server.TurnGameManagerDelegate; - import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.CardGameObject; import com.threerings.parlor.card.data.Deck; @@ -48,6 +46,7 @@ import com.threerings.parlor.card.data.Hand; import com.threerings.parlor.card.data.PlayerCard; import com.threerings.parlor.card.server.CardGameManager; import com.threerings.parlor.card.trick.data.TrickCardGameObject; +import com.threerings.parlor.turn.server.TurnGameManagerDelegate; import static com.threerings.parlor.card.Log.log; diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java index 4593bbed..5610ce73 100644 --- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java +++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java @@ -21,11 +21,12 @@ package com.threerings.parlor.card.trick.server; -import com.threerings.parlor.card.data.Card; -import com.threerings.parlor.card.trick.client.TrickCardGameService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.parlor.card.data.Card; +import com.threerings.parlor.card.trick.client.TrickCardGameService; + /** * Defines the server-side of the {@link TrickCardGameService}. */ diff --git a/src/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java b/src/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java index 1c079e1c..172768c1 100644 --- a/src/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java +++ b/src/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java @@ -23,7 +23,9 @@ package com.threerings.parlor.client; import javax.swing.JCheckBox; import javax.swing.JLabel; + import com.samskivert.swing.SimpleSlider; + import com.threerings.parlor.game.client.SwingGameConfigurator; /** diff --git a/src/java/com/threerings/parlor/client/ParlorDecoder.java b/src/java/com/threerings/parlor/client/ParlorDecoder.java index 5d7ce58e..376f310b 100644 --- a/src/java/com/threerings/parlor/client/ParlorDecoder.java +++ b/src/java/com/threerings/parlor/client/ParlorDecoder.java @@ -21,10 +21,12 @@ package com.threerings.parlor.client; -import com.threerings.parlor.game.data.GameConfig; -import com.threerings.presents.client.InvocationDecoder; import com.threerings.util.Name; +import com.threerings.presents.client.InvocationDecoder; + +import com.threerings.parlor.game.data.GameConfig; + /** * Dispatches calls to a {@link ParlorReceiver} instance. */ diff --git a/src/java/com/threerings/parlor/client/ParlorDirector.java b/src/java/com/threerings/parlor/client/ParlorDirector.java index 1bb9eefb..88790b09 100644 --- a/src/java/com/threerings/parlor/client/ParlorDirector.java +++ b/src/java/com/threerings/parlor/client/ParlorDirector.java @@ -26,6 +26,7 @@ import java.util.List; import com.google.common.collect.Lists; import com.samskivert.util.HashIntMap; + import com.threerings.util.Name; import com.threerings.presents.client.BasicDirector; diff --git a/src/java/com/threerings/parlor/client/TableConfigurator.java b/src/java/com/threerings/parlor/client/TableConfigurator.java index f8264885..21da3d5d 100644 --- a/src/java/com/threerings/parlor/client/TableConfigurator.java +++ b/src/java/com/threerings/parlor/client/TableConfigurator.java @@ -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/java/com/threerings/parlor/client/TableDirector.java b/src/java/com/threerings/parlor/client/TableDirector.java index 09d0f0e0..bbd0ca79 100644 --- a/src/java/com/threerings/parlor/client/TableDirector.java +++ b/src/java/com/threerings/parlor/client/TableDirector.java @@ -23,11 +23,11 @@ package com.threerings.parlor.client; import com.samskivert.util.ObjectUtil; import com.samskivert.util.ObserverList; + import com.threerings.util.Name; import com.threerings.presents.client.BasicDirector; import com.threerings.presents.client.Client; - import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.EntryAddedEvent; import com.threerings.presents.dobj.EntryRemovedEvent; diff --git a/src/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/java/com/threerings/parlor/data/ParlorMarshaller.java index 22f7e702..fc8917b5 100644 --- a/src/java/com/threerings/parlor/data/ParlorMarshaller.java +++ b/src/java/com/threerings/parlor/data/ParlorMarshaller.java @@ -21,13 +21,15 @@ package com.threerings.parlor.data; -import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.game.data.GameConfig; +import com.threerings.util.Name; + import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; -import com.threerings.util.Name; + +import com.threerings.parlor.client.ParlorService; +import com.threerings.parlor.game.data.GameConfig; /** * Provides the implementation of the {@link ParlorService} interface diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java index d4abfd0c..fd9a3d5c 100644 --- a/src/java/com/threerings/parlor/data/Table.java +++ b/src/java/com/threerings/parlor/data/Table.java @@ -21,8 +21,8 @@ package com.threerings.parlor.data; -import java.util.List; import java.util.HashSet; +import java.util.List; import com.google.common.collect.Lists; @@ -38,7 +38,6 @@ import com.threerings.presents.dobj.DSet; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.OccupantInfo; -import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.game.data.GameObject; diff --git a/src/java/com/threerings/parlor/data/TableMarshaller.java b/src/java/com/threerings/parlor/data/TableMarshaller.java index 14481182..65e1ec8a 100644 --- a/src/java/com/threerings/parlor/data/TableMarshaller.java +++ b/src/java/com/threerings/parlor/data/TableMarshaller.java @@ -21,12 +21,14 @@ package com.threerings.parlor.data; -import com.threerings.parlor.client.TableService; -import com.threerings.parlor.game.data.GameConfig; +import com.threerings.util.Name; + import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.util.Name; + +import com.threerings.parlor.client.TableService; +import com.threerings.parlor.game.data.GameConfig; /** * Provides the implementation of the {@link TableService} interface diff --git a/src/java/com/threerings/parlor/game/client/GameConfigurator.java b/src/java/com/threerings/parlor/game/client/GameConfigurator.java index 2892431f..7914fec1 100644 --- a/src/java/com/threerings/parlor/game/client/GameConfigurator.java +++ b/src/java/com/threerings/parlor/game/client/GameConfigurator.java @@ -21,11 +21,11 @@ package com.threerings.parlor.game.client; -import static com.threerings.parlor.Log.log; - import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.util.ParlorContext; +import static com.threerings.parlor.Log.log; + /** * Provides the base from which interfaces can be built to configure games prior to starting * them. Derived classes would extend the base configurator adding interface elements and wiring diff --git a/src/java/com/threerings/parlor/game/data/GameConfig.java b/src/java/com/threerings/parlor/game/data/GameConfig.java index a6779dfb..9d089519 100644 --- a/src/java/com/threerings/parlor/game/data/GameConfig.java +++ b/src/java/com/threerings/parlor/game/data/GameConfig.java @@ -24,9 +24,10 @@ package com.threerings.parlor.game.data; import java.util.ArrayList; import java.util.List; -import com.threerings.crowd.data.PlaceConfig; import com.threerings.util.Name; +import com.threerings.crowd.data.PlaceConfig; + import com.threerings.parlor.client.TableConfigurator; import com.threerings.parlor.game.client.GameConfigurator; diff --git a/src/java/com/threerings/parlor/game/data/GameObject.java b/src/java/com/threerings/parlor/game/data/GameObject.java index cd563012..077582d5 100644 --- a/src/java/com/threerings/parlor/game/data/GameObject.java +++ b/src/java/com/threerings/parlor/game/data/GameObject.java @@ -22,6 +22,7 @@ package com.threerings.parlor.game.data; import com.samskivert.util.StringUtil; + import com.threerings.util.Name; import com.threerings.crowd.data.PlaceObject; diff --git a/src/java/com/threerings/parlor/game/server/GameManager.java b/src/java/com/threerings/parlor/game/server/GameManager.java index a4ab07c1..59b7c7f1 100644 --- a/src/java/com/threerings/parlor/game/server/GameManager.java +++ b/src/java/com/threerings/parlor/game/server/GameManager.java @@ -21,8 +21,9 @@ package com.threerings.parlor.game.server; -import java.util.List; import java.util.Arrays; +import java.util.List; + import com.google.common.collect.Lists; import com.samskivert.util.ArrayIntSet; @@ -31,14 +32,16 @@ import com.samskivert.util.Interval; import com.samskivert.util.RepeatCallTracker; import com.samskivert.util.StringUtil; import com.samskivert.util.Tuple; + +import com.threerings.util.MessageBundle; import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.DObject; -import com.threerings.crowd.chat.server.SpeakUtil; +import com.threerings.crowd.chat.server.SpeakUtil; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.server.PlaceManager; import com.threerings.crowd.server.PlaceManagerDelegate; @@ -51,8 +54,6 @@ import com.threerings.parlor.game.data.GameObject; import com.threerings.parlor.server.ParlorSender; import com.threerings.parlor.server.PlayManager; -import com.threerings.util.MessageBundle; - import static com.threerings.parlor.Log.log; /** diff --git a/src/java/com/threerings/parlor/rating/server/RatingDelegate.java b/src/java/com/threerings/parlor/rating/server/RatingDelegate.java index ed6ea439..e6c441d7 100644 --- a/src/java/com/threerings/parlor/rating/server/RatingDelegate.java +++ b/src/java/com/threerings/parlor/rating/server/RatingDelegate.java @@ -21,8 +21,6 @@ package com.threerings.parlor.rating.server; -import static com.threerings.parlor.Log.log; - import java.util.Collection; import java.util.Collections; import java.util.List; @@ -30,15 +28,14 @@ import java.util.List; import com.google.common.collect.Lists; import com.google.inject.Inject; -import com.samskivert.jdbc.RepositoryUnit; - import com.samskivert.util.IntMap; import com.samskivert.util.IntMaps; import com.samskivert.util.Invoker; import com.samskivert.util.StringUtil; +import com.samskivert.jdbc.RepositoryUnit; + import com.threerings.util.Name; -import com.threerings.media.util.MathUtil; import com.threerings.presents.annotation.MainInvoker; @@ -46,14 +43,17 @@ import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; +import com.threerings.media.util.MathUtil; + import com.threerings.parlor.game.data.GameObject; import com.threerings.parlor.game.server.GameManager; import com.threerings.parlor.game.server.GameManagerDelegate; - import com.threerings.parlor.rating.data.RatingCodes; import com.threerings.parlor.rating.server.persist.RatingRecord; import com.threerings.parlor.rating.server.persist.RatingRepository; +import static com.threerings.parlor.Log.log; + /** * Rates players after each game and handles persisting the results. */ diff --git a/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java b/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java index 702de465..432fb1d8 100644 --- a/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java +++ b/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java @@ -26,6 +26,7 @@ import com.samskivert.jdbc.depot.PersistentRecord; import com.samskivert.jdbc.depot.annotation.Column; import com.samskivert.jdbc.depot.annotation.Id; import com.samskivert.jdbc.depot.expression.ColumnExp; + import com.threerings.parlor.rating.util.Percentiler; /** diff --git a/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java b/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java index 2f8955dd..9f569ae8 100644 --- a/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java +++ b/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java @@ -23,6 +23,8 @@ package com.threerings.parlor.rating.server.persist; import java.sql.Timestamp; +import com.samskivert.util.StringUtil; + import com.samskivert.jdbc.depot.Key; import com.samskivert.jdbc.depot.PersistentRecord; import com.samskivert.jdbc.depot.annotation.Column; @@ -31,8 +33,6 @@ import com.samskivert.jdbc.depot.annotation.Id; import com.samskivert.jdbc.depot.annotation.Index; import com.samskivert.jdbc.depot.expression.ColumnExp; -import com.samskivert.util.StringUtil; - @Entity(indices={ @Index(name="ixPlayerId", fields={ RatingRecord.PLAYER_ID }) }) diff --git a/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java b/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java index 12f51572..07dbdaf4 100644 --- a/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java +++ b/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java @@ -42,7 +42,9 @@ import com.samskivert.jdbc.depot.clause.OrderBy; import com.samskivert.jdbc.depot.clause.QueryClause; import com.samskivert.jdbc.depot.clause.Where; import com.samskivert.jdbc.depot.expression.SQLExpression; -import com.samskivert.jdbc.depot.operator.Conditionals.*; +import com.samskivert.jdbc.depot.operator.Conditionals.Equals; +import com.samskivert.jdbc.depot.operator.Conditionals.GreaterThan; +import com.samskivert.jdbc.depot.operator.Conditionals.In; import com.samskivert.jdbc.depot.operator.Logic.And; import com.threerings.parlor.rating.util.Percentiler; diff --git a/src/java/com/threerings/parlor/rating/util/Percentiler.java b/src/java/com/threerings/parlor/rating/util/Percentiler.java index 8dc30389..87e6a8a9 100644 --- a/src/java/com/threerings/parlor/rating/util/Percentiler.java +++ b/src/java/com/threerings/parlor/rating/util/Percentiler.java @@ -22,6 +22,7 @@ package com.threerings.parlor.rating.util; import java.io.PrintStream; + import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.nio.LongBuffer; diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java index dcbadd3d..ab79cfdb 100644 --- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java +++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java @@ -21,14 +21,16 @@ package com.threerings.parlor.server; -import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.data.ParlorMarshaller; -import com.threerings.parlor.game.data.GameConfig; +import com.threerings.util.Name; + import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; -import com.threerings.util.Name; + +import com.threerings.parlor.client.ParlorService; +import com.threerings.parlor.data.ParlorMarshaller; +import com.threerings.parlor.game.data.GameConfig; /** * Dispatches requests to the {@link ParlorProvider}. diff --git a/src/java/com/threerings/parlor/server/ParlorManager.java b/src/java/com/threerings/parlor/server/ParlorManager.java index d44195dc..6c990cd2 100644 --- a/src/java/com/threerings/parlor/server/ParlorManager.java +++ b/src/java/com/threerings/parlor/server/ParlorManager.java @@ -25,6 +25,7 @@ import com.google.inject.Inject; import com.samskivert.util.IntMap; import com.samskivert.util.IntMaps; + import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java index 972a27dd..6b0deeb8 100644 --- a/src/java/com/threerings/parlor/server/ParlorProvider.java +++ b/src/java/com/threerings/parlor/server/ParlorProvider.java @@ -21,13 +21,15 @@ package com.threerings.parlor.server; -import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.game.data.GameConfig; +import com.threerings.util.Name; + import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; -import com.threerings.util.Name; + +import com.threerings.parlor.client.ParlorService; +import com.threerings.parlor.game.data.GameConfig; /** * Defines the server-side of the {@link ParlorService}. diff --git a/src/java/com/threerings/parlor/server/ParlorSender.java b/src/java/com/threerings/parlor/server/ParlorSender.java index 013f3010..21f08414 100644 --- a/src/java/com/threerings/parlor/server/ParlorSender.java +++ b/src/java/com/threerings/parlor/server/ParlorSender.java @@ -21,12 +21,14 @@ package com.threerings.parlor.server; +import com.threerings.util.Name; + +import com.threerings.presents.data.ClientObject; +import com.threerings.presents.server.InvocationSender; + import com.threerings.parlor.client.ParlorDecoder; import com.threerings.parlor.client.ParlorReceiver; import com.threerings.parlor.game.data.GameConfig; -import com.threerings.presents.data.ClientObject; -import com.threerings.presents.server.InvocationSender; -import com.threerings.util.Name; /** * Used to issue notifications to a {@link ParlorReceiver} instance on a diff --git a/src/java/com/threerings/parlor/server/PlayManager.java b/src/java/com/threerings/parlor/server/PlayManager.java index 8963b86c..15784726 100644 --- a/src/java/com/threerings/parlor/server/PlayManager.java +++ b/src/java/com/threerings/parlor/server/PlayManager.java @@ -21,10 +21,10 @@ package com.threerings.parlor.server; -import com.threerings.crowd.data.BodyObject; - import com.threerings.presents.data.ClientObject; +import com.threerings.crowd.data.BodyObject; + /** * An interface to be implemented by a {@code PlaceManager} that wishes to host * places that have players. This generalizes the idea of a game further than what diff --git a/src/java/com/threerings/parlor/server/TableDispatcher.java b/src/java/com/threerings/parlor/server/TableDispatcher.java index 61edf7b4..81a5f14c 100644 --- a/src/java/com/threerings/parlor/server/TableDispatcher.java +++ b/src/java/com/threerings/parlor/server/TableDispatcher.java @@ -21,14 +21,16 @@ package com.threerings.parlor.server; -import com.threerings.parlor.data.TableConfig; -import com.threerings.parlor.data.TableMarshaller; -import com.threerings.parlor.game.data.GameConfig; +import com.threerings.util.Name; + import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; -import com.threerings.util.Name; + +import com.threerings.parlor.data.TableConfig; +import com.threerings.parlor.data.TableMarshaller; +import com.threerings.parlor.game.data.GameConfig; /** * Dispatches requests to the {@link TableProvider}. diff --git a/src/java/com/threerings/parlor/server/TableManager.java b/src/java/com/threerings/parlor/server/TableManager.java index 74609230..557dc60f 100644 --- a/src/java/com/threerings/parlor/server/TableManager.java +++ b/src/java/com/threerings/parlor/server/TableManager.java @@ -24,6 +24,7 @@ package com.threerings.parlor.server; import com.samskivert.util.IntMap; import com.samskivert.util.IntMaps; import com.samskivert.util.ListUtil; + import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; @@ -43,8 +44,8 @@ import com.threerings.presents.server.InvocationManager; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.OccupantInfo; -import com.threerings.crowd.server.PlaceRegistry; import com.threerings.crowd.data.PlaceObject; +import com.threerings.crowd.server.PlaceRegistry; import com.threerings.parlor.client.TableService; import com.threerings.parlor.data.ParlorCodes; diff --git a/src/java/com/threerings/parlor/server/TableProvider.java b/src/java/com/threerings/parlor/server/TableProvider.java index 0fe495e5..00f095b8 100644 --- a/src/java/com/threerings/parlor/server/TableProvider.java +++ b/src/java/com/threerings/parlor/server/TableProvider.java @@ -21,14 +21,16 @@ package com.threerings.parlor.server; -import com.threerings.parlor.client.TableService; -import com.threerings.parlor.data.TableConfig; -import com.threerings.parlor.game.data.GameConfig; +import com.threerings.util.Name; + import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; -import com.threerings.util.Name; + +import com.threerings.parlor.client.TableService; +import com.threerings.parlor.data.TableConfig; +import com.threerings.parlor.game.data.GameConfig; /** * Defines the server-side of the {@link TableService}. diff --git a/src/java/com/threerings/parlor/tourney/client/TourniesService.java b/src/java/com/threerings/parlor/tourney/client/TourniesService.java index 1e3c7aa5..af0030e9 100644 --- a/src/java/com/threerings/parlor/tourney/client/TourniesService.java +++ b/src/java/com/threerings/parlor/tourney/client/TourniesService.java @@ -21,11 +21,11 @@ package com.threerings.parlor.tourney.client; -import com.threerings.parlor.tourney.data.TourneyConfig; - import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; +import com.threerings.parlor.tourney.data.TourneyConfig; + /** * Provices services for creating/modifying tournies. */ diff --git a/src/java/com/threerings/parlor/tourney/data/EntryFee.java b/src/java/com/threerings/parlor/tourney/data/EntryFee.java index 3ae0dea7..60c7d7c0 100644 --- a/src/java/com/threerings/parlor/tourney/data/EntryFee.java +++ b/src/java/com/threerings/parlor/tourney/data/EntryFee.java @@ -23,10 +23,10 @@ package com.threerings.parlor.tourney.data; import com.samskivert.util.ResultListener; -import com.threerings.crowd.data.BodyObject; - import com.threerings.io.SimpleStreamableObject; +import com.threerings.crowd.data.BodyObject; + /** * Extensible entry fee class that specifies entry requirements for a tourney. */ diff --git a/src/java/com/threerings/parlor/tourney/data/Participant.java b/src/java/com/threerings/parlor/tourney/data/Participant.java index f0002391..15100963 100644 --- a/src/java/com/threerings/parlor/tourney/data/Participant.java +++ b/src/java/com/threerings/parlor/tourney/data/Participant.java @@ -21,10 +21,10 @@ package com.threerings.parlor.tourney.data; -import java.lang.Comparable; +import com.threerings.io.SimpleStreamableObject; import com.threerings.util.Name; -import com.threerings.io.SimpleStreamableObject; + import com.threerings.presents.dobj.DSet; /** diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyConfig.java b/src/java/com/threerings/parlor/tourney/data/TourneyConfig.java index 099b5b26..313de99d 100644 --- a/src/java/com/threerings/parlor/tourney/data/TourneyConfig.java +++ b/src/java/com/threerings/parlor/tourney/data/TourneyConfig.java @@ -22,6 +22,7 @@ package com.threerings.parlor.tourney.data; import com.threerings.io.SimpleStreamableObject; + import com.threerings.util.Name; /** diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java index b4148272..0c2fa46e 100644 --- a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java +++ b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java @@ -21,11 +21,12 @@ package com.threerings.parlor.tourney.data; -import com.threerings.parlor.tourney.client.TourneyService; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.parlor.tourney.client.TourneyService; + /** * Provides the implementation of the {@link TourneyService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java index d5f7a942..9098aac8 100644 --- a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java +++ b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java @@ -21,11 +21,12 @@ package com.threerings.parlor.tourney.data; -import com.threerings.parlor.tourney.client.TourniesService; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.parlor.tourney.client.TourniesService; + /** * Provides the implementation of the {@link TourniesService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java index 67d8a9de..d23e92eb 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java +++ b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java @@ -21,12 +21,13 @@ package com.threerings.parlor.tourney.server; -import com.threerings.parlor.tourney.data.TourneyMarshaller; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.parlor.tourney.data.TourneyMarshaller; + /** * Dispatches requests to the {@link TourneyProvider}. */ diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyManager.java b/src/java/com/threerings/parlor/tourney/server/TourneyManager.java index 294f5997..0c9fed60 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourneyManager.java +++ b/src/java/com/threerings/parlor/tourney/server/TourneyManager.java @@ -22,23 +22,24 @@ package com.threerings.parlor.tourney.server; import com.google.inject.Inject; + import com.samskivert.util.Interval; import com.samskivert.util.ResultListener; -import com.threerings.crowd.data.BodyObject; -import com.threerings.crowd.server.BodyLocator; - -import com.threerings.parlor.tourney.data.Participant; -import com.threerings.parlor.tourney.data.TourneyConfig; -import com.threerings.parlor.tourney.data.TourneyCodes; -import com.threerings.parlor.tourney.data.TourneyObject; - import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.RootDObjectManager; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationManager; +import com.threerings.crowd.data.BodyObject; +import com.threerings.crowd.server.BodyLocator; + +import com.threerings.parlor.tourney.data.Participant; +import com.threerings.parlor.tourney.data.TourneyCodes; +import com.threerings.parlor.tourney.data.TourneyConfig; +import com.threerings.parlor.tourney.data.TourneyObject; + /** * Controls a running tourney. */ diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java index cfbb2cb8..dc5225fa 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java +++ b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java @@ -21,12 +21,13 @@ package com.threerings.parlor.tourney.server; -import com.threerings.parlor.tourney.client.TourneyService; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; +import com.threerings.parlor.tourney.client.TourneyService; + /** * Defines the server-side of the {@link TourneyService}. */ diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java index 62812f32..3459e5eb 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java +++ b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java @@ -21,13 +21,14 @@ package com.threerings.parlor.tourney.server; -import com.threerings.parlor.tourney.data.TourneyConfig; -import com.threerings.parlor.tourney.data.TourniesMarshaller; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.parlor.tourney.data.TourneyConfig; +import com.threerings.parlor.tourney.data.TourniesMarshaller; + /** * Dispatches requests to the {@link TourniesProvider}. */ diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesManager.java b/src/java/com/threerings/parlor/tourney/server/TourniesManager.java index 579ace87..e295c1ad 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesManager.java +++ b/src/java/com/threerings/parlor/tourney/server/TourniesManager.java @@ -31,6 +31,7 @@ import com.google.inject.Singleton; import com.samskivert.io.PersistenceException; import com.samskivert.util.Interval; + import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.RootDObjectManager; diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java index e6f9e006..5e1c4ff6 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java +++ b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java @@ -21,13 +21,14 @@ package com.threerings.parlor.tourney.server; -import com.threerings.parlor.tourney.client.TourniesService; -import com.threerings.parlor.tourney.data.TourneyConfig; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; +import com.threerings.parlor.tourney.client.TourniesService; +import com.threerings.parlor.tourney.data.TourneyConfig; + /** * Defines the server-side of the {@link TourniesService}. */ diff --git a/src/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java b/src/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java index c5fd2d89..e2cba78f 100644 --- a/src/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java +++ b/src/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java @@ -21,15 +21,15 @@ package com.threerings.parlor.tourney.server.persist; +import java.sql.Connection; +import java.sql.SQLException; + import java.util.ArrayList; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.sql.Connection; -import java.sql.SQLException; - import com.google.inject.Inject; import com.google.inject.Singleton; @@ -39,7 +39,6 @@ import com.samskivert.jdbc.ConnectionProvider; import com.samskivert.jdbc.DatabaseLiaison; import com.samskivert.jdbc.JDBCUtil; import com.samskivert.jdbc.JORARepository; - import com.samskivert.jdbc.jora.Table; import com.threerings.io.ObjectInputStream; diff --git a/src/java/com/threerings/parlor/turn/client/TurnDisplay.java b/src/java/com/threerings/parlor/turn/client/TurnDisplay.java index fdf749a5..b86bd629 100644 --- a/src/java/com/threerings/parlor/turn/client/TurnDisplay.java +++ b/src/java/com/threerings/parlor/turn/client/TurnDisplay.java @@ -21,31 +21,31 @@ package com.threerings.parlor.turn.client; +import java.util.HashMap; + import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; -import java.util.HashMap; - +import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.Icon; import com.samskivert.swing.util.SwingUtil; import com.threerings.util.Name; +import com.threerings.presents.dobj.AttributeChangeListener; +import com.threerings.presents.dobj.AttributeChangedEvent; +import com.threerings.presents.dobj.ElementUpdateListener; +import com.threerings.presents.dobj.ElementUpdatedEvent; + import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.data.PlaceObject; import com.threerings.parlor.game.data.GameObject; import com.threerings.parlor.turn.data.TurnGameObject; -import com.threerings.presents.dobj.AttributeChangeListener; -import com.threerings.presents.dobj.AttributeChangedEvent; -import com.threerings.presents.dobj.ElementUpdateListener; -import com.threerings.presents.dobj.ElementUpdatedEvent; - /** * Automatically display a list of players and turn change information * in a turn-based game. diff --git a/src/java/com/threerings/parlor/turn/client/TurnGameController.java b/src/java/com/threerings/parlor/turn/client/TurnGameController.java index 3d2f2a7b..5ba4af7d 100644 --- a/src/java/com/threerings/parlor/turn/client/TurnGameController.java +++ b/src/java/com/threerings/parlor/turn/client/TurnGameController.java @@ -21,9 +21,10 @@ package com.threerings.parlor.turn.client; -import com.threerings.crowd.client.PlaceController; import com.threerings.util.Name; +import com.threerings.crowd.client.PlaceController; + /** * Games that wish to make use of the turn game services should have their * controller implement this interface and create an instance of {@link diff --git a/src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java b/src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java index 9400b982..a352f92c 100644 --- a/src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java +++ b/src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java @@ -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/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java b/src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java index d676f600..2af2bc06 100644 --- a/src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java +++ b/src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java @@ -21,16 +21,19 @@ package com.threerings.parlor.turn.server; -import static com.threerings.parlor.Log.log; - import com.samskivert.util.RandomUtil; + +import com.threerings.util.Name; + import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.PlaceManager; + import com.threerings.parlor.game.server.GameManager; import com.threerings.parlor.game.server.GameManagerDelegate; import com.threerings.parlor.turn.data.TurnGameObject; -import com.threerings.util.Name; + +import static com.threerings.parlor.Log.log; /** * Performs the server-side turn-based game processing for a turn based game. Game managers which diff --git a/src/java/com/threerings/parlor/util/ParlorContext.java b/src/java/com/threerings/parlor/util/ParlorContext.java index 6d3168cd..1a880a40 100644 --- a/src/java/com/threerings/parlor/util/ParlorContext.java +++ b/src/java/com/threerings/parlor/util/ParlorContext.java @@ -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/java/com/threerings/parlor/util/RobotPlayer.java b/src/java/com/threerings/parlor/util/RobotPlayer.java index 49c61a60..27312613 100644 --- a/src/java/com/threerings/parlor/util/RobotPlayer.java +++ b/src/java/com/threerings/parlor/util/RobotPlayer.java @@ -21,15 +21,17 @@ package com.threerings.parlor.util; -import java.awt.Component; import java.util.ArrayList; import java.util.List; -import com.samskivert.swing.Controller; +import java.awt.Component; + import com.samskivert.util.CollectionUtil; import com.samskivert.util.Interval; import com.samskivert.util.RandomUtil; +import com.samskivert.swing.Controller; + import com.threerings.util.KeyTranslator; /** diff --git a/src/java/com/threerings/puzzle/client/PuzzleBoardView.java b/src/java/com/threerings/puzzle/client/PuzzleBoardView.java index e062f84d..ca80a92f 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleBoardView.java +++ b/src/java/com/threerings/puzzle/client/PuzzleBoardView.java @@ -21,17 +21,19 @@ package com.threerings.puzzle.client; +import java.util.ArrayList; +import java.util.List; + import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics2D; import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; + +import com.samskivert.util.StringUtil; import com.samskivert.swing.Label; -import com.samskivert.util.StringUtil; import com.threerings.media.VirtualMediaPanel; import com.threerings.media.animation.Animation; diff --git a/src/java/com/threerings/puzzle/client/PuzzleController.java b/src/java/com/threerings/puzzle/client/PuzzleController.java index 61bde1bf..e484dbb6 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleController.java +++ b/src/java/com/threerings/puzzle/client/PuzzleController.java @@ -21,22 +21,22 @@ package com.threerings.puzzle.client; +import java.util.List; + import java.awt.Component; import java.awt.event.ActionEvent; +import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import java.awt.event.KeyAdapter; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.List; - import com.google.common.collect.Lists; -import com.samskivert.swing.util.MouseHijacker; import com.samskivert.util.CollectionUtil; import com.samskivert.util.ObserverList; -import com.threerings.media.FrameParticipant; + +import com.samskivert.swing.util.MouseHijacker; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; @@ -46,6 +46,8 @@ import com.threerings.presents.dobj.ElementUpdatedEvent; import com.threerings.crowd.client.PlaceControllerDelegate; import com.threerings.crowd.data.PlaceObject; +import com.threerings.media.FrameParticipant; + import com.threerings.parlor.game.client.GameController; import com.threerings.parlor.game.data.GameObject; diff --git a/src/java/com/threerings/puzzle/client/PuzzlePanel.java b/src/java/com/threerings/puzzle/client/PuzzlePanel.java index 9c69a953..28c2c44e 100644 --- a/src/java/com/threerings/puzzle/client/PuzzlePanel.java +++ b/src/java/com/threerings/puzzle/client/PuzzlePanel.java @@ -22,6 +22,7 @@ package com.threerings.puzzle.client; import java.awt.BorderLayout; + import javax.swing.JPanel; import com.samskivert.swing.Controller; diff --git a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java index 5e6bb84f..503ab489 100644 --- a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java +++ b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java @@ -23,6 +23,7 @@ package com.threerings.puzzle.data; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; + import com.threerings.puzzle.client.PuzzleGameService; /** diff --git a/src/java/com/threerings/puzzle/drop/client/DropBoardView.java b/src/java/com/threerings/puzzle/drop/client/DropBoardView.java index 91887aff..748706f2 100644 --- a/src/java/com/threerings/puzzle/drop/client/DropBoardView.java +++ b/src/java/com/threerings/puzzle/drop/client/DropBoardView.java @@ -21,6 +21,8 @@ package com.threerings.puzzle.drop.client; +import java.util.Iterator; + import java.awt.Color; import java.awt.Dimension; import java.awt.Font; @@ -28,8 +30,6 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; -import java.util.Iterator; - import com.threerings.media.image.Mirage; import com.threerings.media.sprite.ImageSprite; import com.threerings.media.sprite.PathAdapter; @@ -42,11 +42,10 @@ import com.threerings.parlor.media.ScoreAnimation; import com.threerings.puzzle.client.PuzzleBoardView; import com.threerings.puzzle.data.Board; -import com.threerings.puzzle.util.PuzzleContext; - import com.threerings.puzzle.drop.data.DropBoard; import com.threerings.puzzle.drop.data.DropConfig; import com.threerings.puzzle.drop.data.DropPieceCodes; +import com.threerings.puzzle.util.PuzzleContext; import static com.threerings.puzzle.Log.log; diff --git a/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java b/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java index e67eb854..346a0049 100644 --- a/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java +++ b/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java @@ -21,20 +21,21 @@ package com.threerings.puzzle.drop.client; -import static com.threerings.puzzle.Log.log; - import java.awt.Component; import java.awt.Point; import java.awt.Rectangle; import java.awt.event.ActionEvent; import com.samskivert.util.IntListUtil; + import com.threerings.crowd.client.PlaceController; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.util.CrowdContext; + import com.threerings.media.FrameParticipant; import com.threerings.media.animation.Animation; import com.threerings.media.animation.AnimationAdapter; + import com.threerings.puzzle.client.PuzzleController; import com.threerings.puzzle.client.PuzzleControllerDelegate; import com.threerings.puzzle.client.PuzzlePanel; @@ -49,6 +50,8 @@ import com.threerings.puzzle.drop.util.PieceDropLogic; import com.threerings.puzzle.drop.util.PieceDropper; import com.threerings.puzzle.util.PuzzleContext; +import static com.threerings.puzzle.Log.log; + /** * Games that wish to make use of the drop puzzle services will need to * create an extension of this delegate class, customizing it for their diff --git a/src/java/com/threerings/puzzle/drop/client/DropSprite.java b/src/java/com/threerings/puzzle/drop/client/DropSprite.java index 2fcee72c..9def6088 100644 --- a/src/java/com/threerings/puzzle/drop/client/DropSprite.java +++ b/src/java/com/threerings/puzzle/drop/client/DropSprite.java @@ -27,6 +27,7 @@ import java.awt.Point; import java.awt.Shape; import com.samskivert.util.ObserverList; + import com.threerings.util.DirectionUtil; import com.threerings.media.image.Mirage; diff --git a/src/java/com/threerings/puzzle/drop/client/NextBlockView.java b/src/java/com/threerings/puzzle/drop/client/NextBlockView.java index 5e16daca..5a8d9161 100644 --- a/src/java/com/threerings/puzzle/drop/client/NextBlockView.java +++ b/src/java/com/threerings/puzzle/drop/client/NextBlockView.java @@ -27,9 +27,10 @@ import java.awt.Graphics2D; import javax.swing.JComponent; -import com.threerings.media.image.Mirage; import com.threerings.util.DirectionCodes; +import com.threerings.media.image.Mirage; + /** * The next block view displays an image representing the next drop block * to appear in the game. diff --git a/src/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java b/src/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java index 50d04e48..049ec4cd 100644 --- a/src/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java +++ b/src/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java @@ -30,6 +30,7 @@ import com.threerings.media.animation.Animation; import com.threerings.media.sprite.PathObserver; import com.threerings.media.sprite.Sprite; import com.threerings.media.util.Path; + import com.threerings.puzzle.drop.data.DropBoard; /** diff --git a/src/java/com/threerings/puzzle/drop/data/DropBoard.java b/src/java/com/threerings/puzzle/drop/data/DropBoard.java index 473115e4..6941a689 100644 --- a/src/java/com/threerings/puzzle/drop/data/DropBoard.java +++ b/src/java/com/threerings/puzzle/drop/data/DropBoard.java @@ -21,9 +21,10 @@ package com.threerings.puzzle.drop.data; +import java.util.Arrays; + import java.awt.Point; import java.awt.Rectangle; -import java.util.Arrays; import org.apache.commons.lang.StringUtils; diff --git a/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java b/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java index c2f8a873..4ec0206b 100644 --- a/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java +++ b/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java @@ -22,6 +22,7 @@ package com.threerings.puzzle.drop.data; import com.samskivert.util.StringUtil; + import com.threerings.util.DirectionCodes; /** diff --git a/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java b/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java index f56bb7ea..d4a5c21e 100644 --- a/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java +++ b/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java @@ -21,11 +21,10 @@ package com.threerings.puzzle.drop.server; -import static com.threerings.puzzle.Log.log; - import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.PlaceManager; + import com.threerings.puzzle.data.Board; import com.threerings.puzzle.data.PuzzleCodes; import com.threerings.puzzle.drop.data.DropBoard; @@ -37,6 +36,8 @@ import com.threerings.puzzle.drop.util.PieceDropper; import com.threerings.puzzle.server.PuzzleManager; import com.threerings.puzzle.server.PuzzleManagerDelegate; +import static com.threerings.puzzle.Log.log; + /** * Provides the necessary support for a puzzle game that involves a * two-dimensional board containing pieces, with new pieces either falling diff --git a/src/java/com/threerings/puzzle/drop/util/PieceDestroyer.java b/src/java/com/threerings/puzzle/drop/util/PieceDestroyer.java index dc2d4d70..e6876e74 100644 --- a/src/java/com/threerings/puzzle/drop/util/PieceDestroyer.java +++ b/src/java/com/threerings/puzzle/drop/util/PieceDestroyer.java @@ -26,9 +26,9 @@ import java.util.List; import com.google.common.collect.Lists; import com.threerings.puzzle.drop.data.DropBoard; -import com.threerings.puzzle.drop.data.DropBoard.PieceOperation; import com.threerings.puzzle.drop.data.DropPieceCodes; import com.threerings.puzzle.drop.data.SegmentInfo; +import com.threerings.puzzle.drop.data.DropBoard.PieceOperation; /** * Handles destroying contiguous piece segments in a drop board. diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java index 80428afe..7255223d 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java +++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java @@ -24,6 +24,7 @@ package com.threerings.puzzle.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; + import com.threerings.puzzle.data.Board; import com.threerings.puzzle.data.PuzzleGameMarshaller; diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java index 76eaca88..11d0cdbc 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java +++ b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java @@ -23,6 +23,7 @@ package com.threerings.puzzle.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; + import com.threerings.puzzle.client.PuzzleGameService; import com.threerings.puzzle.data.Board; diff --git a/src/java/com/threerings/puzzle/server/PuzzleManager.java b/src/java/com/threerings/puzzle/server/PuzzleManager.java index db5337e7..1e3f560b 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleManager.java +++ b/src/java/com/threerings/puzzle/server/PuzzleManager.java @@ -28,6 +28,7 @@ import com.samskivert.util.Interval; import com.samskivert.util.RandomUtil; import com.threerings.presents.data.ClientObject; + import com.threerings.parlor.game.server.GameManager; import com.threerings.puzzle.data.Board; diff --git a/src/java/com/threerings/puzzle/util/PointSet.java b/src/java/com/threerings/puzzle/util/PointSet.java index d8da02c1..68c8c623 100644 --- a/src/java/com/threerings/puzzle/util/PointSet.java +++ b/src/java/com/threerings/puzzle/util/PointSet.java @@ -21,9 +21,10 @@ package com.threerings.puzzle.util; -import java.awt.Point; import java.util.Iterator; +import java.awt.Point; + import static com.threerings.puzzle.Log.log; /** diff --git a/src/java/com/threerings/puzzle/util/PuzzleGameUtil.java b/src/java/com/threerings/puzzle/util/PuzzleGameUtil.java index f8702f72..d63d5f44 100644 --- a/src/java/com/threerings/puzzle/util/PuzzleGameUtil.java +++ b/src/java/com/threerings/puzzle/util/PuzzleGameUtil.java @@ -24,6 +24,7 @@ package com.threerings.puzzle.util; import java.awt.event.KeyEvent; import com.threerings.util.KeyTranslatorImpl; + import com.threerings.puzzle.client.PuzzleController; import com.threerings.puzzle.client.PuzzlePanel; diff --git a/src/java/com/threerings/stage/client/StageScenePanel.java b/src/java/com/threerings/stage/client/StageScenePanel.java index cea18650..9d918074 100644 --- a/src/java/com/threerings/stage/client/StageScenePanel.java +++ b/src/java/com/threerings/stage/client/StageScenePanel.java @@ -21,7 +21,9 @@ package com.threerings.stage.client; -import static com.threerings.stage.Log.log; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.awt.AlphaComposite; import java.awt.BasicStroke; @@ -36,9 +38,6 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.geom.Ellipse2D; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -51,24 +50,30 @@ import com.samskivert.swing.util.SwingUtil; import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.data.PlaceObject; + import com.threerings.media.tile.ObjectTile; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.UniformTileSet; + import com.threerings.miso.client.MisoScenePanel; import com.threerings.miso.client.SceneObject; import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.util.MisoUtil; -import com.threerings.stage.data.StageLocation; -import com.threerings.stage.data.StageMisoSceneModel; -import com.threerings.stage.data.StageScene; -import com.threerings.stage.util.StageContext; -import com.threerings.stage.util.StageSceneUtil; + import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.spot.data.Cluster; import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.SceneLocation; +import com.threerings.stage.data.StageLocation; +import com.threerings.stage.data.StageMisoSceneModel; +import com.threerings.stage.data.StageScene; +import com.threerings.stage.util.StageContext; +import com.threerings.stage.util.StageSceneUtil; + +import static com.threerings.stage.Log.log; + /** * Extends the basic Miso scene panel with Stage fun stuff like portals, * clusters and locations. diff --git a/src/java/com/threerings/stage/data/StageScene.java b/src/java/com/threerings/stage/data/StageScene.java index 5f9cc564..629da007 100644 --- a/src/java/com/threerings/stage/data/StageScene.java +++ b/src/java/com/threerings/stage/data/StageScene.java @@ -24,13 +24,13 @@ package com.threerings.stage.data; import java.util.ArrayList; import java.util.Iterator; -import com.threerings.miso.data.ObjectInfo; import com.threerings.crowd.data.PlaceConfig; +import com.threerings.miso.data.ObjectInfo; + import com.threerings.whirled.data.Scene; import com.threerings.whirled.data.SceneImpl; import com.threerings.whirled.data.SceneUpdate; - import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.SpotScene; import com.threerings.whirled.spot.data.SpotSceneImpl; diff --git a/src/java/com/threerings/stage/data/StageSceneMarshaller.java b/src/java/com/threerings/stage/data/StageSceneMarshaller.java index e81392e6..faf4a6b8 100644 --- a/src/java/com/threerings/stage/data/StageSceneMarshaller.java +++ b/src/java/com/threerings/stage/data/StageSceneMarshaller.java @@ -21,10 +21,12 @@ package com.threerings.stage.data; -import com.threerings.miso.data.ObjectInfo; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; + +import com.threerings.miso.data.ObjectInfo; + import com.threerings.stage.client.StageSceneService; /** diff --git a/src/java/com/threerings/stage/server/StageSceneDispatcher.java b/src/java/com/threerings/stage/server/StageSceneDispatcher.java index 7329df17..e773a0a1 100644 --- a/src/java/com/threerings/stage/server/StageSceneDispatcher.java +++ b/src/java/com/threerings/stage/server/StageSceneDispatcher.java @@ -21,11 +21,13 @@ package com.threerings.stage.server; -import com.threerings.miso.data.ObjectInfo; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; + +import com.threerings.miso.data.ObjectInfo; + import com.threerings.stage.data.StageSceneMarshaller; /** diff --git a/src/java/com/threerings/stage/server/StageSceneManager.java b/src/java/com/threerings/stage/server/StageSceneManager.java index caaccbd3..f9da1afb 100644 --- a/src/java/com/threerings/stage/server/StageSceneManager.java +++ b/src/java/com/threerings/stage/server/StageSceneManager.java @@ -21,24 +21,28 @@ package com.threerings.stage.server; -import java.awt.Point; -import java.awt.Rectangle; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.awt.Point; +import java.awt.Rectangle; + import com.samskivert.util.HashIntMap; -import com.threerings.media.util.AStarPathUtil; -import com.threerings.media.util.MathUtil; -import com.threerings.miso.data.ObjectInfo; -import com.threerings.miso.util.MisoSceneMetrics; -import com.threerings.miso.util.MisoUtil; + +import com.threerings.presents.data.ClientObject; +import com.threerings.presents.server.InvocationException; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.PlaceObject; -import com.threerings.presents.data.ClientObject; -import com.threerings.presents.server.InvocationException; + +import com.threerings.media.util.AStarPathUtil; +import com.threerings.media.util.MathUtil; + +import com.threerings.miso.data.ObjectInfo; +import com.threerings.miso.util.MisoSceneMetrics; +import com.threerings.miso.util.MisoUtil; import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.spot.data.Cluster; diff --git a/src/java/com/threerings/stage/server/StageSceneProvider.java b/src/java/com/threerings/stage/server/StageSceneProvider.java index 737fb9ff..5831f477 100644 --- a/src/java/com/threerings/stage/server/StageSceneProvider.java +++ b/src/java/com/threerings/stage/server/StageSceneProvider.java @@ -21,11 +21,13 @@ package com.threerings.stage.server; -import com.threerings.miso.data.ObjectInfo; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; + +import com.threerings.miso.data.ObjectInfo; + import com.threerings.stage.client.StageSceneService; /** diff --git a/src/java/com/threerings/stage/tools/editor/DirectionButton.java b/src/java/com/threerings/stage/tools/editor/DirectionButton.java index e066fa56..69f9ed27 100644 --- a/src/java/com/threerings/stage/tools/editor/DirectionButton.java +++ b/src/java/com/threerings/stage/tools/editor/DirectionButton.java @@ -26,13 +26,14 @@ import java.awt.Dimension; import java.awt.Graphics; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.AbstractButton; import javax.swing.DefaultButtonModel; -import com.threerings.media.image.ColorUtil; - import com.threerings.util.DirectionCodes; +import com.threerings.media.image.ColorUtil; + /** * A button that allows for selection from the compass directions. */ diff --git a/src/java/com/threerings/stage/tools/editor/EditorApp.java b/src/java/com/threerings/stage/tools/editor/EditorApp.java index 2b9bc573..4b6ad78d 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorApp.java +++ b/src/java/com/threerings/stage/tools/editor/EditorApp.java @@ -21,6 +21,14 @@ package com.threerings.stage.tools.editor; +import java.util.List; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; + import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.DisplayMode; @@ -34,17 +42,11 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JProgressBar; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.List; +import com.samskivert.util.DebugChords; +import com.samskivert.util.StringUtil; import com.samskivert.swing.RuntimeAdjust; import com.samskivert.swing.util.SwingUtil; -import com.samskivert.util.DebugChords; -import com.samskivert.util.StringUtil; import com.threerings.util.KeyDispatcher; import com.threerings.util.KeyboardManager; @@ -56,14 +58,14 @@ import com.threerings.resource.ResourceManager; import com.threerings.media.FrameManager; import com.threerings.media.image.ColorPository; import com.threerings.media.image.ImageManager; -import com.threerings.media.util.ModeUtil; - import com.threerings.media.tile.TileSetRepository; import com.threerings.media.tile.bundle.BundledTileSetRepository; +import com.threerings.media.util.ModeUtil; + +import com.threerings.miso.tile.MisoTileManager; import com.threerings.cast.ComponentRepository; import com.threerings.cast.bundle.BundledComponentRepository; -import com.threerings.miso.tile.MisoTileManager; import com.threerings.stage.data.StageSceneModel; import com.threerings.stage.tools.editor.util.EditorContext; diff --git a/src/java/com/threerings/stage/tools/editor/EditorDialog.java b/src/java/com/threerings/stage/tools/editor/EditorDialog.java index e0fa5cef..8b23ee7b 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorDialog.java +++ b/src/java/com/threerings/stage/tools/editor/EditorDialog.java @@ -10,6 +10,7 @@ import javax.swing.JPanel; import com.samskivert.swing.HGroupLayout; import com.samskivert.swing.VGroupLayout; + import com.threerings.stage.tools.editor.util.EditorContext; import com.threerings.stage.tools.editor.util.EditorDialogUtil; diff --git a/src/java/com/threerings/stage/tools/editor/EditorFrame.java b/src/java/com/threerings/stage/tools/editor/EditorFrame.java index a1d810df..85b2373a 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorFrame.java +++ b/src/java/com/threerings/stage/tools/editor/EditorFrame.java @@ -21,6 +21,9 @@ package com.threerings.stage.tools.editor; +import java.io.File; +import java.io.IOException; + import java.awt.BorderLayout; import java.awt.EventQueue; import java.awt.event.ActionEvent; @@ -30,8 +33,6 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; import javax.swing.JFileChooser; import javax.swing.JInternalFrame; @@ -49,16 +50,19 @@ import com.samskivert.swing.GroupLayout; import com.samskivert.swing.HGroupLayout; import com.samskivert.swing.util.MenuUtil; import com.samskivert.swing.util.SwingUtil; + import com.threerings.media.ManagedJFrame; + import com.threerings.miso.tile.BaseTileSet; +import com.threerings.whirled.tools.xml.SceneParser; + import com.threerings.stage.data.StageScene; import com.threerings.stage.data.StageSceneModel; import com.threerings.stage.tools.editor.util.EditorContext; import com.threerings.stage.tools.editor.util.EditorDialogUtil; import com.threerings.stage.tools.xml.StageSceneParser; import com.threerings.stage.tools.xml.StageSceneWriter; -import com.threerings.whirled.tools.xml.SceneParser; import static com.threerings.stage.Log.log; diff --git a/src/java/com/threerings/stage/tools/editor/EditorModel.java b/src/java/com/threerings/stage/tools/editor/EditorModel.java index 35ecb4a1..3a5b12be 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorModel.java +++ b/src/java/com/threerings/stage/tools/editor/EditorModel.java @@ -25,13 +25,13 @@ import java.util.List; import com.google.common.collect.Lists; +import com.threerings.util.DirectionCodes; + import com.threerings.media.tile.Tile; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileUtil; -import com.threerings.util.DirectionCodes; - import static com.threerings.stage.Log.log; /** diff --git a/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java b/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java index f3b0082f..5a6cecb5 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java +++ b/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java @@ -21,7 +21,9 @@ package com.threerings.stage.tools.editor; -import static com.threerings.stage.Log.log; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import java.awt.AlphaComposite; import java.awt.BasicStroke; @@ -38,9 +40,6 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.geom.Ellipse2D; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import javax.swing.BoundedRangeModel; import javax.swing.DefaultBoundedRangeModel; @@ -49,13 +48,19 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import com.google.common.collect.Lists; + +import com.samskivert.util.RandomUtil; + import com.samskivert.swing.Controller; import com.samskivert.swing.TGraphics2D; import com.samskivert.swing.util.SwingUtil; -import com.samskivert.util.RandomUtil; + +import com.threerings.util.DirectionCodes; + import com.threerings.media.tile.ObjectTile; import com.threerings.media.tile.Tile; import com.threerings.media.tile.TileUtil; + import com.threerings.miso.client.MisoScenePanel; import com.threerings.miso.client.ObjectActionHandler; import com.threerings.miso.client.SceneBlock; @@ -63,15 +68,18 @@ import com.threerings.miso.client.SceneObject; import com.threerings.miso.data.MisoSceneModel; import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.util.MisoUtil; + +import com.threerings.whirled.spot.data.Portal; +import com.threerings.whirled.spot.tools.EditablePortal; + import com.threerings.stage.client.StageScenePanel; import com.threerings.stage.data.StageLocation; import com.threerings.stage.data.StageMisoSceneModel; import com.threerings.stage.tools.editor.util.EditorContext; import com.threerings.stage.tools.editor.util.EditorDialogUtil; import com.threerings.stage.tools.editor.util.ExtrasPainter; -import com.threerings.util.DirectionCodes; -import com.threerings.whirled.spot.data.Portal; -import com.threerings.whirled.spot.tools.EditablePortal; + +import static com.threerings.stage.Log.log; /** * Displays the scene view and handles UI events on the scene. Various actions may be performed on diff --git a/src/java/com/threerings/stage/tools/editor/EditorScrollBox.java b/src/java/com/threerings/stage/tools/editor/EditorScrollBox.java index 215d1c51..8703572b 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorScrollBox.java +++ b/src/java/com/threerings/stage/tools/editor/EditorScrollBox.java @@ -26,15 +26,11 @@ import java.awt.Dimension; import java.awt.EventQueue; import java.awt.Graphics; import java.awt.Graphics2D; - -import java.awt.event.MouseEvent; - -import java.awt.geom.AffineTransform; - -import java.awt.image.BufferedImage; - import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; +import java.awt.event.MouseEvent; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; import com.samskivert.swing.ScrollBox; import com.samskivert.swing.util.SwingUtil; diff --git a/src/java/com/threerings/stage/tools/editor/EditorTileManager.java b/src/java/com/threerings/stage/tools/editor/EditorTileManager.java index a27d5c45..fffe0107 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorTileManager.java +++ b/src/java/com/threerings/stage/tools/editor/EditorTileManager.java @@ -23,14 +23,15 @@ package com.threerings.stage.tools.editor; import com.samskivert.util.HashIntMap; +import com.threerings.resource.ResourceManager; + +import com.threerings.media.image.ImageManager; import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.TileSet; -import com.threerings.media.image.ImageManager; -import com.threerings.miso.tile.FringeConfiguration; import com.threerings.miso.tile.BaseTileSet; +import com.threerings.miso.tile.FringeConfiguration; import com.threerings.miso.tile.MisoTileManager; -import com.threerings.resource.ResourceManager; /** * Extends the normal Miso Tile Manager to allow the use of a set of test tiles that can be used in diff --git a/src/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java b/src/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java index 526f5359..292c783d 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java +++ b/src/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java @@ -21,10 +21,11 @@ package com.threerings.stage.tools.editor; +import java.util.List; + import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.List; import javax.swing.JButton; import javax.swing.JPanel; diff --git a/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java b/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java index c140b20b..357adb25 100644 --- a/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java +++ b/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java @@ -30,12 +30,12 @@ import javax.swing.JPanel; import javax.swing.JSlider; import javax.swing.JTextField; -import com.samskivert.swing.HGroupLayout; import com.samskivert.util.StringUtil; -import com.threerings.media.image.ColorPository.ColorRecord; -import com.threerings.media.image.ColorPository; +import com.samskivert.swing.HGroupLayout; +import com.threerings.media.image.ColorPository; +import com.threerings.media.image.ColorPository.ColorRecord; import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.RecolorableTileSet; import com.threerings.media.tile.TileSet; diff --git a/src/java/com/threerings/stage/tools/editor/PortalDialog.java b/src/java/com/threerings/stage/tools/editor/PortalDialog.java index d44c99fc..1ff5495e 100644 --- a/src/java/com/threerings/stage/tools/editor/PortalDialog.java +++ b/src/java/com/threerings/stage/tools/editor/PortalDialog.java @@ -33,11 +33,13 @@ import javax.swing.JTextField; import javax.swing.SwingConstants; import com.samskivert.swing.HGroupLayout; -import com.threerings.stage.data.StageScene; -import com.threerings.stage.tools.editor.util.EditorContext; + import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.tools.EditablePortal; +import com.threerings.stage.data.StageScene; +import com.threerings.stage.tools.editor.util.EditorContext; + /** * The PortalDialog is used to present the user with a dialog * allowing them to enter the information associated with an diff --git a/src/java/com/threerings/stage/tools/editor/PortalTool.java b/src/java/com/threerings/stage/tools/editor/PortalTool.java index 30f2eef7..45371955 100644 --- a/src/java/com/threerings/stage/tools/editor/PortalTool.java +++ b/src/java/com/threerings/stage/tools/editor/PortalTool.java @@ -21,17 +21,19 @@ package com.threerings.stage.tools.editor; +import java.util.Iterator; + import java.awt.Graphics2D; import java.awt.Point; import java.awt.event.MouseEvent; + import javax.swing.event.MouseInputAdapter; -import java.util.Iterator; - -import com.threerings.miso.util.MisoUtil; import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; +import com.threerings.miso.util.MisoUtil; + import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.tools.EditablePortal; diff --git a/src/java/com/threerings/stage/tools/editor/PreferencesDialog.java b/src/java/com/threerings/stage/tools/editor/PreferencesDialog.java index c3348a64..10afc13a 100644 --- a/src/java/com/threerings/stage/tools/editor/PreferencesDialog.java +++ b/src/java/com/threerings/stage/tools/editor/PreferencesDialog.java @@ -21,9 +21,10 @@ package com.threerings.stage.tools.editor; +import java.io.File; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import javax.swing.BorderFactory; import javax.swing.JButton; diff --git a/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java b/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java index 108e43f0..bce2fdcb 100644 --- a/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java +++ b/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java @@ -21,43 +21,41 @@ package com.threerings.stage.tools.editor; +import java.util.HashSet; +import java.util.Iterator; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; -import java.util.HashSet; -import java.util.Iterator; - import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; - import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; -import com.samskivert.swing.GroupLayout; -import com.samskivert.swing.HGroupLayout; import com.samskivert.util.Collections; import com.samskivert.util.ComparableArrayList; -import com.threerings.miso.data.ObjectInfo; -import com.threerings.miso.data.SparseMisoSceneModel.ObjectVisitor; +import com.samskivert.swing.GroupLayout; +import com.samskivert.swing.HGroupLayout; import com.threerings.media.image.ColorPository; - import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.RecolorableTileSet; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileUtil; +import com.threerings.miso.data.ObjectInfo; +import com.threerings.miso.data.SparseMisoSceneModel.ObjectVisitor; + import com.threerings.stage.data.StageMisoSceneModel; import com.threerings.stage.data.StageScene; - import com.threerings.stage.tools.editor.util.EditorContext; /** diff --git a/src/java/com/threerings/stage/tools/editor/TestTileLoader.java b/src/java/com/threerings/stage/tools/editor/TestTileLoader.java index 4f813303..8c99e700 100644 --- a/src/java/com/threerings/stage/tools/editor/TestTileLoader.java +++ b/src/java/com/threerings/stage/tools/editor/TestTileLoader.java @@ -21,14 +21,16 @@ package com.threerings.stage.tools.editor; -import java.awt.image.BufferedImage; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + import java.io.File; import java.io.FileFilter; import java.io.FilenameFilter; import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; + +import java.awt.image.BufferedImage; import javax.imageio.ImageIO; @@ -38,11 +40,11 @@ import com.threerings.media.tile.ImageProvider; import com.threerings.media.tile.SimpleCachingImageProvider; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSetIDBroker; - -import com.threerings.miso.tile.tools.xml.BaseTileSetRuleSet; import com.threerings.media.tile.tools.xml.ObjectTileSetRuleSet; import com.threerings.media.tile.tools.xml.XMLTileSetParser; +import com.threerings.miso.tile.tools.xml.BaseTileSetRuleSet; + import static com.threerings.stage.Log.log; /** diff --git a/src/java/com/threerings/stage/tools/editor/TileInfoPanel.java b/src/java/com/threerings/stage/tools/editor/TileInfoPanel.java index 29b65ef9..3215b882 100644 --- a/src/java/com/threerings/stage/tools/editor/TileInfoPanel.java +++ b/src/java/com/threerings/stage/tools/editor/TileInfoPanel.java @@ -21,6 +21,11 @@ package com.threerings.stage.tools.editor; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import java.awt.Component; import java.awt.Dimension; import java.awt.Image; @@ -29,11 +34,6 @@ import java.awt.Rectangle; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; @@ -63,7 +63,6 @@ import com.samskivert.util.QuickSort; import com.samskivert.util.StringUtil; import com.threerings.media.SafeScrollPane; - import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSetRepository; diff --git a/src/java/com/threerings/stage/tools/editor/util/TileSetUtil.java b/src/java/com/threerings/stage/tools/editor/util/TileSetUtil.java index 55bf1368..f1c3e8d4 100644 --- a/src/java/com/threerings/stage/tools/editor/util/TileSetUtil.java +++ b/src/java/com/threerings/stage/tools/editor/util/TileSetUtil.java @@ -22,6 +22,7 @@ package com.threerings.stage.tools.editor.util; import com.threerings.media.tile.TileSet; + import com.threerings.miso.tile.BaseTileSet; import com.threerings.stage.tools.editor.EditorModel; diff --git a/src/java/com/threerings/stage/tools/viewer/ViewerApp.java b/src/java/com/threerings/stage/tools/viewer/ViewerApp.java index e2989a58..f670e995 100644 --- a/src/java/com/threerings/stage/tools/viewer/ViewerApp.java +++ b/src/java/com/threerings/stage/tools/viewer/ViewerApp.java @@ -21,33 +21,34 @@ package com.threerings.stage.tools.viewer; +import java.io.IOException; + import java.awt.DisplayMode; import java.awt.EventQueue; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; -import java.io.IOException; - import com.samskivert.swing.util.SwingUtil; -import com.threerings.resource.ResourceManager; import com.threerings.util.KeyDispatcher; import com.threerings.util.KeyboardManager; import com.threerings.util.MessageManager; +import com.threerings.resource.ResourceManager; + import com.threerings.media.FrameManager; import com.threerings.media.IconManager; import com.threerings.media.image.ColorPository; import com.threerings.media.image.ImageManager; import com.threerings.media.tile.bundle.BundledTileSetRepository; -import com.threerings.cast.CharacterManager; -import com.threerings.cast.bundle.BundledComponentRepository; -import com.threerings.cast.ComponentRepository; - import com.threerings.miso.tile.MisoTileManager; +import com.threerings.cast.CharacterManager; +import com.threerings.cast.ComponentRepository; +import com.threerings.cast.bundle.BundledComponentRepository; + import com.threerings.stage.util.StageContext; import static com.threerings.stage.Log.log; diff --git a/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java b/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java index 1ab55529..6cf5b49c 100644 --- a/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java +++ b/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java @@ -21,14 +21,14 @@ package com.threerings.stage.tools.viewer; +import java.io.File; + import java.awt.BorderLayout; import java.awt.Color; import java.awt.GraphicsConfiguration; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; -import java.io.File; - import javax.swing.JFileChooser; import javax.swing.JMenu; import javax.swing.JMenuBar; @@ -38,9 +38,10 @@ import javax.swing.filechooser.FileFilter; import com.samskivert.swing.util.MenuUtil; -import com.threerings.cast.CharacterManager; import com.threerings.media.ManagedJFrame; +import com.threerings.cast.CharacterManager; + import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.SpotSceneModel; diff --git a/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java b/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java index 06549c99..23274861 100644 --- a/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java +++ b/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java @@ -25,9 +25,14 @@ import java.awt.Graphics; import java.awt.Point; import java.awt.event.MouseEvent; -import com.samskivert.swing.Controller; import com.samskivert.util.RandomUtil; +import com.samskivert.swing.Controller; + +import com.threerings.media.sprite.PathObserver; +import com.threerings.media.sprite.Sprite; +import com.threerings.media.util.LineSegmentPath; +import com.threerings.media.util.Path; import com.threerings.media.util.PerformanceMonitor; import com.threerings.media.util.PerformanceObserver; @@ -36,14 +41,9 @@ import com.threerings.cast.CharacterManager; import com.threerings.cast.CharacterSprite; import com.threerings.cast.util.CastUtil; -import com.threerings.media.sprite.PathObserver; -import com.threerings.media.sprite.Sprite; -import com.threerings.media.util.LineSegmentPath; -import com.threerings.media.util.Path; - -import com.threerings.stage.client.StageScenePanel; import com.threerings.whirled.spot.data.Location; +import com.threerings.stage.client.StageScenePanel; import com.threerings.stage.data.StageLocation; import com.threerings.stage.data.StageScene; import com.threerings.stage.util.StageContext; diff --git a/src/java/com/threerings/stage/tools/xml/StageSceneParser.java b/src/java/com/threerings/stage/tools/xml/StageSceneParser.java index 89bf286d..f345fbc3 100644 --- a/src/java/com/threerings/stage/tools/xml/StageSceneParser.java +++ b/src/java/com/threerings/stage/tools/xml/StageSceneParser.java @@ -21,16 +21,15 @@ package com.threerings.stage.tools.xml; -import org.apache.commons.digester.Rule; - import org.xml.sax.Attributes; +import org.apache.commons.digester.Rule; + +import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.tools.xml.SpotSceneRuleSet; import com.threerings.whirled.tools.xml.SceneParser; import com.threerings.whirled.tools.xml.SceneRuleSet; -import com.threerings.whirled.spot.data.Location; - import com.threerings.stage.data.StageLocation; import com.threerings.stage.data.StageSceneModel; diff --git a/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java b/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java index c5856a90..edce2dd2 100644 --- a/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java +++ b/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java @@ -28,14 +28,12 @@ import com.megginson.sax.DataWriter; import com.threerings.miso.tools.xml.SparseMisoSceneWriter; +import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.spot.data.SpotSceneModel; import com.threerings.whirled.spot.tools.xml.SpotSceneWriter; - -import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.tools.xml.SceneWriter; import com.threerings.stage.data.StageMisoSceneModel; - import com.threerings.stage.data.StageSceneModel; /** diff --git a/src/java/com/threerings/stage/util/PlacementConstraints.java b/src/java/com/threerings/stage/util/PlacementConstraints.java index e03204cb..41e3fdb9 100644 --- a/src/java/com/threerings/stage/util/PlacementConstraints.java +++ b/src/java/com/threerings/stage/util/PlacementConstraints.java @@ -21,15 +21,16 @@ package com.threerings.stage.util; -import java.awt.Rectangle; - import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.awt.Rectangle; + import com.google.common.collect.Lists; import com.samskivert.util.ListUtil; + import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; import com.threerings.util.MessageBundle; diff --git a/src/java/com/threerings/stage/util/StageContext.java b/src/java/com/threerings/stage/util/StageContext.java index 78db37c4..7d214c4f 100644 --- a/src/java/com/threerings/stage/util/StageContext.java +++ b/src/java/com/threerings/stage/util/StageContext.java @@ -21,18 +21,20 @@ package com.threerings.stage.util; -import com.threerings.resource.ResourceManager; import com.threerings.util.KeyDispatcher; import com.threerings.util.KeyboardManager; import com.threerings.util.MessageManager; +import com.threerings.resource.ResourceManager; + import com.threerings.media.FrameManager; import com.threerings.media.image.ColorPository; import com.threerings.media.image.ImageManager; -import com.threerings.cast.ComponentRepository; import com.threerings.miso.util.MisoContext; +import com.threerings.cast.ComponentRepository; + /** * A context that provides for the myriad requirements of the Stage * system. diff --git a/src/java/com/threerings/stage/util/StageSceneUtil.java b/src/java/com/threerings/stage/util/StageSceneUtil.java index da73c879..afdad470 100644 --- a/src/java/com/threerings/stage/util/StageSceneUtil.java +++ b/src/java/com/threerings/stage/util/StageSceneUtil.java @@ -21,13 +21,15 @@ package com.threerings.stage.util; -import java.awt.Point; -import java.awt.Rectangle; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.awt.Point; +import java.awt.Rectangle; + import com.samskivert.util.SortableArrayList; + import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; diff --git a/src/java/com/threerings/stats/data/IntArrayStat.java b/src/java/com/threerings/stats/data/IntArrayStat.java index e8634d8f..c72b80d6 100644 --- a/src/java/com/threerings/stats/data/IntArrayStat.java +++ b/src/java/com/threerings/stats/data/IntArrayStat.java @@ -21,10 +21,10 @@ package com.threerings.stats.data; -import java.io.IOException; - import java.util.Arrays; +import java.io.IOException; + import com.samskivert.util.ArrayUtil; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/stats/data/IntSetStat.java b/src/java/com/threerings/stats/data/IntSetStat.java index 43d72041..c2659876 100644 --- a/src/java/com/threerings/stats/data/IntSetStat.java +++ b/src/java/com/threerings/stats/data/IntSetStat.java @@ -24,8 +24,10 @@ package com.threerings.stats.data; import java.io.IOException; import com.samskivert.util.StringUtil; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; + import com.threerings.util.StreamableArrayIntSet; /** diff --git a/src/java/com/threerings/stats/data/MaxIntStat.java b/src/java/com/threerings/stats/data/MaxIntStat.java index b908722b..c806a251 100644 --- a/src/java/com/threerings/stats/data/MaxIntStat.java +++ b/src/java/com/threerings/stats/data/MaxIntStat.java @@ -21,8 +21,8 @@ package com.threerings.stats.data; -import java.io.IOException; import java.io.EOFException; +import java.io.IOException; import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; diff --git a/src/java/com/threerings/stats/data/Stat.java b/src/java/com/threerings/stats/data/Stat.java index 0bb04a86..f67a33ec 100644 --- a/src/java/com/threerings/stats/data/Stat.java +++ b/src/java/com/threerings/stats/data/Stat.java @@ -21,12 +21,14 @@ package com.threerings.stats.data; +import java.util.zip.CRC32; + import java.io.IOException; import java.io.Serializable; -import java.util.zip.CRC32; import com.samskivert.util.HashIntMap; import com.samskivert.util.StringUtil; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; diff --git a/src/java/com/threerings/stats/server/persist/StatRepository.java b/src/java/com/threerings/stats/server/persist/StatRepository.java index 6c35fb3c..abdcb211 100644 --- a/src/java/com/threerings/stats/server/persist/StatRepository.java +++ b/src/java/com/threerings/stats/server/persist/StatRepository.java @@ -3,13 +3,13 @@ package com.threerings.stats.server.persist; -import java.io.ByteArrayInputStream; -import java.io.IOException; - import java.util.ArrayList; import java.util.Map; import java.util.Set; +import java.io.ByteArrayInputStream; +import java.io.IOException; + import com.google.common.collect.Maps; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/src/java/com/threerings/whirled/client/SceneDirector.java b/src/java/com/threerings/whirled/client/SceneDirector.java index ae89ac6c..341fc033 100644 --- a/src/java/com/threerings/whirled/client/SceneDirector.java +++ b/src/java/com/threerings/whirled/client/SceneDirector.java @@ -21,9 +21,10 @@ package com.threerings.whirled.client; -import java.io.IOException; import java.util.Map; +import java.io.IOException; + import com.samskivert.util.LRUHashMap; import com.samskivert.util.ResultListener; import com.samskivert.util.StringUtil; @@ -39,10 +40,10 @@ import com.threerings.whirled.client.persist.SceneRepository; import com.threerings.whirled.data.Scene; import com.threerings.whirled.data.SceneCodes; import com.threerings.whirled.data.SceneModel; +import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.util.NoSuchSceneException; import com.threerings.whirled.util.SceneFactory; import com.threerings.whirled.util.WhirledContext; -import com.threerings.whirled.data.SceneUpdate; import static com.threerings.whirled.Log.log; diff --git a/src/java/com/threerings/whirled/data/DefaultSceneConfig.java b/src/java/com/threerings/whirled/data/DefaultSceneConfig.java index 1632e91c..840d5371 100644 --- a/src/java/com/threerings/whirled/data/DefaultSceneConfig.java +++ b/src/java/com/threerings/whirled/data/DefaultSceneConfig.java @@ -22,6 +22,7 @@ package com.threerings.whirled.data; import com.threerings.crowd.data.PlaceConfig; + import com.threerings.whirled.client.SceneController; /** diff --git a/src/java/com/threerings/whirled/data/SceneMarshaller.java b/src/java/com/threerings/whirled/data/SceneMarshaller.java index be4acb96..37e1348a 100644 --- a/src/java/com/threerings/whirled/data/SceneMarshaller.java +++ b/src/java/com/threerings/whirled/data/SceneMarshaller.java @@ -21,10 +21,12 @@ package com.threerings.whirled.data; -import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; + +import com.threerings.crowd.data.PlaceConfig; + import com.threerings.whirled.client.SceneService; /** diff --git a/src/java/com/threerings/whirled/data/SceneUpdate.java b/src/java/com/threerings/whirled/data/SceneUpdate.java index f748be01..d6af105d 100644 --- a/src/java/com/threerings/whirled/data/SceneUpdate.java +++ b/src/java/com/threerings/whirled/data/SceneUpdate.java @@ -28,6 +28,7 @@ import com.samskivert.util.StringUtil; import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; + import com.threerings.util.ActionScript; import static com.threerings.whirled.Log.log; diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java index 5c914461..e828ab9c 100644 --- a/src/java/com/threerings/whirled/server/SceneDispatcher.java +++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java @@ -24,6 +24,7 @@ package com.threerings.whirled.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; + import com.threerings.whirled.client.SceneService; import com.threerings.whirled.data.SceneMarshaller; diff --git a/src/java/com/threerings/whirled/server/SceneManager.java b/src/java/com/threerings/whirled/server/SceneManager.java index db699b91..b713ae4a 100644 --- a/src/java/com/threerings/whirled/server/SceneManager.java +++ b/src/java/com/threerings/whirled/server/SceneManager.java @@ -23,9 +23,10 @@ package com.threerings.whirled.server; import com.google.inject.Inject; -import com.samskivert.jdbc.WriteOnlyUnit; import com.samskivert.util.Invoker; +import com.samskivert.jdbc.WriteOnlyUnit; + import com.threerings.presents.annotation.MainInvoker; import com.threerings.crowd.data.Place; diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java index f6f7e556..d20aee5a 100644 --- a/src/java/com/threerings/whirled/server/SceneProvider.java +++ b/src/java/com/threerings/whirled/server/SceneProvider.java @@ -24,6 +24,7 @@ package com.threerings.whirled.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; + import com.threerings.whirled.client.SceneService; /** diff --git a/src/java/com/threerings/whirled/server/SceneRegistry.java b/src/java/com/threerings/whirled/server/SceneRegistry.java index ec50ef80..f65cf781 100644 --- a/src/java/com/threerings/whirled/server/SceneRegistry.java +++ b/src/java/com/threerings/whirled/server/SceneRegistry.java @@ -27,11 +27,12 @@ import com.google.common.collect.Lists; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.samskivert.jdbc.RepositoryUnit; -import com.samskivert.util.IntMaps; import com.samskivert.util.IntMap; +import com.samskivert.util.IntMaps; import com.samskivert.util.Invoker; +import com.samskivert.jdbc.RepositoryUnit; + import com.threerings.presents.annotation.MainInvoker; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationManager; diff --git a/src/java/com/threerings/whirled/server/SceneSender.java b/src/java/com/threerings/whirled/server/SceneSender.java index 95790620..4f77a968 100644 --- a/src/java/com/threerings/whirled/server/SceneSender.java +++ b/src/java/com/threerings/whirled/server/SceneSender.java @@ -23,6 +23,7 @@ package com.threerings.whirled.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; + import com.threerings.whirled.client.SceneDecoder; import com.threerings.whirled.client.SceneReceiver; diff --git a/src/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java b/src/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java index e02fe8b9..ca56eac4 100644 --- a/src/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java +++ b/src/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java @@ -21,14 +21,13 @@ package com.threerings.whirled.server.persist; +import java.util.HashMap; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.HashMap; - import com.samskivert.io.PersistenceException; - import com.samskivert.util.HashIntMap; import com.threerings.io.ObjectInputStream; diff --git a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java index 1382cb12..33d9cb9f 100644 --- a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java +++ b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java @@ -45,13 +45,12 @@ 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; import com.threerings.whirled.spot.data.SpotCodes; import com.threerings.whirled.spot.data.SpotScene; +import com.threerings.whirled.util.WhirledContext; import static com.threerings.whirled.spot.Log.log; diff --git a/src/java/com/threerings/whirled/spot/data/Cluster.java b/src/java/com/threerings/whirled/spot/data/Cluster.java index e764006e..52ec3d58 100644 --- a/src/java/com/threerings/whirled/spot/data/Cluster.java +++ b/src/java/com/threerings/whirled/spot/data/Cluster.java @@ -26,6 +26,7 @@ import java.awt.Rectangle; import com.samskivert.util.StringUtil; import com.threerings.io.Streamable; + import com.threerings.util.ActionScript; import com.threerings.presents.dobj.DSet; diff --git a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java index 9742bdaf..165fb62b 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java +++ b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java @@ -24,6 +24,7 @@ package com.threerings.whirled.spot.data; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; + import com.threerings.whirled.client.SceneService; import com.threerings.whirled.data.SceneMarshaller; import com.threerings.whirled.spot.client.SpotService; diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java index feec45ff..206bdcea 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java +++ b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java @@ -22,6 +22,7 @@ package com.threerings.whirled.spot.data; import com.threerings.presents.dobj.DSet; + import com.threerings.whirled.data.SceneObject; /** diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java index d39ecde0..80f1a0cc 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java +++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java @@ -25,6 +25,7 @@ import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; + import com.threerings.whirled.client.SceneService; import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.SpotMarshaller; diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java index 09e68085..40614b2c 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java +++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java @@ -25,6 +25,7 @@ import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; + import com.threerings.whirled.client.SceneService; import com.threerings.whirled.spot.client.SpotService; import com.threerings.whirled.spot.data.Location; diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index 97abbf1b..03b8c8e3 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Iterator; import com.samskivert.util.HashIntMap; + import com.threerings.util.Name; import com.threerings.presents.dobj.DObject; @@ -32,12 +33,11 @@ import com.threerings.presents.server.InvocationException; import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.chat.server.SpeakUtil; -import com.threerings.crowd.server.PlaceRegistry; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.OccupantInfo; +import com.threerings.crowd.server.PlaceRegistry; import com.threerings.whirled.server.SceneManager; - import com.threerings.whirled.spot.data.Cluster; import com.threerings.whirled.spot.data.ClusterObject; import com.threerings.whirled.spot.data.ClusteredBodyObject; diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java b/src/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java index 22dd0c80..ce8aa918 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java @@ -29,7 +29,6 @@ import com.threerings.crowd.server.LocationManager; import com.threerings.whirled.client.SceneService; import com.threerings.whirled.server.SceneManager; import com.threerings.whirled.server.SceneMoveHandler; - import com.threerings.whirled.spot.data.Portal; /** diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java b/src/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java index f5cf8879..bcc97ad7 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java @@ -31,21 +31,21 @@ import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationManager; + import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.chat.server.SpeakUtil; import com.threerings.crowd.data.BodyObject; + import com.threerings.whirled.client.SceneService; import com.threerings.whirled.data.SceneCodes; import com.threerings.whirled.data.ScenePlace; import com.threerings.whirled.server.SceneRegistry; - import com.threerings.whirled.spot.client.SpotService; import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.SpotCodes; import com.threerings.whirled.spot.data.SpotScene; -import com.threerings.whirled.spot.server.SpotDispatcher; import static com.threerings.whirled.spot.Log.log; diff --git a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java index e4a0f32a..7f324297 100644 --- a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java +++ b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java @@ -23,17 +23,17 @@ package com.threerings.whirled.spot.tools.xml; import java.lang.reflect.Field; -import com.samskivert.xml.SetPropertyFieldsRule; -import com.samskivert.util.StringUtil; -import com.samskivert.util.ValueMarshaller; - -import com.threerings.tools.xml.NestableRuleSet; +import org.xml.sax.Attributes; import org.apache.commons.digester.Digester; import org.apache.commons.digester.ObjectCreateRule; import org.apache.commons.digester.Rule; -import org.xml.sax.Attributes; +import com.samskivert.util.StringUtil; +import com.samskivert.util.ValueMarshaller; +import com.samskivert.xml.SetPropertyFieldsRule; + +import com.threerings.tools.xml.NestableRuleSet; import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Portal; diff --git a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java index 30f7e4bd..cb6f497f 100644 --- a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java +++ b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java @@ -27,6 +27,7 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import com.megginson.sax.DataWriter; + import com.threerings.tools.xml.NestableWriter; import com.threerings.whirled.spot.data.Location; diff --git a/src/java/com/threerings/whirled/tools/xml/SceneParser.java b/src/java/com/threerings/whirled/tools/xml/SceneParser.java index 02dd70f0..74c29638 100644 --- a/src/java/com/threerings/whirled/tools/xml/SceneParser.java +++ b/src/java/com/threerings/whirled/tools/xml/SceneParser.java @@ -21,14 +21,17 @@ package com.threerings.whirled.tools.xml; -import java.io.IOException; import java.io.FileInputStream; +import java.io.IOException; import org.xml.sax.SAXException; + import org.apache.commons.digester.Digester; import com.samskivert.util.StringUtil; + import com.threerings.tools.xml.NestableRuleSet; + import com.threerings.whirled.data.AuxModel; import com.threerings.whirled.data.SceneModel; diff --git a/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java b/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java index bda4c0ec..d852f2c8 100644 --- a/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java +++ b/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java @@ -26,6 +26,7 @@ import org.apache.commons.digester.Digester; import com.samskivert.xml.SetPropertyFieldsRule; import com.threerings.tools.xml.NestableRuleSet; + import com.threerings.whirled.data.SceneModel; /** diff --git a/src/java/com/threerings/whirled/tools/xml/SceneWriter.java b/src/java/com/threerings/whirled/tools/xml/SceneWriter.java index 9c4608e9..c2b0673d 100644 --- a/src/java/com/threerings/whirled/tools/xml/SceneWriter.java +++ b/src/java/com/threerings/whirled/tools/xml/SceneWriter.java @@ -21,16 +21,18 @@ package com.threerings.whirled.tools.xml; +import java.util.HashMap; +import java.util.Map; + import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.util.HashMap; -import java.util.Map; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import com.megginson.sax.DataWriter; + import com.threerings.tools.xml.NestableWriter; import com.threerings.whirled.data.AuxModel; diff --git a/src/java/com/threerings/whirled/util/SceneFactory.java b/src/java/com/threerings/whirled/util/SceneFactory.java index 2f7466c3..6c1da085 100644 --- a/src/java/com/threerings/whirled/util/SceneFactory.java +++ b/src/java/com/threerings/whirled/util/SceneFactory.java @@ -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/java/com/threerings/whirled/util/WhirledContext.java b/src/java/com/threerings/whirled/util/WhirledContext.java index d550ec31..1889a04b 100644 --- a/src/java/com/threerings/whirled/util/WhirledContext.java +++ b/src/java/com/threerings/whirled/util/WhirledContext.java @@ -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/java/com/threerings/whirled/zone/client/ZoneDirector.java b/src/java/com/threerings/whirled/zone/client/ZoneDirector.java index e63f556c..faf1ea6d 100644 --- a/src/java/com/threerings/whirled/zone/client/ZoneDirector.java +++ b/src/java/com/threerings/whirled/zone/client/ZoneDirector.java @@ -34,7 +34,6 @@ import com.threerings.whirled.client.SceneDirector; import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.util.WhirledContext; - import com.threerings.whirled.zone.data.ZoneSummary; import com.threerings.whirled.zone.util.ZoneUtil; diff --git a/src/java/com/threerings/whirled/zone/client/ZoneService.java b/src/java/com/threerings/whirled/zone/client/ZoneService.java index 998e3a63..03e18c29 100644 --- a/src/java/com/threerings/whirled/zone/client/ZoneService.java +++ b/src/java/com/threerings/whirled/zone/client/ZoneService.java @@ -25,9 +25,9 @@ import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.crowd.data.PlaceConfig; + import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneUpdate; - import com.threerings.whirled.zone.data.ZoneSummary; /** diff --git a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java index 2079494d..a815939a 100644 --- a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java +++ b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java @@ -21,10 +21,12 @@ package com.threerings.whirled.zone.data; -import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; + +import com.threerings.crowd.data.PlaceConfig; + import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.zone.client.ZoneService; diff --git a/src/java/com/threerings/whirled/zone/data/ZoneSummary.java b/src/java/com/threerings/whirled/zone/data/ZoneSummary.java index bd1cc38e..83603e2b 100644 --- a/src/java/com/threerings/whirled/zone/data/ZoneSummary.java +++ b/src/java/com/threerings/whirled/zone/data/ZoneSummary.java @@ -24,6 +24,7 @@ package com.threerings.whirled.zone.data; import com.samskivert.util.StringUtil; import com.threerings.io.SimpleStreamableObject; + import com.threerings.util.Name; /** diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java index 8e11434d..b167c7ec 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java @@ -24,6 +24,7 @@ package com.threerings.whirled.zone.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; + import com.threerings.whirled.zone.client.ZoneService; import com.threerings.whirled.zone.data.ZoneMarshaller; diff --git a/src/java/com/threerings/whirled/zone/server/ZoneManager.java b/src/java/com/threerings/whirled/zone/server/ZoneManager.java index ce65587c..98b065aa 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneManager.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneManager.java @@ -22,6 +22,7 @@ package com.threerings.whirled.zone.server; import com.threerings.crowd.data.BodyObject; + import com.threerings.whirled.zone.data.ZoneSummary; import com.threerings.whirled.zone.data.ZonedBodyObject; diff --git a/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java b/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java index a72f8641..ee3fb5e4 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java @@ -32,7 +32,6 @@ import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.server.AbstractSceneMoveHandler; import com.threerings.whirled.server.SceneManager; import com.threerings.whirled.server.SceneRegistry; - import com.threerings.whirled.zone.client.ZoneService; import com.threerings.whirled.zone.data.ZoneCodes; import com.threerings.whirled.zone.data.ZoneSummary; diff --git a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java index beabd15d..2f333044 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java @@ -24,6 +24,7 @@ package com.threerings.whirled.zone.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; + import com.threerings.whirled.zone.client.ZoneService; /** diff --git a/src/java/com/threerings/whirled/zone/server/ZoneRegistry.java b/src/java/com/threerings/whirled/zone/server/ZoneRegistry.java index 59ec1f5c..c14374d1 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneRegistry.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneRegistry.java @@ -34,8 +34,8 @@ import com.threerings.presents.server.InvocationManager; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.server.LocationManager; import com.threerings.crowd.server.LocationProvider; -import com.threerings.whirled.server.SceneRegistry; +import com.threerings.whirled.server.SceneRegistry; import com.threerings.whirled.zone.client.ZoneService; import com.threerings.whirled.zone.data.ZoneCodes; import com.threerings.whirled.zone.data.ZonedBodyObject; diff --git a/src/java/com/threerings/whirled/zone/server/ZoneSender.java b/src/java/com/threerings/whirled/zone/server/ZoneSender.java index 7cf49f2a..3a8c0de3 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneSender.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneSender.java @@ -23,6 +23,7 @@ package com.threerings.whirled.zone.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; + import com.threerings.whirled.zone.client.ZoneDecoder; import com.threerings.whirled.zone.client.ZoneReceiver; diff --git a/tests/src/java/com/threerings/parlor/TestClient.java b/tests/src/java/com/threerings/parlor/TestClient.java index eff26d99..fa67345e 100644 --- a/tests/src/java/com/threerings/parlor/TestClient.java +++ b/tests/src/java/com/threerings/parlor/TestClient.java @@ -23,12 +23,16 @@ package com.threerings.parlor; import com.threerings.util.Name; -import com.threerings.presents.client.*; +import com.threerings.presents.client.Client; + import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.util.CrowdContext; -import com.threerings.parlor.client.*; -import com.threerings.parlor.game.data.*; +import com.threerings.parlor.client.Invitation; +import com.threerings.parlor.client.InvitationHandler; +import com.threerings.parlor.client.InvitationResponseObserver; +import com.threerings.parlor.client.ParlorDirector; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.util.ParlorContext; import static com.threerings.parlor.Log.log; diff --git a/tests/src/java/com/threerings/parlor/TestConfig.java b/tests/src/java/com/threerings/parlor/TestConfig.java index 8b1ecea7..f8441353 100644 --- a/tests/src/java/com/threerings/parlor/TestConfig.java +++ b/tests/src/java/com/threerings/parlor/TestConfig.java @@ -22,6 +22,7 @@ package com.threerings.parlor; import com.threerings.crowd.client.PlaceController; + import com.threerings.parlor.game.client.GameConfigurator; import com.threerings.parlor.game.data.GameConfig; diff --git a/tests/src/java/com/threerings/parlor/TestController.java b/tests/src/java/com/threerings/parlor/TestController.java index 954a942e..5b2bdcb8 100644 --- a/tests/src/java/com/threerings/parlor/TestController.java +++ b/tests/src/java/com/threerings/parlor/TestController.java @@ -23,6 +23,7 @@ package com.threerings.parlor; import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.util.CrowdContext; + import com.threerings.parlor.game.client.GameController; public class TestController extends GameController diff --git a/tests/src/java/com/threerings/whirled/TestClient.java b/tests/src/java/com/threerings/whirled/TestClient.java index a2fe7ed4..14815714 100644 --- a/tests/src/java/com/threerings/whirled/TestClient.java +++ b/tests/src/java/com/threerings/whirled/TestClient.java @@ -23,7 +23,7 @@ package com.threerings.whirled; import com.threerings.presents.client.Client; -import com.threerings.crowd.client.*; +import com.threerings.crowd.client.LocationObserver; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.util.CrowdContext; diff --git a/tests/src/java/com/threerings/whirled/TestConfig.java b/tests/src/java/com/threerings/whirled/TestConfig.java index 77ba0d2a..3935f36c 100644 --- a/tests/src/java/com/threerings/whirled/TestConfig.java +++ b/tests/src/java/com/threerings/whirled/TestConfig.java @@ -23,6 +23,7 @@ package com.threerings.whirled; import com.threerings.crowd.client.PlaceController; import com.threerings.crowd.data.PlaceConfig; + import com.threerings.whirled.server.SceneManager; public class TestConfig extends PlaceConfig diff --git a/tests/src/java/com/threerings/whirled/TestController.java b/tests/src/java/com/threerings/whirled/TestController.java index f7e95278..dba88c01 100644 --- a/tests/src/java/com/threerings/whirled/TestController.java +++ b/tests/src/java/com/threerings/whirled/TestController.java @@ -21,7 +21,8 @@ package com.threerings.whirled; -import com.threerings.crowd.client.*; +import com.threerings.crowd.client.PlaceController; +import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.util.CrowdContext; public class TestController extends PlaceController diff --git a/tests/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java b/tests/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java index d7f361c3..85dc3aeb 100644 --- a/tests/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java +++ b/tests/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java @@ -21,11 +21,11 @@ package com.threerings.whirled.spot.tools.xml; -import com.samskivert.test.TestUtil; - import junit.framework.Test; import junit.framework.TestCase; +import com.samskivert.test.TestUtil; + import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.tools.xml.SceneParser; diff --git a/tests/src/java/com/threerings/whirled/tools/xml/SceneParserTest.java b/tests/src/java/com/threerings/whirled/tools/xml/SceneParserTest.java index 5edaaa52..e0414edf 100644 --- a/tests/src/java/com/threerings/whirled/tools/xml/SceneParserTest.java +++ b/tests/src/java/com/threerings/whirled/tools/xml/SceneParserTest.java @@ -21,11 +21,11 @@ package com.threerings.whirled.tools.xml; -import com.samskivert.test.TestUtil; - import junit.framework.Test; import junit.framework.TestCase; +import com.samskivert.test.TestUtil; + import com.threerings.whirled.data.SceneModel; public class SceneParserTest extends TestCase