Some import cleanups from Dave.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@662 ed5b42cb-e716-0410-a449-f6a68f950b19

src/java/com/threerings/cast/bundle/BundledComponentRepository.java

@@ -21,17 +21,17 @@
 
 package com.threerings.cast.bundle;
 
-import static com.threerings.cast.Log.log;
-
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import java.io.IOException;
+
 import com.google.common.collect.Maps;
 
 import com.samskivert.util.IntIntMap;
@@ -40,6 +40,22 @@ import com.samskivert.util.IntMaps;
 import com.samskivert.util.Predicate;
 import com.samskivert.util.Tuple;
 
+import com.threerings.util.DirectionCodes;
+
+import com.threerings.resource.FileResourceBundle;
+import com.threerings.resource.ResourceBundle;
+import com.threerings.resource.ResourceManager;
+
+import com.threerings.media.image.BufferedMirage;
+import com.threerings.media.image.Colorization;
+import com.threerings.media.image.ImageDataProvider;
+import com.threerings.media.image.ImageManager;
+import com.threerings.media.image.Mirage;
+import com.threerings.media.tile.IMImageProvider;
+import com.threerings.media.tile.Tile;
+import com.threerings.media.tile.TileSet;
+import com.threerings.media.tile.TrimmedTile;
+
 import com.threerings.cast.ActionFrames;
 import com.threerings.cast.ActionSequence;
 import com.threerings.cast.CharacterComponent;
@@ -49,19 +65,8 @@ import com.threerings.cast.FrameProvider;
 import com.threerings.cast.NoSuchComponentException;
 import com.threerings.cast.StandardActions;
 import com.threerings.cast.TrimmedMultiFrameImage;
-import com.threerings.media.image.BufferedMirage;
-import com.threerings.media.image.Colorization;
-import com.threerings.media.image.ImageDataProvider;
-import com.threerings.media.image.ImageManager;
-import com.threerings.media.image.Mirage;
-import com.threerings.media.tile.IMImageProvider;
-import com.threerings.media.tile.Tile;
-import com.threerings.media.tile.TileSet;
-import com.threerings.media.tile.TrimmedTile;
-import com.threerings.resource.FileResourceBundle;
-import com.threerings.resource.ResourceBundle;
-import com.threerings.resource.ResourceManager;
-import com.threerings.util.DirectionCodes;
+
+import static com.threerings.cast.Log.log;
 
 /**
  * A component repository implementation that obtains information from resource bundles.

src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java

@@ -22,6 +22,14 @@
 package com.threerings.cast.bundle.tools;
 
 import java.awt.image.BufferedImage;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.zip.Deflater;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -34,12 +42,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-import java.util.zip.Deflater;
 
 import javax.imageio.ImageIO;
 
@@ -54,10 +56,7 @@ import com.samskivert.util.ComparableArrayList;
 import com.samskivert.util.FileUtil;
 import com.samskivert.util.HashIntMap;
 import com.samskivert.util.Tuple;
-import com.threerings.cast.ComponentIDBroker;
-import com.threerings.cast.StandardActions;
-import com.threerings.cast.bundle.BundleUtil;
-import com.threerings.cast.tools.xml.ActionRuleSet;
+
 import com.threerings.media.tile.ImageProvider;
 import com.threerings.media.tile.SimpleCachingImageProvider;
 import com.threerings.media.tile.TileSet;
@@ -66,6 +65,11 @@ import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
 import com.threerings.media.tile.tools.xml.TileSetRuleSet;
 import com.threerings.media.tile.tools.xml.UniformTileSetRuleSet;
 
+import com.threerings.cast.ComponentIDBroker;
+import com.threerings.cast.StandardActions;
+import com.threerings.cast.bundle.BundleUtil;
+import com.threerings.cast.tools.xml.ActionRuleSet;
+
 /**
  * Ant task for creating component bundles. This task must be configured
  * with a number of parameters:

src/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java

@@ -22,7 +22,6 @@
 package com.threerings.cast.bundle.tools;
 
 import java.io.File;
-
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;

src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java

@@ -22,7 +22,6 @@
 package com.threerings.cast.bundle.tools;
 
 import java.io.File;
-
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;

src/java/com/threerings/cast/bundle/tools/DumpBundle.java

@@ -21,17 +21,19 @@
 
 package com.threerings.cast.bundle.tools;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
+import java.io.File;
+
 import com.samskivert.util.HashIntMap;
 import com.samskivert.util.StringUtil;
 
-import com.threerings.cast.bundle.BundleUtil;
 import com.threerings.resource.FileResourceBundle;
 import com.threerings.resource.ResourceBundle;
 
+import com.threerings.cast.bundle.BundleUtil;
+
 /**
  * Dumps the contents of a component bundle to stdout.
  */

src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java

@@ -21,6 +21,13 @@
 
 package com.threerings.cast.bundle.tools;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.zip.Deflater;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,27 +36,23 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-import java.util.zip.Deflater;
 
 import org.apache.commons.digester.Digester;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
 import com.samskivert.util.Tuple;
+
+import com.threerings.media.tile.TileSet;
+import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
+import com.threerings.media.tile.tools.xml.TileSetRuleSet;
+import com.threerings.media.tile.tools.xml.UniformTileSetRuleSet;
+
 import com.threerings.cast.ActionSequence;
 import com.threerings.cast.ComponentClass;
 import com.threerings.cast.bundle.BundleUtil;
 import com.threerings.cast.tools.xml.ActionRuleSet;
 import com.threerings.cast.tools.xml.ClassRuleSet;
-import com.threerings.media.tile.TileSet;
-import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
-import com.threerings.media.tile.tools.xml.TileSetRuleSet;
-import com.threerings.media.tile.tools.xml.UniformTileSetRuleSet;
 
 /**
  * Ant task for creating metadata bundles, which contain action sequence