Import cleanups

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5399 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/presents/tools/ActionScriptSource.java

@@ -22,21 +22,20 @@
 package com.threerings.presents.tools;
 
 import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.samskivert.util.StringUtil;
+
 import com.threerings.util.ActionScript;
 
 /**

src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java

@@ -25,7 +25,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Map;

src/java/com/threerings/presents/tools/GenActionScriptTask.java

@@ -29,20 +29,19 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-
 import java.util.ArrayList;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.commons.io.IOUtils;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.samskivert.velocity.VelocityUtil;
 
 import com.threerings.io.Streamable;
+
 import com.threerings.util.ActionScript;
 
 import com.threerings.presents.data.InvocationMarshaller;

src/java/com/threerings/presents/tools/GenDObjectTask.java

@@ -24,15 +24,13 @@ package com.threerings.presents.tools;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-
 import java.util.ArrayList;
-import org.apache.commons.lang.StringUtils;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -40,11 +38,11 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.ClasspathUtils;
-
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
 import com.samskivert.util.StringUtil;
+
 import com.samskivert.velocity.VelocityUtil;
 
 import com.threerings.presents.annotation.TransportHint;

src/java/com/threerings/presents/tools/GenReceiverTask.java

@@ -23,10 +23,8 @@ package com.threerings.presents.tools;
 
 import java.io.File;
 import java.io.StringWriter;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-
 import java.util.Iterator;
 import java.util.List;
 

src/java/com/threerings/presents/tools/GenServiceTask.java

@@ -23,10 +23,8 @@ package com.threerings.presents.tools;
 
 import java.io.File;
 import java.io.StringWriter;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-
 import java.util.HashSet;
 
 import org.apache.velocity.VelocityContext;

src/java/com/threerings/presents/tools/GenStreamableTask.java

@@ -33,6 +33,7 @@ import org.apache.tools.ant.types.FileSet;
 
 import com.threerings.io.SimpleStreamableObject;
 import com.threerings.io.Streamable;
+
 import com.threerings.presents.dobj.DObject;
 
 /**

src/java/com/threerings/presents/tools/GenUtil.java

@@ -25,10 +25,8 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

src/java/com/threerings/presents/tools/InstrumentStreamableTask.java

@@ -29,6 +29,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashSet;
 
+import javassist.CannotCompileException;
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtField;
@@ -36,7 +37,6 @@ import javassist.CtMethod;
 import javassist.CtNewMethod;
 import javassist.Modifier;
 import javassist.NotFoundException;
-import javassist.CannotCompileException;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -45,6 +45,7 @@ import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
 
 import com.samskivert.io.StreamUtil;
+
 import com.threerings.io.BasicStreamers;
 import com.threerings.io.FieldMarshaller;
 import com.threerings.io.Streamable;

src/java/com/threerings/presents/tools/InvocationTask.java

@@ -24,18 +24,15 @@ package com.threerings.presents.tools;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -43,13 +40,13 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.ClasspathUtils;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
 import com.samskivert.util.StringUtil;
+
 import com.samskivert.velocity.VelocityUtil;
 
 import com.threerings.presents.annotation.TransportHint;

src/java/com/threerings/presents/tools/SourceFile.java

@@ -24,10 +24,9 @@ package com.threerings.presents.tools;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
-
 import java.util.ArrayList;
 
 import com.samskivert.util.StringUtil;