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
@@ -22,6 +22,7 @@
 package com.threerings.admin.client;

 import java.lang.reflect.Field;
+
 import javax.swing.JTextField;

 import com.samskivert.util.StringUtil;
@@ -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;
@@ -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;
@@ -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;
@@ -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
@@ -22,6 +22,7 @@
 package com.threerings.admin.data;

 import java.lang.reflect.Field;
+
 import javax.swing.JPanel;

 import com.threerings.presents.dobj.DObject;
@@ -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}.
 */
@@ -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;
@@ -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;
@@ -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;
@@ -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.
@@ -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;

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

 /**
@@ -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}.
 */
@@ -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}.
 */
@@ -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;
@@ -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.
@@ -22,6 +22,7 @@
 package com.threerings.bureau.util;

 import com.threerings.presents.util.PresentsContext;
+
 import com.threerings.bureau.client.BureauDirector;

 /**
@@ -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.
@@ -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;
@@ -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;
@@ -4,7 +4,6 @@
 package com.threerings.io;

 import java.io.OutputStream;
-
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;

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

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

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

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

@@ -22,6 +22,7 @@
 package com.threerings.io;

 import com.samskivert.util.StringUtil;
+
 import com.threerings.util.ActionScript;

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

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

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

@@ -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;
@@ -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;
@@ -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;
@@ -22,7 +22,6 @@
 package com.threerings.presents.dobj;

 import java.lang.reflect.Method;
-
 import java.util.HashMap;

 import com.samskivert.util.MethodFinder;
@@ -22,6 +22,7 @@
 package com.threerings.presents.net;

 import com.threerings.io.Streamable;
+
 import com.threerings.util.Name;

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

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

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

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

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

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

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

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

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

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

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

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

 /**
@@ -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;
--- a/Show More
+++ b/Show More