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

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

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

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