AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some import cleanups from Dave.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@662 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Michael Bayne
2008-09-25 22:16:10 +00:00
parent 8590d5650b
commit 8e69ff612e
120 changed files with 356 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/IMImageProvider.java
+1 -1
View File
@@ -24,9 +24,9 @@ package com.threerings.media.tile;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.ImageDataProvider;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.Mirage;
/**
src/java/com/threerings/media/tile/ImageProvider.java
+1 -1
View File
@@ -24,8 +24,8 @@ package com.threerings.media.tile;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.ClientImageManager;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.Mirage;
/**
src/java/com/threerings/media/tile/SimpleCachingImageProvider.java
+3 -1
View File
@@ -23,9 +23,11 @@ package com.threerings.media.tile;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.Map;
import java.io.IOException;
import com.samskivert.util.LRUHashMap;
import com.threerings.media.image.BufferedMirage;
src/java/com/threerings/media/tile/Tile.java
+1
View File
@@ -22,6 +22,7 @@
package com.threerings.media.tile;
import java.awt.Graphics2D;
import java.util.Arrays;
import com.threerings.media.image.Colorization;
src/java/com/threerings/media/tile/TileIcon.java
+1 -1
View File
@@ -22,8 +22,8 @@
package com.threerings.media.tile;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Graphics2D;
import javax.swing.Icon;
src/java/com/threerings/media/tile/TileManager.java
+3 -2
View File
@@ -21,9 +21,8 @@
package com.threerings.media.tile;
import static com.threerings.media.Log.log;
import java.lang.ref.SoftReference;
import java.util.Map;
import com.google.common.collect.Maps;
@@ -32,6 +31,8 @@ import com.samskivert.io.PersistenceException;
import com.threerings.media.image.ImageManager;
import static com.threerings.media.Log.log;
/**
* The tile manager provides a simplified interface for retrieving and caching tiles. Tiles can be
* loaded in two different ways. An application can load a tileset by hand, specifying the path to
src/java/com/threerings/media/tile/TileSet.java
+8 -5
View File
@@ -21,22 +21,25 @@
package com.threerings.media.tile;
import java.lang.ref.SoftReference;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.Serializable;
import java.lang.ref.SoftReference;
import java.util.Iterator;
import java.util.Map;
import java.io.Serializable;
import com.google.common.collect.Maps;
import com.samskivert.util.StringUtil;
import com.samskivert.util.Throttle;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.Mirage;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.BufferedMirage;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.Mirage;
import com.threerings.media.tile.Tile.Key;
import static com.threerings.media.Log.log;
src/java/com/threerings/media/tile/TrimmedObjectTileSet.java
+3 -1
View File
@@ -22,6 +22,7 @@
package com.threerings.media.tile;
import java.awt.Rectangle;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
@@ -29,8 +30,9 @@ import java.io.Serializable;
import com.samskivert.util.ListUtil;
import com.samskivert.util.StringUtil;
import com.threerings.media.image.Colorization;
import com.threerings.resource.FastImageIO;
import com.threerings.media.image.Colorization;
import com.threerings.media.tile.util.TileSetTrimmer;
/**
src/java/com/threerings/media/tile/TrimmedTileSet.java
+2 -1
View File
@@ -26,8 +26,9 @@ import java.awt.Rectangle;
import java.io.IOException;
import java.io.OutputStream;
import com.threerings.media.image.Colorization;
import com.threerings.resource.FastImageIO;
import com.threerings.media.image.Colorization;
import com.threerings.media.tile.util.TileSetTrimmer;
/**
src/java/com/threerings/media/tile/bundle/TileSetBundle.java
+3 -1
View File
@@ -23,13 +23,15 @@ package com.threerings.media.tile.bundle;
import java.awt.image.BufferedImage;
import java.util.Iterator;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Iterator;
import com.samskivert.util.HashIntMap;
import com.threerings.resource.FastImageIO;
import com.threerings.resource.ResourceBundle;
src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java
+1
View File
@@ -23,6 +23,7 @@ package com.threerings.media.tile.bundle.tools;
import java.io.File;
import java.io.IOException;
import org.apache.tools.ant.BuildException;
/**
src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
+2 -1
View File
@@ -21,9 +21,10 @@
package com.threerings.media.tile.bundle.tools;
import java.io.File;
import java.util.Iterator;
import java.io.File;
import com.threerings.resource.FileResourceBundle;
import com.threerings.resource.ResourceBundle;
src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
+12 -7
View File
@@ -22,11 +22,7 @@
package com.threerings.media.tile.bundle.tools;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.jar.JarEntry;
@@ -34,14 +30,24 @@ import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import java.util.zip.Deflater;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import javax.imageio.ImageIO;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import org.apache.commons.io.IOUtils;
import org.xml.sax.SAXException;
import com.samskivert.io.PersistenceException;
import com.samskivert.util.HashIntMap;
import com.threerings.resource.FastImageIO;
import com.threerings.media.tile.ImageProvider;
import com.threerings.media.tile.ObjectTileSet;
import com.threerings.media.tile.SimpleCachingImageProvider;
@@ -51,7 +57,6 @@ import com.threerings.media.tile.TrimmedObjectTileSet;
import com.threerings.media.tile.bundle.BundleUtil;
import com.threerings.media.tile.bundle.TileSetBundle;
import com.threerings.media.tile.tools.xml.TileSetRuleSet;
import com.threerings.resource.FastImageIO;
import static com.threerings.media.Log.log;
src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
+2 -1
View File
@@ -21,9 +21,10 @@
package com.threerings.media.tile.bundle.tools;
import java.util.ArrayList;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
src/java/com/threerings/media/tile/tools/DumpTileSetMap.java
+2 -1
View File
@@ -21,9 +21,10 @@
package com.threerings.media.tile.tools;
import java.io.File;
import java.util.Iterator;
import java.io.File;
import com.samskivert.io.PersistenceException;
/**
src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
+3 -3
View File
@@ -21,6 +21,9 @@
package com.threerings.media.tile.tools;
import java.util.HashMap;
import java.util.Iterator;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -29,9 +32,6 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import com.samskivert.io.PersistenceException;
import com.samskivert.util.QuickSort;
src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
+2 -2
View File
@@ -26,11 +26,11 @@ import org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil;
import com.samskivert.xml.CallMethodSpecialRule;
import com.threerings.util.DirectionUtil;
import com.threerings.media.tile.ObjectTileSet;
import com.threerings.media.tile.TileSet;
import com.threerings.util.DirectionUtil;
/**
* Parses {@link ObjectTileSet} instances from a tileset description. An
* object tileset description looks like so:
src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
+1 -1
View File
@@ -25,8 +25,8 @@ import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSetBase;
import com.samskivert.util.StringUtil;
import com.samskivert.xml.ValidatedSetNextRule.Validator;
import com.samskivert.xml.ValidatedSetNextRule;
import com.samskivert.xml.ValidatedSetNextRule.Validator;
import com.threerings.media.tile.TileSet;
src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
+6 -4
View File
@@ -21,17 +21,19 @@
package com.threerings.media.tile.tools.xml;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import org.xml.sax.SAXException;
import com.samskivert.util.ConfigUtil;
import com.samskivert.xml.ValidatedSetNextRule;
src/java/com/threerings/media/tile/util/TileSetTrimmer.java
+5 -2
View File
@@ -22,17 +22,20 @@
package com.threerings.media.tile.util;
import java.awt.Rectangle;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.awt.image.Raster;
import java.awt.image.RasterFormatException;
import java.awt.image.WritableRaster;
import java.io.IOException;
import java.io.OutputStream;
import javax.imageio.ImageIO;
import com.threerings.resource.FastImageIO;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.TileSet;
import com.threerings.resource.FastImageIO;
/**
* Contains routines for trimming the images from an existing tileset