From 8856120403fb7b5901177d97f8544dcfe61be157 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Fri, 26 Sep 2008 17:29:59 +0000 Subject: [PATCH] Import cleanups git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5399 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../admin/client/AsStringFieldEditor.java | 1 + .../admin/client/BooleanFieldEditor.java | 3 +-- .../threerings/admin/client/DSetEditor.java | 4 ++-- .../threerings/admin/client/FieldEditor.java | 3 ++- .../admin/data/AdminMarshaller.java | 3 ++- .../threerings/admin/data/ConfigObject.java | 1 + .../admin/server/AdminDispatcher.java | 5 +++-- .../admin/server/ConfigRegistry.java | 2 ++ .../admin/server/DatabaseConfigRegistry.java | 5 +++-- .../server/PeeredDatabaseConfigRegistry.java | 5 +++-- .../bureau/client/BureauClient.java | 8 ++++--- .../bureau/client/BureauDirector.java | 14 +++++++------ .../bureau/client/BureauReceiver.java | 3 ++- .../bureau/data/BureauCredentials.java | 3 ++- .../bureau/data/BureauMarshaller.java | 3 ++- .../bureau/server/BureauAuthenticator.java | 3 ++- .../bureau/server/BureauDispatcher.java | 3 ++- .../bureau/server/BureauProvider.java | 3 ++- .../bureau/server/BureauRegistry.java | 6 +++--- .../bureau/server/BureauSender.java | 5 +++-- .../threerings/bureau/util/BureauContext.java | 1 + .../crowd/chat/client/ChatDirector.java | 21 +++++++++---------- .../crowd/chat/client/MuteDirector.java | 4 ++-- .../chat/data/ChannelSpeakMarshaller.java | 3 ++- .../crowd/chat/data/ChatMarshaller.java | 6 ++++-- .../crowd/chat/data/ChatMessage.java | 1 + .../crowd/chat/data/SpeakMarshaller.java | 3 ++- .../chat/server/ChannelSpeakDispatcher.java | 5 +++-- .../chat/server/ChannelSpeakProvider.java | 5 +++-- .../crowd/chat/server/ChatChannelManager.java | 1 + .../crowd/chat/server/ChatDispatcher.java | 8 ++++--- .../crowd/chat/server/ChatProvider.java | 11 +++++----- .../crowd/chat/server/SpeakDispatcher.java | 3 ++- .../crowd/chat/server/SpeakProvider.java | 3 ++- .../crowd/chat/server/SpeakUtil.java | 4 ++-- .../crowd/client/LocationDirector.java | 5 ++--- .../crowd/client/OccupantDirector.java | 1 + .../crowd/client/PlaceController.java | 1 + .../threerings/crowd/data/BodyMarshaller.java | 3 ++- .../crowd/data/LocationMarshaller.java | 3 ++- .../threerings/crowd/data/OccupantInfo.java | 1 + .../threerings/crowd/data/PlaceConfig.java | 1 + .../crowd/peer/data/CrowdPeerMarshaller.java | 8 ++++--- .../peer/server/CrowdPeerDispatcher.java | 10 +++++---- .../crowd/peer/server/CrowdPeerManager.java | 10 ++++----- .../crowd/peer/server/CrowdPeerProvider.java | 10 +++++---- .../crowd/server/BodyDispatcher.java | 3 ++- .../threerings/crowd/server/BodyProvider.java | 3 ++- .../threerings/crowd/server/CrowdServer.java | 2 ++ .../crowd/server/LocationDispatcher.java | 5 +++-- .../crowd/server/LocationManager.java | 1 - .../crowd/server/LocationProvider.java | 3 ++- .../crowd/server/LocationSender.java | 5 +++-- .../threerings/crowd/server/PlaceManager.java | 5 ++--- .../threerings/crowd/util/CrowdContext.java | 4 ++-- .../com/threerings/io/BasicStreamers.java | 1 - .../threerings/io/ByteBufferInputStream.java | 1 - .../threerings/io/ByteBufferOutputStream.java | 1 - .../com/threerings/io/FieldMarshaller.java | 1 - .../com/threerings/io/FramedInputStream.java | 1 - .../com/threerings/io/ObjectInputStream.java | 3 +-- .../com/threerings/io/ObjectOutputStream.java | 2 +- .../threerings/io/SimpleStreamableObject.java | 1 + src/java/com/threerings/io/Streamer.java | 6 ++---- .../io/UnreliableObjectOutputStream.java | 1 - .../presents/annotation/TransportHint.java | 2 +- .../presents/client/BlockingCommunicator.java | 6 ++---- .../threerings/presents/client/Client.java | 5 +++-- .../presents/client/ClientCommunicator.java | 4 ++-- .../presents/client/ClientDObjectMgr.java | 6 ++---- .../presents/client/InvocationDirector.java | 3 --- .../presents/data/ClientObject.java | 1 - .../presents/data/InvocationMarshaller.java | 2 -- .../com/threerings/presents/dobj/DObject.java | 1 - .../com/threerings/presents/dobj/DSet.java | 1 - .../presents/dobj/DynamicListener.java | 1 - .../threerings/presents/net/Credentials.java | 1 + .../presents/peer/client/PeerService.java | 1 - .../presents/peer/data/ClientInfo.java | 1 + .../peer/server/PeerAuthenticator.java | 4 +--- .../presents/peer/server/PeerClient.java | 4 ++-- .../peer/server/PeerClientFactory.java | 3 +-- .../presents/peer/server/PeerManager.java | 21 +++++++++---------- .../presents/peer/server/PeerNode.java | 4 +--- .../peer/server/persist/NodeRecord.java | 3 ++- .../presents/peer/util/PeerUtil.java | 3 +-- .../presents/server/Authenticator.java | 3 +-- .../server/ClientResolutionListener.java | 3 ++- .../presents/server/ClientResolver.java | 1 + .../presents/server/InvocationManager.java | 5 ++--- .../presents/server/InvocationSender.java | 1 - .../presents/server/PresentsClient.java | 16 ++++++-------- .../threerings/presents/server/Rejector.java | 2 +- .../presents/server/ShutdownManager.java | 3 ++- .../presents/server/TimeBaseProvider.java | 3 +-- .../presents/server/net/Connection.java | 2 -- .../server/net/ConnectionManager.java | 9 +++----- .../server/net/ConnectionObserver.java | 1 + .../presents/tools/ActionScriptSource.java | 5 ++--- .../tools/GenActionScriptBundlesTask.java | 1 - .../presents/tools/GenActionScriptTask.java | 5 ++--- .../presents/tools/GenDObjectTask.java | 6 ++---- .../presents/tools/GenReceiverTask.java | 2 -- .../presents/tools/GenServiceTask.java | 2 -- .../presents/tools/GenStreamableTask.java | 1 + .../threerings/presents/tools/GenUtil.java | 2 -- .../tools/InstrumentStreamableTask.java | 3 ++- .../presents/tools/InvocationTask.java | 5 +---- .../threerings/presents/tools/SourceFile.java | 3 +-- .../presents/util/DatagramSequencer.java | 1 - .../com/threerings/util/ActionScript.java | 2 +- .../threerings/util/StreamableHashMap.java | 2 +- .../threerings/bureau/client/TestClient.java | 6 +++--- .../threerings/crowd/client/JabberApp.java | 2 ++ .../threerings/crowd/client/JabberClient.java | 2 ++ .../threerings/crowd/client/JabberPanel.java | 1 + .../threerings/crowd/client/TestClient.java | 5 +++-- .../threerings/crowd/data/JabberConfig.java | 1 - .../threerings/crowd/server/JabberServer.java | 1 + .../src/java/com/threerings/io/FrameTest.java | 5 +++-- .../presents/client/TestClient.java | 7 +++++-- .../presents/client/TestDecoder.java | 2 -- .../presents/data/TestMarshaller.java | 3 ++- .../threerings/presents/data/TestObject.java | 3 ++- .../threerings/presents/server/DOMTest.java | 7 +++++-- .../presents/server/DestroyedRefTest.java | 10 ++++++--- .../threerings/presents/server/RefTest.java | 8 +++++-- .../presents/server/TestDispatcher.java | 3 ++- .../presents/server/TestProvider.java | 3 ++- .../presents/server/TestSender.java | 3 +-- .../presents/server/TestServer.java | 1 + 131 files changed, 261 insertions(+), 242 deletions(-) diff --git a/src/java/com/threerings/admin/client/AsStringFieldEditor.java b/src/java/com/threerings/admin/client/AsStringFieldEditor.java index b69bd9b25..e7bad77d2 100644 --- a/src/java/com/threerings/admin/client/AsStringFieldEditor.java +++ b/src/java/com/threerings/admin/client/AsStringFieldEditor.java @@ -22,6 +22,7 @@ package com.threerings.admin.client; import java.lang.reflect.Field; + import javax.swing.JTextField; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/admin/client/BooleanFieldEditor.java b/src/java/com/threerings/admin/client/BooleanFieldEditor.java index 638a96927..b08e29f1d 100644 --- a/src/java/com/threerings/admin/client/BooleanFieldEditor.java +++ b/src/java/com/threerings/admin/client/BooleanFieldEditor.java @@ -26,9 +26,8 @@ import java.lang.reflect.Field; import javax.swing.JCheckBox; import javax.swing.JPanel; -import com.samskivert.swing.HGroupLayout; - import com.samskivert.swing.GroupLayout; +import com.samskivert.swing.HGroupLayout; import com.samskivert.swing.Spacer; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/admin/client/DSetEditor.java b/src/java/com/threerings/admin/client/DSetEditor.java index 9523c0db6..d337cfdb9 100644 --- a/src/java/com/threerings/admin/client/DSetEditor.java +++ b/src/java/com/threerings/admin/client/DSetEditor.java @@ -30,11 +30,11 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; +import com.samskivert.util.ComparableArrayList; + import com.samskivert.swing.ObjectEditorTable; import com.samskivert.swing.event.CommandEvent; -import com.samskivert.util.ComparableArrayList; - import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/admin/client/FieldEditor.java b/src/java/com/threerings/admin/client/FieldEditor.java index 60299f752..b08d86824 100644 --- a/src/java/com/threerings/admin/client/FieldEditor.java +++ b/src/java/com/threerings/admin/client/FieldEditor.java @@ -32,9 +32,10 @@ import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; -import com.samskivert.swing.HGroupLayout; import com.samskivert.util.ObjectUtil; +import com.samskivert.swing.HGroupLayout; + import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/java/com/threerings/admin/data/AdminMarshaller.java index e04777f6a..d893ae522 100644 --- a/src/java/com/threerings/admin/data/AdminMarshaller.java +++ b/src/java/com/threerings/admin/data/AdminMarshaller.java @@ -21,11 +21,12 @@ package com.threerings.admin.data; -import com.threerings.admin.client.AdminService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; +import com.threerings.admin.client.AdminService; + /** * Provides the implementation of the {@link AdminService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/admin/data/ConfigObject.java b/src/java/com/threerings/admin/data/ConfigObject.java index 1c832dfc1..a746c26d3 100644 --- a/src/java/com/threerings/admin/data/ConfigObject.java +++ b/src/java/com/threerings/admin/data/ConfigObject.java @@ -22,6 +22,7 @@ package com.threerings.admin.data; import java.lang.reflect.Field; + import javax.swing.JPanel; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java index 73bd5846e..9640a0147 100644 --- a/src/java/com/threerings/admin/server/AdminDispatcher.java +++ b/src/java/com/threerings/admin/server/AdminDispatcher.java @@ -21,12 +21,13 @@ package com.threerings.admin.server; -import com.threerings.admin.client.AdminService; -import com.threerings.admin.data.AdminMarshaller; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.admin.client.AdminService; +import com.threerings.admin.data.AdminMarshaller; + /** * Dispatches requests to the {@link AdminProvider}. */ diff --git a/src/java/com/threerings/admin/server/ConfigRegistry.java b/src/java/com/threerings/admin/server/ConfigRegistry.java index 92424c1e5..bff9390bc 100644 --- a/src/java/com/threerings/admin/server/ConfigRegistry.java +++ b/src/java/com/threerings/admin/server/ConfigRegistry.java @@ -30,9 +30,11 @@ import java.util.HashMap; import com.samskivert.io.ByteArrayOutInputStream; import com.samskivert.util.StringUtil; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; + import com.threerings.presents.dobj.AccessController; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java index ae518f356..281bc5d6a 100644 --- a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java @@ -26,11 +26,12 @@ import java.util.HashMap; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.samskivert.util.Invoker; +import com.samskivert.util.StringUtil; + import com.samskivert.jdbc.WriteOnlyUnit; import com.samskivert.jdbc.depot.DatabaseException; import com.samskivert.jdbc.depot.PersistenceContext; -import com.samskivert.util.Invoker; -import com.samskivert.util.StringUtil; import com.threerings.presents.annotation.MainInvoker; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java index c6ed72053..2bab7e1af 100644 --- a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java @@ -26,11 +26,12 @@ import java.util.ArrayList; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.samskivert.io.PersistenceException; -import com.samskivert.jdbc.depot.PersistenceContext; import com.samskivert.util.Invoker; +import com.samskivert.jdbc.depot.PersistenceContext; + import com.threerings.io.Streamable; + import com.threerings.util.StreamableTuple; import com.threerings.presents.annotation.MainInvoker; diff --git a/src/java/com/threerings/bureau/client/BureauClient.java b/src/java/com/threerings/bureau/client/BureauClient.java index b3c92c0a2..343803ef7 100644 --- a/src/java/com/threerings/bureau/client/BureauClient.java +++ b/src/java/com/threerings/bureau/client/BureauClient.java @@ -21,12 +21,14 @@ package com.threerings.bureau.client; -import com.threerings.presents.client.Client; +import com.samskivert.util.Config; import com.samskivert.util.RunQueue; + +import com.threerings.presents.client.Client; +import com.threerings.presents.dobj.DObjectManager; + import com.threerings.bureau.data.BureauCredentials; import com.threerings.bureau.util.BureauContext; -import com.threerings.presents.dobj.DObjectManager; -import com.samskivert.util.Config; /** * Represents a client embedded in a bureau. diff --git a/src/java/com/threerings/bureau/client/BureauDirector.java b/src/java/com/threerings/bureau/client/BureauDirector.java index aeddfb229..0fd92c610 100644 --- a/src/java/com/threerings/bureau/client/BureauDirector.java +++ b/src/java/com/threerings/bureau/client/BureauDirector.java @@ -1,16 +1,18 @@ package com.threerings.bureau.client; -import com.threerings.presents.client.BasicDirector; -import com.threerings.bureau.data.BureauCodes; import com.samskivert.util.IntMap; import com.samskivert.util.IntMaps; -import com.threerings.bureau.data.AgentObject; -import com.threerings.bureau.server.BureauRegistry; -import com.threerings.bureau.util.BureauContext; + +import com.threerings.presents.client.BasicDirector; import com.threerings.presents.client.Client; +import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.Subscriber; import com.threerings.presents.util.SafeSubscriber; -import com.threerings.presents.dobj.ObjectAccessException; + +import com.threerings.bureau.data.AgentObject; +import com.threerings.bureau.data.BureauCodes; +import com.threerings.bureau.server.BureauRegistry; +import com.threerings.bureau.util.BureauContext; import static com.threerings.bureau.Log.log; diff --git a/src/java/com/threerings/bureau/client/BureauReceiver.java b/src/java/com/threerings/bureau/client/BureauReceiver.java index 03ac33fbc..2af8e945a 100644 --- a/src/java/com/threerings/bureau/client/BureauReceiver.java +++ b/src/java/com/threerings/bureau/client/BureauReceiver.java @@ -21,9 +21,10 @@ package com.threerings.bureau.client; -import com.threerings.bureau.data.AgentObject; import com.threerings.presents.client.InvocationReceiver; +import com.threerings.bureau.data.AgentObject; + /** * Hooks for controlling a previously launched bureau client. */ diff --git a/src/java/com/threerings/bureau/data/BureauCredentials.java b/src/java/com/threerings/bureau/data/BureauCredentials.java index 0c2074827..9e936aeb0 100644 --- a/src/java/com/threerings/bureau/data/BureauCredentials.java +++ b/src/java/com/threerings/bureau/data/BureauCredentials.java @@ -21,9 +21,10 @@ package com.threerings.bureau.data; -import com.threerings.presents.net.Credentials; import com.threerings.util.Name; +import com.threerings.presents.net.Credentials; + /** * Extends the basic credentials to provide bureau-specific fields. */ diff --git a/src/java/com/threerings/bureau/data/BureauMarshaller.java b/src/java/com/threerings/bureau/data/BureauMarshaller.java index 1b8c4e8a8..d1a6213ee 100644 --- a/src/java/com/threerings/bureau/data/BureauMarshaller.java +++ b/src/java/com/threerings/bureau/data/BureauMarshaller.java @@ -21,10 +21,11 @@ package com.threerings.bureau.data; -import com.threerings.bureau.client.BureauService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.bureau.client.BureauService; + /** * Provides the implementation of the {@link BureauService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/bureau/server/BureauAuthenticator.java b/src/java/com/threerings/bureau/server/BureauAuthenticator.java index 45d19f5d8..8229f02d0 100644 --- a/src/java/com/threerings/bureau/server/BureauAuthenticator.java +++ b/src/java/com/threerings/bureau/server/BureauAuthenticator.java @@ -1,6 +1,5 @@ package com.threerings.bureau.server; -import com.threerings.bureau.data.BureauCredentials; import com.threerings.presents.data.AuthCodes; import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; @@ -8,6 +7,8 @@ import com.threerings.presents.net.AuthResponseData; import com.threerings.presents.server.ChainedAuthenticator; import com.threerings.presents.server.net.AuthingConnection; +import com.threerings.bureau.data.BureauCredentials; + import static com.threerings.bureau.Log.log; /** diff --git a/src/java/com/threerings/bureau/server/BureauDispatcher.java b/src/java/com/threerings/bureau/server/BureauDispatcher.java index 2157b592d..912ca0d0b 100644 --- a/src/java/com/threerings/bureau/server/BureauDispatcher.java +++ b/src/java/com/threerings/bureau/server/BureauDispatcher.java @@ -21,11 +21,12 @@ package com.threerings.bureau.server; -import com.threerings.bureau.data.BureauMarshaller; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.bureau.data.BureauMarshaller; + /** * Dispatches requests to the {@link BureauProvider}. */ diff --git a/src/java/com/threerings/bureau/server/BureauProvider.java b/src/java/com/threerings/bureau/server/BureauProvider.java index 7c82c3853..43aef1369 100644 --- a/src/java/com/threerings/bureau/server/BureauProvider.java +++ b/src/java/com/threerings/bureau/server/BureauProvider.java @@ -21,10 +21,11 @@ package com.threerings.bureau.server; -import com.threerings.bureau.client.BureauService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.bureau.client.BureauService; + /** * Defines the server-side of the {@link BureauService}. */ diff --git a/src/java/com/threerings/bureau/server/BureauRegistry.java b/src/java/com/threerings/bureau/server/BureauRegistry.java index f8c1abde5..31346f352 100644 --- a/src/java/com/threerings/bureau/server/BureauRegistry.java +++ b/src/java/com/threerings/bureau/server/BureauRegistry.java @@ -21,9 +21,9 @@ package com.threerings.bureau.server; +import java.io.IOException; import java.util.Map; import java.util.Set; -import java.io.IOException; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -31,10 +31,10 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.samskivert.util.Interval; -import com.samskivert.util.RunQueue; -import com.samskivert.util.StringUtil; import com.samskivert.util.Invoker; import com.samskivert.util.ProcessLogger; +import com.samskivert.util.RunQueue; +import com.samskivert.util.StringUtil; import com.threerings.presents.annotation.MainInvoker; import com.threerings.presents.data.ClientObject; diff --git a/src/java/com/threerings/bureau/server/BureauSender.java b/src/java/com/threerings/bureau/server/BureauSender.java index e3bed6091..6413021d3 100644 --- a/src/java/com/threerings/bureau/server/BureauSender.java +++ b/src/java/com/threerings/bureau/server/BureauSender.java @@ -21,11 +21,12 @@ package com.threerings.bureau.server; -import com.threerings.bureau.client.BureauDecoder; -import com.threerings.bureau.client.BureauReceiver; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; +import com.threerings.bureau.client.BureauDecoder; +import com.threerings.bureau.client.BureauReceiver; + /** * Used to issue notifications to a {@link BureauReceiver} instance on a * client. diff --git a/src/java/com/threerings/bureau/util/BureauContext.java b/src/java/com/threerings/bureau/util/BureauContext.java index 8b5c7e840..d1c32da3f 100644 --- a/src/java/com/threerings/bureau/util/BureauContext.java +++ b/src/java/com/threerings/bureau/util/BureauContext.java @@ -22,6 +22,7 @@ package com.threerings.bureau.util; import com.threerings.presents.util.PresentsContext; + import com.threerings.bureau.client.BureauDirector; /** diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index 0bbc39c91..f5de050f1 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -37,6 +37,11 @@ import com.samskivert.util.ObserverList; import com.samskivert.util.ResultListener; import com.samskivert.util.StringUtil; +import com.threerings.util.MessageBundle; +import com.threerings.util.MessageManager; +import com.threerings.util.Name; +import com.threerings.util.TimeUtil; + import com.threerings.presents.client.BasicDirector; import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; @@ -44,23 +49,17 @@ import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.MessageEvent; import com.threerings.presents.dobj.MessageListener; -import com.threerings.util.MessageBundle; -import com.threerings.util.MessageManager; -import com.threerings.util.Name; -import com.threerings.util.TimeUtil; - -import com.threerings.crowd.client.LocationObserver; -import com.threerings.crowd.data.BodyObject; -import com.threerings.crowd.data.CrowdCodes; -import com.threerings.crowd.data.PlaceObject; -import com.threerings.crowd.util.CrowdContext; - import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.ChatMessage; import com.threerings.crowd.chat.data.SystemMessage; import com.threerings.crowd.chat.data.TellFeedbackMessage; import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.chat.data.UserSystemMessage; +import com.threerings.crowd.client.LocationObserver; +import com.threerings.crowd.data.BodyObject; +import com.threerings.crowd.data.CrowdCodes; +import com.threerings.crowd.data.PlaceObject; +import com.threerings.crowd.util.CrowdContext; import static com.threerings.crowd.Log.log; diff --git a/src/java/com/threerings/crowd/chat/client/MuteDirector.java b/src/java/com/threerings/crowd/chat/client/MuteDirector.java index 41807f8c5..edb41ba79 100644 --- a/src/java/com/threerings/crowd/chat/client/MuteDirector.java +++ b/src/java/com/threerings/crowd/chat/client/MuteDirector.java @@ -29,10 +29,10 @@ import com.samskivert.util.ObserverList; import com.threerings.util.MessageBundle; import com.threerings.util.Name; -import com.threerings.crowd.util.CrowdContext; - import com.threerings.presents.client.BasicDirector; +import com.threerings.crowd.util.CrowdContext; + /** * Manages the mutelist. * diff --git a/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java index 4e596aa6a..aa9300680 100644 --- a/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java +++ b/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java @@ -21,10 +21,11 @@ package com.threerings.crowd.chat.data; -import com.threerings.crowd.chat.client.ChannelSpeakService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.ChannelSpeakService; + /** * Provides the implementation of the {@link ChannelSpeakService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java index 949283a1d..0f1328306 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java +++ b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java @@ -21,12 +21,14 @@ package com.threerings.crowd.chat.data; -import com.threerings.crowd.chat.client.ChatService; +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.crowd.chat.client.ChatService; /** * Provides the implementation of the {@link ChatService} interface diff --git a/src/java/com/threerings/crowd/chat/data/ChatMessage.java b/src/java/com/threerings/crowd/chat/data/ChatMessage.java index f669cca13..94d1bf1de 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatMessage.java +++ b/src/java/com/threerings/crowd/chat/data/ChatMessage.java @@ -24,6 +24,7 @@ package com.threerings.crowd.chat.data; import com.samskivert.util.StringUtil; import com.threerings.io.Streamable; + import com.threerings.util.ActionScript; /** diff --git a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java index aa4fd8e86..86eb5183b 100644 --- a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java +++ b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java @@ -21,10 +21,11 @@ package com.threerings.crowd.chat.data; -import com.threerings.crowd.chat.client.SpeakService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.SpeakService; + /** * Provides the implementation of the {@link SpeakService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java index c3487deb9..417a1f745 100644 --- a/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java @@ -21,12 +21,13 @@ package com.threerings.crowd.chat.server; -import com.threerings.crowd.chat.data.ChannelSpeakMarshaller; -import com.threerings.crowd.chat.data.ChatChannel; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.crowd.chat.data.ChannelSpeakMarshaller; +import com.threerings.crowd.chat.data.ChatChannel; + /** * Dispatches requests to the {@link ChannelSpeakProvider}. */ diff --git a/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java b/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java index 59bea767d..9da0d2f6b 100644 --- a/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java +++ b/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java @@ -21,11 +21,12 @@ package com.threerings.crowd.chat.server; -import com.threerings.crowd.chat.client.ChannelSpeakService; -import com.threerings.crowd.chat.data.ChatChannel; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.chat.client.ChannelSpeakService; +import com.threerings.crowd.chat.data.ChatChannel; + /** * Defines the server-side of the {@link ChannelSpeakService}. */ diff --git a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java index 29c2a8fa3..7140c05b9 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java +++ b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java @@ -132,6 +132,7 @@ public abstract class ChatChannelManager // create and start our idle channel closer (always be closing) _closer = new Interval(omgr) { + @Override public void expired () { closeIdleChannels(); } diff --git a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java index bf45d27b1..8cb15a1ca 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java @@ -21,13 +21,15 @@ package com.threerings.crowd.chat.server; -import com.threerings.crowd.chat.client.ChatService; -import com.threerings.crowd.chat.data.ChatMarshaller; +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.crowd.chat.client.ChatService; +import com.threerings.crowd.chat.data.ChatMarshaller; /** * Dispatches requests to the {@link ChatProvider}. diff --git a/src/java/com/threerings/crowd/chat/server/ChatProvider.java b/src/java/com/threerings/crowd/chat/server/ChatProvider.java index 776207f41..93beaf40f 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatProvider.java +++ b/src/java/com/threerings/crowd/chat/server/ChatProvider.java @@ -27,6 +27,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.samskivert.util.StringUtil; + import com.threerings.util.MessageBundle; import com.threerings.util.Name; import com.threerings.util.TimeUtil; @@ -34,11 +35,14 @@ import com.threerings.util.TimeUtil; import com.threerings.presents.client.InvocationService.InvocationListener; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.DObject; - import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.chat.client.ChatService; +import com.threerings.crowd.chat.client.ChatService.TellListener; +import com.threerings.crowd.chat.data.ChatCodes; +import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.CrowdCodes; import com.threerings.crowd.data.OccupantInfo; @@ -46,11 +50,6 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.BodyLocator; import com.threerings.crowd.server.PlaceRegistry; -import com.threerings.crowd.chat.client.ChatService.TellListener; -import com.threerings.crowd.chat.client.ChatService; -import com.threerings.crowd.chat.data.ChatCodes; -import com.threerings.crowd.chat.data.UserMessage; - /** * The chat provider handles the server side of the chat-related invocation services. */ diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java index 01640722a..cc8d52f26 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java @@ -21,11 +21,12 @@ package com.threerings.crowd.chat.server; -import com.threerings.crowd.chat.data.SpeakMarshaller; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.crowd.chat.data.SpeakMarshaller; + /** * Dispatches requests to the {@link SpeakProvider}. */ diff --git a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java index a350e4a85..9c079d788 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java @@ -21,10 +21,11 @@ package com.threerings.crowd.chat.server; -import com.threerings.crowd.chat.client.SpeakService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.chat.client.SpeakService; + /** * Defines the server-side of the {@link SpeakService}. */ diff --git a/src/java/com/threerings/crowd/chat/server/SpeakUtil.java b/src/java/com/threerings/crowd/chat/server/SpeakUtil.java index c5843e03e..84a4b9d3c 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakUtil.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakUtil.java @@ -28,18 +28,18 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.samskivert.util.ObserverList; + import com.threerings.util.Name; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.RootDObjectManager; -import com.threerings.crowd.data.BodyObject; - import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.ChatMessage; import com.threerings.crowd.chat.data.SpeakObject; import com.threerings.crowd.chat.data.SystemMessage; import com.threerings.crowd.chat.data.UserMessage; +import com.threerings.crowd.data.BodyObject; import static com.threerings.crowd.Log.log; diff --git a/src/java/com/threerings/crowd/client/LocationDirector.java b/src/java/com/threerings/crowd/client/LocationDirector.java index f7c1c11f8..148c50f43 100644 --- a/src/java/com/threerings/crowd/client/LocationDirector.java +++ b/src/java/com/threerings/crowd/client/LocationDirector.java @@ -22,15 +22,14 @@ package com.threerings.crowd.client; import com.samskivert.util.ObserverList; -import com.samskivert.util.ObserverList.ObserverOp; import com.samskivert.util.ResultListener; +import com.samskivert.util.ObserverList.ObserverOp; import com.threerings.presents.client.BasicDirector; import com.threerings.presents.client.Client; -import com.threerings.presents.util.SafeSubscriber; - import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.Subscriber; +import com.threerings.presents.util.SafeSubscriber; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.CrowdCodes; diff --git a/src/java/com/threerings/crowd/client/OccupantDirector.java b/src/java/com/threerings/crowd/client/OccupantDirector.java index c83b4e7b0..a6fb1d259 100644 --- a/src/java/com/threerings/crowd/client/OccupantDirector.java +++ b/src/java/com/threerings/crowd/client/OccupantDirector.java @@ -22,6 +22,7 @@ package com.threerings.crowd.client; import com.samskivert.util.ObserverList; + import com.threerings.util.Name; import com.threerings.presents.client.BasicDirector; diff --git a/src/java/com/threerings/crowd/client/PlaceController.java b/src/java/com/threerings/crowd/client/PlaceController.java index 414b940b8..150af39e0 100644 --- a/src/java/com/threerings/crowd/client/PlaceController.java +++ b/src/java/com/threerings/crowd/client/PlaceController.java @@ -23,6 +23,7 @@ package com.threerings.crowd.client; import java.awt.event.ActionEvent; import java.util.ArrayList; + import com.samskivert.swing.Controller; import com.threerings.crowd.data.PlaceConfig; diff --git a/src/java/com/threerings/crowd/data/BodyMarshaller.java b/src/java/com/threerings/crowd/data/BodyMarshaller.java index d13e5f826..a59789cca 100644 --- a/src/java/com/threerings/crowd/data/BodyMarshaller.java +++ b/src/java/com/threerings/crowd/data/BodyMarshaller.java @@ -21,10 +21,11 @@ package com.threerings.crowd.data; -import com.threerings.crowd.client.BodyService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.client.BodyService; + /** * Provides the implementation of the {@link BodyService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/crowd/data/LocationMarshaller.java b/src/java/com/threerings/crowd/data/LocationMarshaller.java index 7f4f5d274..49e887d07 100644 --- a/src/java/com/threerings/crowd/data/LocationMarshaller.java +++ b/src/java/com/threerings/crowd/data/LocationMarshaller.java @@ -21,11 +21,12 @@ package com.threerings.crowd.data; -import com.threerings.crowd.client.LocationService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; +import com.threerings.crowd.client.LocationService; + /** * Provides the implementation of the {@link LocationService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java index 1a25cd0b4..66ccc8351 100644 --- a/src/java/com/threerings/crowd/data/OccupantInfo.java +++ b/src/java/com/threerings/crowd/data/OccupantInfo.java @@ -22,6 +22,7 @@ package com.threerings.crowd.data; import com.threerings.io.SimpleStreamableObject; + import com.threerings.util.Name; import com.threerings.presents.dobj.DSet; diff --git a/src/java/com/threerings/crowd/data/PlaceConfig.java b/src/java/com/threerings/crowd/data/PlaceConfig.java index de32c5ffa..b26b72fe2 100644 --- a/src/java/com/threerings/crowd/data/PlaceConfig.java +++ b/src/java/com/threerings/crowd/data/PlaceConfig.java @@ -24,6 +24,7 @@ package com.threerings.crowd.data; import com.samskivert.util.StringUtil; import com.threerings.io.SimpleStreamableObject; + import com.threerings.util.ActionScript; import com.threerings.crowd.client.PlaceController; diff --git a/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java index b5d180de1..fc28420a0 100644 --- a/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java +++ b/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java @@ -21,13 +21,15 @@ package com.threerings.crowd.peer.data; +import com.threerings.util.Name; + +import com.threerings.presents.client.Client; +import com.threerings.presents.data.InvocationMarshaller; + import com.threerings.crowd.chat.client.ChatService; import com.threerings.crowd.chat.data.ChatMarshaller; import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.peer.client.CrowdPeerService; -import com.threerings.presents.client.Client; -import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.util.Name; /** * Provides the implementation of the {@link CrowdPeerService} interface diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java index 347781015..de2e32bb6 100644 --- a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java +++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java @@ -21,13 +21,15 @@ package com.threerings.crowd.peer.server; -import com.threerings.crowd.chat.client.ChatService; -import com.threerings.crowd.chat.data.UserMessage; -import com.threerings.crowd.peer.data.CrowdPeerMarshaller; +import com.threerings.util.Name; + 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.crowd.chat.client.ChatService; +import com.threerings.crowd.chat.data.UserMessage; +import com.threerings.crowd.peer.data.CrowdPeerMarshaller; /** * Dispatches requests to the {@link CrowdPeerProvider}. diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java index e50440dce..efb0c825d 100644 --- a/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java +++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java @@ -26,21 +26,19 @@ import com.google.inject.Inject; import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; +import com.threerings.presents.peer.data.ClientInfo; +import com.threerings.presents.peer.data.NodeObject; +import com.threerings.presents.peer.server.PeerManager; +import com.threerings.presents.peer.server.PeerNode; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.PresentsClient; import com.threerings.presents.server.ShutdownManager; -import com.threerings.presents.peer.data.ClientInfo; -import com.threerings.presents.peer.data.NodeObject; -import com.threerings.presents.peer.server.PeerManager; -import com.threerings.presents.peer.server.PeerNode; - import com.threerings.crowd.chat.client.ChatService; import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.chat.server.ChatProvider; import com.threerings.crowd.data.BodyObject; - import com.threerings.crowd.peer.data.CrowdClientInfo; import com.threerings.crowd.peer.data.CrowdNodeObject; diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java index 2980a74bf..5d15cd65d 100644 --- a/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java +++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java @@ -21,13 +21,15 @@ package com.threerings.crowd.peer.server; -import com.threerings.crowd.chat.client.ChatService; -import com.threerings.crowd.chat.data.UserMessage; -import com.threerings.crowd.peer.client.CrowdPeerService; +import com.threerings.util.Name; + 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.crowd.chat.client.ChatService; +import com.threerings.crowd.chat.data.UserMessage; +import com.threerings.crowd.peer.client.CrowdPeerService; /** * Defines the server-side of the {@link CrowdPeerService}. diff --git a/src/java/com/threerings/crowd/server/BodyDispatcher.java b/src/java/com/threerings/crowd/server/BodyDispatcher.java index d5488643e..6636130ef 100644 --- a/src/java/com/threerings/crowd/server/BodyDispatcher.java +++ b/src/java/com/threerings/crowd/server/BodyDispatcher.java @@ -21,11 +21,12 @@ package com.threerings.crowd.server; -import com.threerings.crowd.data.BodyMarshaller; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.crowd.data.BodyMarshaller; + /** * Dispatches requests to the {@link BodyProvider}. */ diff --git a/src/java/com/threerings/crowd/server/BodyProvider.java b/src/java/com/threerings/crowd/server/BodyProvider.java index b1a12e0aa..48c6dd4db 100644 --- a/src/java/com/threerings/crowd/server/BodyProvider.java +++ b/src/java/com/threerings/crowd/server/BodyProvider.java @@ -21,10 +21,11 @@ package com.threerings.crowd.server; -import com.threerings.crowd.client.BodyService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.client.BodyService; + /** * Defines the server-side of the {@link BodyService}. */ diff --git a/src/java/com/threerings/crowd/server/CrowdServer.java b/src/java/com/threerings/crowd/server/CrowdServer.java index c9e874585..d214e9ada 100644 --- a/src/java/com/threerings/crowd/server/CrowdServer.java +++ b/src/java/com/threerings/crowd/server/CrowdServer.java @@ -25,6 +25,7 @@ import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; + import com.threerings.util.Name; import com.threerings.presents.net.AuthRequest; @@ -32,6 +33,7 @@ import com.threerings.presents.server.ClientFactory; import com.threerings.presents.server.ClientResolver; import com.threerings.presents.server.PresentsClient; import com.threerings.presents.server.PresentsServer; + import com.threerings.crowd.chat.server.ChatProvider; import static com.threerings.crowd.Log.log; diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/java/com/threerings/crowd/server/LocationDispatcher.java index a13bc1786..4ea5f0ed9 100644 --- a/src/java/com/threerings/crowd/server/LocationDispatcher.java +++ b/src/java/com/threerings/crowd/server/LocationDispatcher.java @@ -21,12 +21,13 @@ package com.threerings.crowd.server; -import com.threerings.crowd.client.LocationService; -import com.threerings.crowd.data.LocationMarshaller; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; +import com.threerings.crowd.client.LocationService; +import com.threerings.crowd.data.LocationMarshaller; + /** * Dispatches requests to the {@link LocationProvider}. */ diff --git a/src/java/com/threerings/crowd/server/LocationManager.java b/src/java/com/threerings/crowd/server/LocationManager.java index f3ffe64dc..fceb6385e 100644 --- a/src/java/com/threerings/crowd/server/LocationManager.java +++ b/src/java/com/threerings/crowd/server/LocationManager.java @@ -26,7 +26,6 @@ import com.google.inject.Singleton; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.RootDObjectManager; - import com.threerings.presents.server.ClientManager; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationManager; diff --git a/src/java/com/threerings/crowd/server/LocationProvider.java b/src/java/com/threerings/crowd/server/LocationProvider.java index c3d2b7beb..e1c6cf935 100644 --- a/src/java/com/threerings/crowd/server/LocationProvider.java +++ b/src/java/com/threerings/crowd/server/LocationProvider.java @@ -21,11 +21,12 @@ package com.threerings.crowd.server; -import com.threerings.crowd.client.LocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.client.LocationService; + /** * Defines the server-side of the {@link LocationService}. */ diff --git a/src/java/com/threerings/crowd/server/LocationSender.java b/src/java/com/threerings/crowd/server/LocationSender.java index 6ef8333c4..e461795ff 100644 --- a/src/java/com/threerings/crowd/server/LocationSender.java +++ b/src/java/com/threerings/crowd/server/LocationSender.java @@ -21,11 +21,12 @@ package com.threerings.crowd.server; -import com.threerings.crowd.client.LocationDecoder; -import com.threerings.crowd.client.LocationReceiver; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; +import com.threerings.crowd.client.LocationDecoder; +import com.threerings.crowd.client.LocationReceiver; + /** * Used to issue notifications to a {@link LocationReceiver} instance on a * client. diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java index e4252e246..e2220930f 100644 --- a/src/java/com/threerings/crowd/server/PlaceManager.java +++ b/src/java/com/threerings/crowd/server/PlaceManager.java @@ -49,15 +49,14 @@ import com.threerings.presents.dobj.RootDObjectManager; import com.threerings.presents.dobj.SetAdapter; import com.threerings.presents.server.InvocationManager; +import com.threerings.crowd.chat.server.SpeakDispatcher; +import com.threerings.crowd.chat.server.SpeakHandler; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.OccupantInfo; import com.threerings.crowd.data.Place; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; -import com.threerings.crowd.chat.server.SpeakDispatcher; -import com.threerings.crowd.chat.server.SpeakHandler; - import static com.threerings.crowd.Log.log; /** diff --git a/src/java/com/threerings/crowd/util/CrowdContext.java b/src/java/com/threerings/crowd/util/CrowdContext.java index 0e04d5fbb..1ebb2c84c 100644 --- a/src/java/com/threerings/crowd/util/CrowdContext.java +++ b/src/java/com/threerings/crowd/util/CrowdContext.java @@ -22,12 +22,12 @@ package com.threerings.crowd.util; import com.threerings.presents.util.PresentsContext; + +import com.threerings.crowd.chat.client.ChatDirector; import com.threerings.crowd.client.LocationDirector; import com.threerings.crowd.client.OccupantDirector; import com.threerings.crowd.client.PlaceView; -import com.threerings.crowd.chat.client.ChatDirector; - /** * The crowd context provides access to the various managers, etc. that * are needed by the crowd client code. diff --git a/src/java/com/threerings/io/BasicStreamers.java b/src/java/com/threerings/io/BasicStreamers.java index bf0cef4d3..26293eba8 100644 --- a/src/java/com/threerings/io/BasicStreamers.java +++ b/src/java/com/threerings/io/BasicStreamers.java @@ -23,7 +23,6 @@ package com.threerings.io; import java.io.EOFException; import java.io.IOException; - import java.util.ArrayList; import java.util.List; import java.util.RandomAccess; diff --git a/src/java/com/threerings/io/ByteBufferInputStream.java b/src/java/com/threerings/io/ByteBufferInputStream.java index f6a22bda3..35e57e8ce 100644 --- a/src/java/com/threerings/io/ByteBufferInputStream.java +++ b/src/java/com/threerings/io/ByteBufferInputStream.java @@ -5,7 +5,6 @@ package com.threerings.io; import java.io.IOException; import java.io.InputStream; - import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.InvalidMarkException; diff --git a/src/java/com/threerings/io/ByteBufferOutputStream.java b/src/java/com/threerings/io/ByteBufferOutputStream.java index 913d9732e..44bf7e218 100644 --- a/src/java/com/threerings/io/ByteBufferOutputStream.java +++ b/src/java/com/threerings/io/ByteBufferOutputStream.java @@ -4,7 +4,6 @@ package com.threerings.io; import java.io.OutputStream; - import java.nio.BufferOverflowException; import java.nio.ByteBuffer; diff --git a/src/java/com/threerings/io/FieldMarshaller.java b/src/java/com/threerings/io/FieldMarshaller.java index a6085d253..348aae8a0 100644 --- a/src/java/com/threerings/io/FieldMarshaller.java +++ b/src/java/com/threerings/io/FieldMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.io; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ReflectPermission; - import java.util.Date; import java.util.HashMap; diff --git a/src/java/com/threerings/io/FramedInputStream.java b/src/java/com/threerings/io/FramedInputStream.java index 4f496ec26..6580a71f1 100644 --- a/src/java/com/threerings/io/FramedInputStream.java +++ b/src/java/com/threerings/io/FramedInputStream.java @@ -24,7 +24,6 @@ package com.threerings.io; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; - import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; diff --git a/src/java/com/threerings/io/ObjectInputStream.java b/src/java/com/threerings/io/ObjectInputStream.java index 5b267f3ae..da32d0632 100644 --- a/src/java/com/threerings/io/ObjectInputStream.java +++ b/src/java/com/threerings/io/ObjectInputStream.java @@ -21,10 +21,9 @@ package com.threerings.io; -import java.io.InputStream; import java.io.DataInputStream; import java.io.IOException; - +import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/java/com/threerings/io/ObjectOutputStream.java b/src/java/com/threerings/io/ObjectOutputStream.java index 19267f2bf..2719f8fe7 100644 --- a/src/java/com/threerings/io/ObjectOutputStream.java +++ b/src/java/com/threerings/io/ObjectOutputStream.java @@ -21,9 +21,9 @@ package com.threerings.io; -import java.io.OutputStream; import java.io.DataOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.util.HashMap; import java.util.Map; diff --git a/src/java/com/threerings/io/SimpleStreamableObject.java b/src/java/com/threerings/io/SimpleStreamableObject.java index e0c651d26..c9f6a233e 100644 --- a/src/java/com/threerings/io/SimpleStreamableObject.java +++ b/src/java/com/threerings/io/SimpleStreamableObject.java @@ -22,6 +22,7 @@ package com.threerings.io; import com.samskivert.util.StringUtil; + import com.threerings.util.ActionScript; /** diff --git a/src/java/com/threerings/io/Streamer.java b/src/java/com/threerings/io/Streamer.java index 7cba0e919..97b4ccb16 100644 --- a/src/java/com/threerings/io/Streamer.java +++ b/src/java/com/threerings/io/Streamer.java @@ -21,17 +21,15 @@ package com.threerings.io; +import java.io.IOException; import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; - import java.security.AccessController; -import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; - -import java.io.IOException; +import java.security.PrivilegedExceptionAction; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/java/com/threerings/io/UnreliableObjectOutputStream.java b/src/java/com/threerings/io/UnreliableObjectOutputStream.java index 250809ee5..a4b15f636 100644 --- a/src/java/com/threerings/io/UnreliableObjectOutputStream.java +++ b/src/java/com/threerings/io/UnreliableObjectOutputStream.java @@ -5,7 +5,6 @@ package com.threerings.io; import java.io.IOException; import java.io.OutputStream; - import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/src/java/com/threerings/presents/annotation/TransportHint.java b/src/java/com/threerings/presents/annotation/TransportHint.java index 96cd3142c..fabe378b8 100644 --- a/src/java/com/threerings/presents/annotation/TransportHint.java +++ b/src/java/com/threerings/presents/annotation/TransportHint.java @@ -22,9 +22,9 @@ package com.threerings.presents.annotation; import java.lang.annotation.ElementType; -import java.lang.annotation.Target; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import com.threerings.presents.net.Transport; diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/java/com/threerings/presents/client/BlockingCommunicator.java index 10654f661..46cf7d365 100644 --- a/src/java/com/threerings/presents/client/BlockingCommunicator.java +++ b/src/java/com/threerings/presents/client/BlockingCommunicator.java @@ -24,16 +24,14 @@ package com.threerings.presents.client; import java.io.EOFException; import java.io.IOException; import java.io.InterruptedIOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousCloseException; import java.nio.channels.DatagramChannel; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; - -import java.net.InetAddress; -import java.net.InetSocketAddress; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java index 4aaad7c12..b8f4a3c6e 100644 --- a/src/java/com/threerings/presents/client/Client.java +++ b/src/java/com/threerings/presents/client/Client.java @@ -21,8 +21,6 @@ package com.threerings.presents.client; -import static com.threerings.presents.Log.log; - import java.util.HashSet; import com.samskivert.util.Interval; @@ -30,6 +28,7 @@ import com.samskivert.util.ObserverList; import com.samskivert.util.RunAnywhere; import com.samskivert.util.RunQueue; import com.samskivert.util.StringUtil; + import com.threerings.presents.client.InvocationService.ConfirmListener; import com.threerings.presents.data.AuthCodes; import com.threerings.presents.data.ClientObject; @@ -43,6 +42,8 @@ import com.threerings.presents.net.Credentials; import com.threerings.presents.net.PingRequest; import com.threerings.presents.net.PongResponse; +import static com.threerings.presents.Log.log; + /** * Through the client object, a connection to the system is established and maintained. The client * object maintains two separate threads (a reader and a writer) by which all network traffic is diff --git a/src/java/com/threerings/presents/client/ClientCommunicator.java b/src/java/com/threerings/presents/client/ClientCommunicator.java index e17987aaf..bad7e9c19 100644 --- a/src/java/com/threerings/presents/client/ClientCommunicator.java +++ b/src/java/com/threerings/presents/client/ClientCommunicator.java @@ -22,16 +22,16 @@ package com.threerings.presents.client; import java.io.IOException; - import java.net.ConnectException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.nio.channels.SocketChannel; -import com.samskivert.swing.RuntimeAdjust; import com.samskivert.util.IntListUtil; import com.samskivert.util.Interval; +import com.samskivert.swing.RuntimeAdjust; + import com.threerings.presents.data.AuthCodes; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index 1cf49f549..3066a69f0 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -22,7 +22,6 @@ package com.threerings.presents.client; import java.awt.event.KeyEvent; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -30,10 +29,10 @@ import java.util.List; import com.samskivert.util.DebugChords; import com.samskivert.util.HashIntMap; -import com.samskivert.util.Queue; -import com.samskivert.util.StringUtil; import com.samskivert.util.IntMap; import com.samskivert.util.Interval; +import com.samskivert.util.Queue; +import com.samskivert.util.StringUtil; import com.threerings.presents.dobj.CompoundEvent; import com.threerings.presents.dobj.DEvent; @@ -42,7 +41,6 @@ import com.threerings.presents.dobj.DObjectManager; import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.ObjectDestroyedEvent; import com.threerings.presents.dobj.Subscriber; - import com.threerings.presents.net.BootstrapData; import com.threerings.presents.net.BootstrapNotification; import com.threerings.presents.net.DownstreamMessage; diff --git a/src/java/com/threerings/presents/client/InvocationDirector.java b/src/java/com/threerings/presents/client/InvocationDirector.java index 2b5e5c0cf..cdbb7818d 100644 --- a/src/java/com/threerings/presents/client/InvocationDirector.java +++ b/src/java/com/threerings/presents/client/InvocationDirector.java @@ -28,10 +28,8 @@ import com.samskivert.util.HashIntMap; import com.samskivert.util.StringUtil; import com.threerings.presents.client.InvocationReceiver.Registration; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller.ListenerMarshaller; - import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObjectManager; import com.threerings.presents.dobj.DSet; @@ -42,7 +40,6 @@ import com.threerings.presents.dobj.InvocationResponseEvent; import com.threerings.presents.dobj.MessageEvent; import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.Subscriber; - import com.threerings.presents.net.Transport; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/data/ClientObject.java b/src/java/com/threerings/presents/data/ClientObject.java index 6cf5c5dbc..7773266d0 100644 --- a/src/java/com/threerings/presents/data/ClientObject.java +++ b/src/java/com/threerings/presents/data/ClientObject.java @@ -22,7 +22,6 @@ package com.threerings.presents.data; import com.threerings.presents.client.InvocationReceiver; - import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DSet; diff --git a/src/java/com/threerings/presents/data/InvocationMarshaller.java b/src/java/com/threerings/presents/data/InvocationMarshaller.java index e3d8452a9..67a013098 100644 --- a/src/java/com/threerings/presents/data/InvocationMarshaller.java +++ b/src/java/com/threerings/presents/data/InvocationMarshaller.java @@ -27,10 +27,8 @@ import com.threerings.io.Streamable; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; - import com.threerings.presents.dobj.DObjectManager; import com.threerings.presents.dobj.InvocationResponseEvent; - import com.threerings.presents.net.Transport; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index 18dcf0497..e2112a648 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -22,7 +22,6 @@ package com.threerings.presents.dobj; import java.lang.reflect.Field; - import java.util.Arrays; import java.util.Comparator; import java.util.Map; diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java index c452a143d..f04bb4a50 100644 --- a/src/java/com/threerings/presents/dobj/DSet.java +++ b/src/java/com/threerings/presents/dobj/DSet.java @@ -22,7 +22,6 @@ package com.threerings.presents.dobj; import java.io.IOException; - import java.util.AbstractSet; import java.util.Comparator; import java.util.ConcurrentModificationException; diff --git a/src/java/com/threerings/presents/dobj/DynamicListener.java b/src/java/com/threerings/presents/dobj/DynamicListener.java index 5b821e47e..b168d8aba 100644 --- a/src/java/com/threerings/presents/dobj/DynamicListener.java +++ b/src/java/com/threerings/presents/dobj/DynamicListener.java @@ -22,7 +22,6 @@ package com.threerings.presents.dobj; import java.lang.reflect.Method; - import java.util.HashMap; import com.samskivert.util.MethodFinder; diff --git a/src/java/com/threerings/presents/net/Credentials.java b/src/java/com/threerings/presents/net/Credentials.java index 846ef868b..af87bdaf8 100644 --- a/src/java/com/threerings/presents/net/Credentials.java +++ b/src/java/com/threerings/presents/net/Credentials.java @@ -22,6 +22,7 @@ package com.threerings.presents.net; import com.threerings.io.Streamable; + import com.threerings.util.Name; /** diff --git a/src/java/com/threerings/presents/peer/client/PeerService.java b/src/java/com/threerings/presents/peer/client/PeerService.java index 04ab564cd..07fce971b 100644 --- a/src/java/com/threerings/presents/peer/client/PeerService.java +++ b/src/java/com/threerings/presents/peer/client/PeerService.java @@ -23,7 +23,6 @@ package com.threerings.presents.peer.client; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; - import com.threerings.presents.peer.data.NodeObject.Lock; /** diff --git a/src/java/com/threerings/presents/peer/data/ClientInfo.java b/src/java/com/threerings/presents/peer/data/ClientInfo.java index 0986184b2..fc60423e9 100644 --- a/src/java/com/threerings/presents/peer/data/ClientInfo.java +++ b/src/java/com/threerings/presents/peer/data/ClientInfo.java @@ -22,6 +22,7 @@ package com.threerings.presents.peer.data; import com.threerings.io.SimpleStreamableObject; + import com.threerings.util.Name; import com.threerings.presents.dobj.DSet; diff --git a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java index 2d54a6833..18d41bead 100644 --- a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java +++ b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java @@ -24,15 +24,13 @@ package com.threerings.presents.peer.server; import com.samskivert.io.PersistenceException; import com.threerings.presents.data.AuthCodes; - import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; import com.threerings.presents.net.AuthResponseData; +import com.threerings.presents.peer.net.PeerCreds; import com.threerings.presents.server.ChainedAuthenticator; import com.threerings.presents.server.net.AuthingConnection; -import com.threerings.presents.peer.net.PeerCreds; - import static com.threerings.presents.Log.log; /** diff --git a/src/java/com/threerings/presents/peer/server/PeerClient.java b/src/java/com/threerings/presents/peer/server/PeerClient.java index 2d120584b..9de0b369a 100644 --- a/src/java/com/threerings/presents/peer/server/PeerClient.java +++ b/src/java/com/threerings/presents/peer/server/PeerClient.java @@ -22,14 +22,14 @@ package com.threerings.presents.peer.server; import com.google.inject.Inject; + import com.samskivert.util.Throttle; import com.threerings.presents.dobj.DObject; import com.threerings.presents.net.BootstrapData; -import com.threerings.presents.server.PresentsClient; - import com.threerings.presents.peer.data.NodeObject; import com.threerings.presents.peer.net.PeerBootstrapData; +import com.threerings.presents.server.PresentsClient; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/peer/server/PeerClientFactory.java b/src/java/com/threerings/presents/peer/server/PeerClientFactory.java index 116774c30..730837a97 100644 --- a/src/java/com/threerings/presents/peer/server/PeerClientFactory.java +++ b/src/java/com/threerings/presents/peer/server/PeerClientFactory.java @@ -24,12 +24,11 @@ package com.threerings.presents.peer.server; import com.threerings.util.Name; import com.threerings.presents.net.AuthRequest; +import com.threerings.presents.peer.net.PeerCreds; import com.threerings.presents.server.ClientFactory; import com.threerings.presents.server.ClientResolver; import com.threerings.presents.server.PresentsClient; -import com.threerings.presents.peer.net.PeerCreds; - /** * Handles resolution of peer servers and passes non-peer resolution requests through to a normal * factory. diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index ee39991de..8aef35179 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -23,7 +23,6 @@ package com.threerings.presents.peer.server; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; - import java.util.List; import java.util.Map; @@ -32,8 +31,6 @@ import com.google.common.collect.Maps; import com.google.inject.Inject; import com.google.inject.Injector; -import com.samskivert.jdbc.RepositoryUnit; -import com.samskivert.jdbc.WriteOnlyUnit; import com.samskivert.util.ArrayIntSet; import com.samskivert.util.ChainedResultListener; import com.samskivert.util.Interval; @@ -43,12 +40,17 @@ import com.samskivert.util.ResultListener; import com.samskivert.util.ResultListenerList; import com.samskivert.util.Tuple; +import com.samskivert.jdbc.RepositoryUnit; +import com.samskivert.jdbc.WriteOnlyUnit; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; + import com.threerings.util.Name; import com.threerings.presents.annotation.MainInvoker; +import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.EntryAddedEvent; @@ -57,8 +59,11 @@ import com.threerings.presents.dobj.EntryUpdatedEvent; import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.SetListener; import com.threerings.presents.dobj.Subscriber; - -import com.threerings.presents.client.Client; +import com.threerings.presents.peer.data.ClientInfo; +import com.threerings.presents.peer.data.NodeObject; +import com.threerings.presents.peer.net.PeerCreds; +import com.threerings.presents.peer.server.persist.NodeRecord; +import com.threerings.presents.peer.server.persist.NodeRepository; import com.threerings.presents.server.ClientManager; import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.PresentsClient; @@ -66,12 +71,6 @@ import com.threerings.presents.server.PresentsDObjectMgr; import com.threerings.presents.server.ShutdownManager; import com.threerings.presents.server.net.ConnectionManager; -import com.threerings.presents.peer.data.ClientInfo; -import com.threerings.presents.peer.data.NodeObject; -import com.threerings.presents.peer.net.PeerCreds; -import com.threerings.presents.peer.server.persist.NodeRecord; -import com.threerings.presents.peer.server.persist.NodeRepository; - import static com.threerings.presents.Log.log; /** diff --git a/src/java/com/threerings/presents/peer/server/PeerNode.java b/src/java/com/threerings/presents/peer/server/PeerNode.java index f1e614411..b8ae32a27 100644 --- a/src/java/com/threerings/presents/peer/server/PeerNode.java +++ b/src/java/com/threerings/presents/peer/server/PeerNode.java @@ -30,18 +30,16 @@ import com.threerings.presents.client.BlockingCommunicator; import com.threerings.presents.client.Client; import com.threerings.presents.client.ClientObserver; import com.threerings.presents.client.Communicator; -import com.threerings.presents.server.PresentsDObjectMgr; - import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.Subscriber; - import com.threerings.presents.peer.data.NodeObject; import com.threerings.presents.peer.net.PeerBootstrapData; import com.threerings.presents.peer.server.persist.NodeRecord; +import com.threerings.presents.server.PresentsDObjectMgr; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java b/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java index 94134a7b4..e026e78c2 100644 --- a/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java +++ b/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java @@ -23,13 +23,14 @@ package com.threerings.presents.peer.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; import com.samskivert.jdbc.depot.annotation.Entity; import com.samskivert.jdbc.depot.annotation.Id; import com.samskivert.jdbc.depot.expression.ColumnExp; -import com.samskivert.util.StringUtil; /** * Contains information on an active node in a Presents server cluster. diff --git a/src/java/com/threerings/presents/peer/util/PeerUtil.java b/src/java/com/threerings/presents/peer/util/PeerUtil.java index 3649beed8..db0ba22ba 100644 --- a/src/java/com/threerings/presents/peer/util/PeerUtil.java +++ b/src/java/com/threerings/presents/peer/util/PeerUtil.java @@ -21,11 +21,10 @@ package com.threerings.presents.peer.util; -import java.util.HashMap; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.HashMap; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; diff --git a/src/java/com/threerings/presents/server/Authenticator.java b/src/java/com/threerings/presents/server/Authenticator.java index 589e3633f..edc1390b1 100644 --- a/src/java/com/threerings/presents/server/Authenticator.java +++ b/src/java/com/threerings/presents/server/Authenticator.java @@ -25,12 +25,11 @@ import com.samskivert.util.Invoker; import com.samskivert.util.ResultListener; import com.threerings.presents.data.AuthCodes; - import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; import com.threerings.presents.net.AuthResponseData; - import com.threerings.presents.server.net.AuthingConnection; + import static com.threerings.presents.Log.log; /** diff --git a/src/java/com/threerings/presents/server/ClientResolutionListener.java b/src/java/com/threerings/presents/server/ClientResolutionListener.java index 6f47990ec..b82491cd7 100644 --- a/src/java/com/threerings/presents/server/ClientResolutionListener.java +++ b/src/java/com/threerings/presents/server/ClientResolutionListener.java @@ -21,9 +21,10 @@ package com.threerings.presents.server; -import com.threerings.presents.data.ClientObject; import com.threerings.util.Name; +import com.threerings.presents.data.ClientObject; + /** * Entites that wish to resolve client objects must implement this * interface so as to partake in the asynchronous process of client diff --git a/src/java/com/threerings/presents/server/ClientResolver.java b/src/java/com/threerings/presents/server/ClientResolver.java index f6e6fa486..bc8a25fef 100644 --- a/src/java/com/threerings/presents/server/ClientResolver.java +++ b/src/java/com/threerings/presents/server/ClientResolver.java @@ -27,6 +27,7 @@ import com.google.common.collect.Lists; import com.google.inject.Inject; import com.samskivert.util.Invoker; + import com.threerings.util.Name; import com.threerings.presents.annotation.MainInvoker; diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index 7d03cdab9..0a216d356 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/src/java/com/threerings/presents/server/InvocationManager.java @@ -29,17 +29,16 @@ import com.google.common.collect.Maps; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.samskivert.util.IntMaps; import com.samskivert.util.IntMap; +import com.samskivert.util.IntMaps; import com.samskivert.util.LRUHashMap; import com.samskivert.util.StringUtil; import com.threerings.io.Streamable; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller.ListenerMarshaller; import com.threerings.presents.data.InvocationMarshaller; - +import com.threerings.presents.data.InvocationMarshaller.ListenerMarshaller; import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.EventListener; diff --git a/src/java/com/threerings/presents/server/InvocationSender.java b/src/java/com/threerings/presents/server/InvocationSender.java index ba0ea8c29..e66d7f21e 100644 --- a/src/java/com/threerings/presents/server/InvocationSender.java +++ b/src/java/com/threerings/presents/server/InvocationSender.java @@ -24,7 +24,6 @@ package com.threerings.presents.server; import com.threerings.presents.client.InvocationReceiver.Registration; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.InvocationNotificationEvent; - import com.threerings.presents.net.Transport; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index 9b4196662..c29d7d421 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/src/java/com/threerings/presents/server/PresentsClient.java @@ -34,34 +34,30 @@ import com.samskivert.util.IntMap; import com.samskivert.util.IntMaps; import com.samskivert.util.ResultListener; import com.samskivert.util.Throttle; + import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; - import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.ProxySubscriber; - import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.BootstrapData; import com.threerings.presents.net.BootstrapNotification; import com.threerings.presents.net.Credentials; +import com.threerings.presents.net.DownstreamMessage; import com.threerings.presents.net.EventNotification; -import com.threerings.presents.net.UpstreamMessage; - +import com.threerings.presents.net.FailureResponse; import com.threerings.presents.net.ForwardEventRequest; import com.threerings.presents.net.LogoffRequest; +import com.threerings.presents.net.ObjectResponse; import com.threerings.presents.net.PingRequest; +import com.threerings.presents.net.PongResponse; import com.threerings.presents.net.SubscribeRequest; import com.threerings.presents.net.UnsubscribeRequest; - -import com.threerings.presents.net.DownstreamMessage; -import com.threerings.presents.net.FailureResponse; -import com.threerings.presents.net.ObjectResponse; -import com.threerings.presents.net.PongResponse; import com.threerings.presents.net.UnsubscribeResponse; - +import com.threerings.presents.net.UpstreamMessage; import com.threerings.presents.server.net.Connection; import com.threerings.presents.server.net.ConnectionManager; import com.threerings.presents.server.net.MessageHandler; diff --git a/src/java/com/threerings/presents/server/Rejector.java b/src/java/com/threerings/presents/server/Rejector.java index 949317e81..d3eb6b94a 100644 --- a/src/java/com/threerings/presents/server/Rejector.java +++ b/src/java/com/threerings/presents/server/Rejector.java @@ -25,8 +25,8 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.samskivert.io.PersistenceException; - import com.samskivert.util.StringUtil; + import com.threerings.util.MessageBundle; import com.threerings.presents.net.AuthResponse; diff --git a/src/java/com/threerings/presents/server/ShutdownManager.java b/src/java/com/threerings/presents/server/ShutdownManager.java index 9d72e3276..db481c3b6 100644 --- a/src/java/com/threerings/presents/server/ShutdownManager.java +++ b/src/java/com/threerings/presents/server/ShutdownManager.java @@ -27,9 +27,10 @@ import com.google.inject.Singleton; import com.samskivert.util.ObserverList; import com.samskivert.util.RunQueue; -import com.threerings.presents.annotation.EventQueue; import com.threerings.util.DependencyGraph; +import com.threerings.presents.annotation.EventQueue; + import static com.threerings.presents.Log.log; /** diff --git a/src/java/com/threerings/presents/server/TimeBaseProvider.java b/src/java/com/threerings/presents/server/TimeBaseProvider.java index fb32ebd6f..c56712ef4 100644 --- a/src/java/com/threerings/presents/server/TimeBaseProvider.java +++ b/src/java/com/threerings/presents/server/TimeBaseProvider.java @@ -22,12 +22,11 @@ package com.threerings.presents.server; import java.util.HashMap; -import com.threerings.presents.client.TimeBaseService.GotTimeBaseListener; +import com.threerings.presents.client.TimeBaseService.GotTimeBaseListener; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.TimeBaseCodes; import com.threerings.presents.data.TimeBaseObject; - import com.threerings.presents.dobj.RootDObjectManager; /** diff --git a/src/java/com/threerings/presents/server/net/Connection.java b/src/java/com/threerings/presents/server/net/Connection.java index 96f9219ea..de4abe1b9 100644 --- a/src/java/com/threerings/presents/server/net/Connection.java +++ b/src/java/com/threerings/presents/server/net/Connection.java @@ -23,13 +23,11 @@ package com.threerings.presents.server.net; import java.io.EOFException; import java.io.IOException; - import java.net.InetAddress; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 56d7b5342..16ce2758b 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -23,6 +23,7 @@ package com.threerings.presents.server.net; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.DatagramChannel; import java.nio.channels.SelectableChannel; @@ -32,11 +33,8 @@ import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.nio.channels.spi.SelectorProvider; import java.util.ArrayList; -import java.util.List; - -import java.net.InetSocketAddress; - import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -62,14 +60,13 @@ import com.threerings.presents.data.ConMgrStats; import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; import com.threerings.presents.net.DownstreamMessage; -import com.threerings.presents.util.DatagramSequencer; - import com.threerings.presents.server.Authenticator; import com.threerings.presents.server.ChainedAuthenticator; import com.threerings.presents.server.DummyAuthenticator; import com.threerings.presents.server.PresentsDObjectMgr; import com.threerings.presents.server.ReportManager; import com.threerings.presents.server.ShutdownManager; +import com.threerings.presents.util.DatagramSequencer; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/server/net/ConnectionObserver.java b/src/java/com/threerings/presents/server/net/ConnectionObserver.java index 7a785cd56..9661fb20e 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionObserver.java +++ b/src/java/com/threerings/presents/server/net/ConnectionObserver.java @@ -22,6 +22,7 @@ package com.threerings.presents.server.net; import java.io.IOException; + import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; diff --git a/src/java/com/threerings/presents/tools/ActionScriptSource.java b/src/java/com/threerings/presents/tools/ActionScriptSource.java index d810975c8..6fc3e7ba9 100644 --- a/src/java/com/threerings/presents/tools/ActionScriptSource.java +++ b/src/java/com/threerings/presents/tools/ActionScriptSource.java @@ -22,21 +22,20 @@ package com.threerings.presents.tools; import java.io.BufferedReader; -import java.io.FileReader; import java.io.File; +import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; - import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.samskivert.util.StringUtil; + import com.threerings.util.ActionScript; /** diff --git a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java index eb9437c4e..d140e5b48 100644 --- a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java +++ b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java @@ -25,7 +25,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.PrintWriter; - import java.util.ArrayList; import java.util.Date; import java.util.Map; diff --git a/src/java/com/threerings/presents/tools/GenActionScriptTask.java b/src/java/com/threerings/presents/tools/GenActionScriptTask.java index 3fd84bbd2..194cf8847 100644 --- a/src/java/com/threerings/presents/tools/GenActionScriptTask.java +++ b/src/java/com/threerings/presents/tools/GenActionScriptTask.java @@ -29,20 +29,19 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Field; import java.lang.reflect.Modifier; - import java.util.ArrayList; +import org.apache.commons.io.IOUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; -import org.apache.commons.io.IOUtils; - import org.apache.velocity.app.VelocityEngine; import com.samskivert.velocity.VelocityUtil; import com.threerings.io.Streamable; + import com.threerings.util.ActionScript; import com.threerings.presents.data.InvocationMarshaller; diff --git a/src/java/com/threerings/presents/tools/GenDObjectTask.java b/src/java/com/threerings/presents/tools/GenDObjectTask.java index 41e146da1..4f069fe6b 100644 --- a/src/java/com/threerings/presents/tools/GenDObjectTask.java +++ b/src/java/com/threerings/presents/tools/GenDObjectTask.java @@ -24,15 +24,13 @@ package com.threerings.presents.tools; import java.io.File; import java.io.IOException; import java.io.StringWriter; - import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; - import java.util.ArrayList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; @@ -40,11 +38,11 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.ClasspathUtils; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import com.samskivert.util.StringUtil; + import com.samskivert.velocity.VelocityUtil; import com.threerings.presents.annotation.TransportHint; diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/java/com/threerings/presents/tools/GenReceiverTask.java index 35b0ffb2a..00831d9ea 100644 --- a/src/java/com/threerings/presents/tools/GenReceiverTask.java +++ b/src/java/com/threerings/presents/tools/GenReceiverTask.java @@ -23,10 +23,8 @@ package com.threerings.presents.tools; import java.io.File; import java.io.StringWriter; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; - import java.util.Iterator; import java.util.List; diff --git a/src/java/com/threerings/presents/tools/GenServiceTask.java b/src/java/com/threerings/presents/tools/GenServiceTask.java index 72385fa75..6b0505dd8 100644 --- a/src/java/com/threerings/presents/tools/GenServiceTask.java +++ b/src/java/com/threerings/presents/tools/GenServiceTask.java @@ -23,10 +23,8 @@ package com.threerings.presents.tools; import java.io.File; import java.io.StringWriter; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; - import java.util.HashSet; import org.apache.velocity.VelocityContext; diff --git a/src/java/com/threerings/presents/tools/GenStreamableTask.java b/src/java/com/threerings/presents/tools/GenStreamableTask.java index 1af55e757..60d8bb630 100644 --- a/src/java/com/threerings/presents/tools/GenStreamableTask.java +++ b/src/java/com/threerings/presents/tools/GenStreamableTask.java @@ -33,6 +33,7 @@ import org.apache.tools.ant.types.FileSet; import com.threerings.io.SimpleStreamableObject; import com.threerings.io.Streamable; + import com.threerings.presents.dobj.DObject; /** diff --git a/src/java/com/threerings/presents/tools/GenUtil.java b/src/java/com/threerings/presents/tools/GenUtil.java index 141efd77f..baa0d106b 100644 --- a/src/java/com/threerings/presents/tools/GenUtil.java +++ b/src/java/com/threerings/presents/tools/GenUtil.java @@ -25,10 +25,8 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; - import java.lang.reflect.Field; import java.lang.reflect.Type; - import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java b/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java index 46be57978..4418ff210 100644 --- a/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java +++ b/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java @@ -29,6 +29,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.HashSet; +import javassist.CannotCompileException; import javassist.ClassPool; import javassist.CtClass; import javassist.CtField; @@ -36,7 +37,6 @@ import javassist.CtMethod; import javassist.CtNewMethod; import javassist.Modifier; import javassist.NotFoundException; -import javassist.CannotCompileException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; @@ -45,6 +45,7 @@ import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import com.samskivert.io.StreamUtil; + import com.threerings.io.BasicStreamers; import com.threerings.io.FieldMarshaller; import com.threerings.io.Streamable; diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java index ce9fd67d6..edc4805a9 100644 --- a/src/java/com/threerings/presents/tools/InvocationTask.java +++ b/src/java/com/threerings/presents/tools/InvocationTask.java @@ -24,18 +24,15 @@ package com.threerings.presents.tools; import java.io.File; import java.io.FileReader; import java.io.IOException; - import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; - import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; @@ -43,13 +40,13 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.ClasspathUtils; - import org.apache.velocity.app.VelocityEngine; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.samskivert.util.StringUtil; + import com.samskivert.velocity.VelocityUtil; import com.threerings.presents.annotation.TransportHint; diff --git a/src/java/com/threerings/presents/tools/SourceFile.java b/src/java/com/threerings/presents/tools/SourceFile.java index 42801d45a..12f5b288c 100644 --- a/src/java/com/threerings/presents/tools/SourceFile.java +++ b/src/java/com/threerings/presents/tools/SourceFile.java @@ -24,10 +24,9 @@ package com.threerings.presents.tools; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; import java.io.FileReader; +import java.io.FileWriter; import java.io.IOException; - import java.util.ArrayList; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/presents/util/DatagramSequencer.java b/src/java/com/threerings/presents/util/DatagramSequencer.java index f9bd49ce5..afd66d60c 100644 --- a/src/java/com/threerings/presents/util/DatagramSequencer.java +++ b/src/java/com/threerings/presents/util/DatagramSequencer.java @@ -22,7 +22,6 @@ package com.threerings.presents.util; import java.io.IOException; - import java.util.ArrayList; import java.util.HashSet; import java.util.Set; diff --git a/src/java/com/threerings/util/ActionScript.java b/src/java/com/threerings/util/ActionScript.java index 271ca4aa2..4e717189e 100644 --- a/src/java/com/threerings/util/ActionScript.java +++ b/src/java/com/threerings/util/ActionScript.java @@ -21,10 +21,10 @@ package com.threerings.util; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.annotation.ElementType; /** * An annotation that controls ActionScript code generation. diff --git a/src/java/com/threerings/util/StreamableHashMap.java b/src/java/com/threerings/util/StreamableHashMap.java index 8aee6a1f4..698e95a06 100644 --- a/src/java/com/threerings/util/StreamableHashMap.java +++ b/src/java/com/threerings/util/StreamableHashMap.java @@ -22,8 +22,8 @@ package com.threerings.util; import java.io.IOException; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; diff --git a/tests/src/java/com/threerings/bureau/client/TestClient.java b/tests/src/java/com/threerings/bureau/client/TestClient.java index 1dac2a1f8..72ce40956 100644 --- a/tests/src/java/com/threerings/bureau/client/TestClient.java +++ b/tests/src/java/com/threerings/bureau/client/TestClient.java @@ -23,10 +23,10 @@ package com.threerings.bureau.client; import com.samskivert.util.OneLineLogFormatter; import com.samskivert.util.Queue; -import com.samskivert.util.StringUtil; -import com.threerings.bureau.client.BureauDirector; -import com.threerings.bureau.data.AgentObject; import com.samskivert.util.RunQueue; +import com.samskivert.util.StringUtil; + +import com.threerings.bureau.data.AgentObject; import static com.threerings.bureau.Log.log; diff --git a/tests/src/java/com/threerings/crowd/client/JabberApp.java b/tests/src/java/com/threerings/crowd/client/JabberApp.java index dcdca9c06..c1c727bbf 100644 --- a/tests/src/java/com/threerings/crowd/client/JabberApp.java +++ b/tests/src/java/com/threerings/crowd/client/JabberApp.java @@ -22,9 +22,11 @@ package com.threerings.crowd.client; import java.io.IOException; + import javax.swing.JFrame; import com.samskivert.swing.util.SwingUtil; + import com.threerings.util.Name; import com.threerings.presents.client.Client; diff --git a/tests/src/java/com/threerings/crowd/client/JabberClient.java b/tests/src/java/com/threerings/crowd/client/JabberClient.java index 4b1d00182..88f598260 100644 --- a/tests/src/java/com/threerings/crowd/client/JabberClient.java +++ b/tests/src/java/com/threerings/crowd/client/JabberClient.java @@ -26,11 +26,13 @@ import java.awt.EventQueue; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; + import javax.swing.JFrame; 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; diff --git a/tests/src/java/com/threerings/crowd/client/JabberPanel.java b/tests/src/java/com/threerings/crowd/client/JabberPanel.java index 97afc0712..6870e0304 100644 --- a/tests/src/java/com/threerings/crowd/client/JabberPanel.java +++ b/tests/src/java/com/threerings/crowd/client/JabberPanel.java @@ -4,6 +4,7 @@ package com.threerings.crowd.client; import java.awt.BorderLayout; + import javax.swing.JPanel; import com.threerings.crowd.data.PlaceObject; diff --git a/tests/src/java/com/threerings/crowd/client/TestClient.java b/tests/src/java/com/threerings/crowd/client/TestClient.java index 7fb045b70..efc4f3b41 100644 --- a/tests/src/java/com/threerings/crowd/client/TestClient.java +++ b/tests/src/java/com/threerings/crowd/client/TestClient.java @@ -28,9 +28,10 @@ import com.samskivert.util.RunQueue; import com.threerings.util.MessageManager; import com.threerings.util.Name; -import com.threerings.presents.client.*; +import com.threerings.presents.client.Client; +import com.threerings.presents.client.ClientObserver; import com.threerings.presents.dobj.DObjectManager; -import com.threerings.presents.net.*; +import com.threerings.presents.net.UsernamePasswordCreds; import com.threerings.crowd.chat.client.ChatDirector; import com.threerings.crowd.util.CrowdContext; diff --git a/tests/src/java/com/threerings/crowd/data/JabberConfig.java b/tests/src/java/com/threerings/crowd/data/JabberConfig.java index b9eef560e..b851cbdc8 100644 --- a/tests/src/java/com/threerings/crowd/data/JabberConfig.java +++ b/tests/src/java/com/threerings/crowd/data/JabberConfig.java @@ -5,7 +5,6 @@ package com.threerings.crowd.data; import com.threerings.crowd.client.JabberController; import com.threerings.crowd.client.PlaceController; -import com.threerings.crowd.data.PlaceConfig; /** * Defines the necessary bits for our chat room. diff --git a/tests/src/java/com/threerings/crowd/server/JabberServer.java b/tests/src/java/com/threerings/crowd/server/JabberServer.java index 8753339b9..162cf157b 100644 --- a/tests/src/java/com/threerings/crowd/server/JabberServer.java +++ b/tests/src/java/com/threerings/crowd/server/JabberServer.java @@ -7,6 +7,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.threerings.crowd.data.JabberConfig; + import static com.threerings.crowd.Log.log; /** diff --git a/tests/src/java/com/threerings/io/FrameTest.java b/tests/src/java/com/threerings/io/FrameTest.java index 178c451b4..0fe08af90 100644 --- a/tests/src/java/com/threerings/io/FrameTest.java +++ b/tests/src/java/com/threerings/io/FrameTest.java @@ -21,8 +21,9 @@ package com.threerings.io; -import java.io.*; - +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.nio.channels.Pipe; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; diff --git a/tests/src/java/com/threerings/presents/client/TestClient.java b/tests/src/java/com/threerings/presents/client/TestClient.java index b0e068145..add984c19 100644 --- a/tests/src/java/com/threerings/presents/client/TestClient.java +++ b/tests/src/java/com/threerings/presents/client/TestClient.java @@ -29,8 +29,11 @@ import com.samskivert.util.RunQueue; import com.threerings.util.Name; import com.threerings.presents.data.TestObject; -import com.threerings.presents.dobj.*; -import com.threerings.presents.net.*; +import com.threerings.presents.dobj.DEvent; +import com.threerings.presents.dobj.EventListener; +import com.threerings.presents.dobj.ObjectAccessException; +import com.threerings.presents.dobj.Subscriber; +import com.threerings.presents.net.UsernamePasswordCreds; import static com.threerings.presents.Log.log; diff --git a/tests/src/java/com/threerings/presents/client/TestDecoder.java b/tests/src/java/com/threerings/presents/client/TestDecoder.java index c3251d479..69f654c42 100644 --- a/tests/src/java/com/threerings/presents/client/TestDecoder.java +++ b/tests/src/java/com/threerings/presents/client/TestDecoder.java @@ -21,8 +21,6 @@ package com.threerings.presents.client; -import com.threerings.presents.client.InvocationDecoder; -import com.threerings.presents.client.TestReceiver; /** * Dispatches calls to a {@link TestReceiver} instance. diff --git a/tests/src/java/com/threerings/presents/data/TestMarshaller.java b/tests/src/java/com/threerings/presents/data/TestMarshaller.java index e7604bb53..bf34861fc 100644 --- a/tests/src/java/com/threerings/presents/data/TestMarshaller.java +++ b/tests/src/java/com/threerings/presents/data/TestMarshaller.java @@ -21,10 +21,11 @@ package com.threerings.presents.data; +import java.util.ArrayList; + import com.threerings.presents.client.Client; import com.threerings.presents.client.TestService; import com.threerings.presents.dobj.InvocationResponseEvent; -import java.util.ArrayList; /** * Provides the implementation of the {@link TestService} interface diff --git a/tests/src/java/com/threerings/presents/data/TestObject.java b/tests/src/java/com/threerings/presents/data/TestObject.java index 8b353e65c..46971fffa 100644 --- a/tests/src/java/com/threerings/presents/data/TestObject.java +++ b/tests/src/java/com/threerings/presents/data/TestObject.java @@ -23,7 +23,8 @@ package com.threerings.presents.data; import java.util.ArrayList; -import com.threerings.presents.dobj.*; +import com.threerings.presents.dobj.DObject; +import com.threerings.presents.dobj.OidList; /** * A test distributed object. diff --git a/tests/src/java/com/threerings/presents/server/DOMTest.java b/tests/src/java/com/threerings/presents/server/DOMTest.java index 5c2013ab1..af805be9d 100644 --- a/tests/src/java/com/threerings/presents/server/DOMTest.java +++ b/tests/src/java/com/threerings/presents/server/DOMTest.java @@ -31,9 +31,12 @@ import atunit.Unit; import com.google.inject.Inject; import com.threerings.presents.data.TestObject; -import com.threerings.presents.dobj.*; +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 static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; /** * A simple test case for the dobjmgr. diff --git a/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java b/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java index eb297dbad..40f349992 100644 --- a/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java +++ b/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java @@ -31,11 +31,15 @@ import atunit.Unit; import com.google.inject.Inject; import com.threerings.presents.data.TestObject; -import com.threerings.presents.dobj.*; - -import static org.junit.Assert.*; +import com.threerings.presents.dobj.AttributeChangedEvent; +import com.threerings.presents.dobj.DEvent; +import com.threerings.presents.dobj.EventListener; +import com.threerings.presents.dobj.ObjectAddedEvent; +import com.threerings.presents.dobj.ObjectDestroyedEvent; import static com.threerings.presents.Log.log; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Tests that the dobjmgr will not allow a destroyed object to be added to diff --git a/tests/src/java/com/threerings/presents/server/RefTest.java b/tests/src/java/com/threerings/presents/server/RefTest.java index f5706ddfa..146a2ca8a 100644 --- a/tests/src/java/com/threerings/presents/server/RefTest.java +++ b/tests/src/java/com/threerings/presents/server/RefTest.java @@ -31,9 +31,13 @@ import atunit.Unit; import com.google.inject.Inject; import com.threerings.presents.data.TestObject; -import com.threerings.presents.dobj.*; +import com.threerings.presents.dobj.DEvent; +import com.threerings.presents.dobj.EventListener; +import com.threerings.presents.dobj.ObjectAddedEvent; +import com.threerings.presents.dobj.ObjectDestroyedEvent; +import com.threerings.presents.dobj.ObjectRemovedEvent; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; /** * Tests the oid list reference tracking code. diff --git a/tests/src/java/com/threerings/presents/server/TestDispatcher.java b/tests/src/java/com/threerings/presents/server/TestDispatcher.java index ab57ffbe1..6e6607220 100644 --- a/tests/src/java/com/threerings/presents/server/TestDispatcher.java +++ b/tests/src/java/com/threerings/presents/server/TestDispatcher.java @@ -21,10 +21,11 @@ package com.threerings.presents.server; +import java.util.ArrayList; + import com.threerings.presents.client.TestService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.TestMarshaller; -import java.util.ArrayList; /** * Dispatches requests to the {@link TestProvider}. diff --git a/tests/src/java/com/threerings/presents/server/TestProvider.java b/tests/src/java/com/threerings/presents/server/TestProvider.java index 71ac53884..55ea6b3d6 100644 --- a/tests/src/java/com/threerings/presents/server/TestProvider.java +++ b/tests/src/java/com/threerings/presents/server/TestProvider.java @@ -21,9 +21,10 @@ package com.threerings.presents.server; +import java.util.ArrayList; + import com.threerings.presents.client.TestService; import com.threerings.presents.data.ClientObject; -import java.util.ArrayList; /** * Defines the server-side of the {@link TestService}. diff --git a/tests/src/java/com/threerings/presents/server/TestSender.java b/tests/src/java/com/threerings/presents/server/TestSender.java index b3a0a7052..28ac622cf 100644 --- a/tests/src/java/com/threerings/presents/server/TestSender.java +++ b/tests/src/java/com/threerings/presents/server/TestSender.java @@ -1,5 +1,5 @@ // -// $Id: TestSender.java,v 1.2 2004/08/27 02:21:04 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -24,7 +24,6 @@ package com.threerings.presents.server; import com.threerings.presents.client.TestDecoder; import com.threerings.presents.client.TestReceiver; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.server.InvocationSender; /** * Used to issue notifications to a {@link TestReceiver} instance on a diff --git a/tests/src/java/com/threerings/presents/server/TestServer.java b/tests/src/java/com/threerings/presents/server/TestServer.java index b7d14cede..fa0f1060f 100644 --- a/tests/src/java/com/threerings/presents/server/TestServer.java +++ b/tests/src/java/com/threerings/presents/server/TestServer.java @@ -25,6 +25,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.threerings.presents.data.TestObject; + import static com.threerings.presents.Log.log; public class TestServer extends PresentsServer