Import cleanups

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5399 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-09-26 17:29:59 +00:00
parent c04adc6a6e
commit 8856120403
131 changed files with 261 additions and 242 deletions
@@ -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;

@@ -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.
 *
@@ -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
@@ -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
@@ -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;

 /**
@@ -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
@@ -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}.
 */
@@ -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}.
 */
@@ -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();
            }
@@ -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}.
@@ -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.
 */
@@ -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}.
 */
@@ -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}.
 */
@@ -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;

@@ -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;
@@ -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;
@@ -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;
@@ -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
@@ -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
@@ -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;
@@ -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;
@@ -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
@@ -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}.
@@ -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;

@@ -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}.
@@ -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}.
 */
@@ -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}.
 */
@@ -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;
@@ -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}.
 */
@@ -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;
@@ -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}.
 */
@@ -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.
@@ -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;

 /**
@@ -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.