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

Eclipse suggested cleanup.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2971 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:50:28 +00:00
parent 6cd4e73720
commit d618d3c771
169 changed files with 208 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/SwissArmyTileSet.java
+1 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: SwissArmyTileSet.java,v 1.10 2003/01/15 09:11:37 mdb Exp $
// $Id: SwissArmyTileSet.java,v 1.11 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile;
@@ -12,8 +12,6 @@ import java.io.ObjectInputStream;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
/**
* The swiss army tileset supports a diverse variety of tiles in the
* tileset image. Each row can contain varying numbers of tiles and each
src/java/com/threerings/media/tile/TileManager.java
+2 -14
View File
@@ -1,26 +1,14 @@
//
// $Id: TileManager.java,v 1.34 2003/06/18 05:48:45 mdb Exp $
// $Id: TileManager.java,v 1.35 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import com.samskivert.io.PersistenceException;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.IntTuple;
import com.samskivert.util.LRUHashMap;
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.Log;
import com.threerings.media.tile.TileUtil;
import com.threerings.media.image.ImageManager;
/**
* The tile manager provides a simplified interface for retrieving and
src/java/com/threerings/media/tile/TileMultiFrameImage.java
+1 -2
View File
@@ -1,11 +1,10 @@
//
// $Id: TileMultiFrameImage.java,v 1.2 2003/01/13 22:49:46 mdb Exp $
// $Id: TileMultiFrameImage.java,v 1.3 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile;
import java.awt.Graphics2D;
import com.threerings.media.Log;
import com.threerings.media.util.MultiFrameImage;
/**
src/java/com/threerings/media/tile/TileSet.java
+1 -7
View File
@@ -1,25 +1,19 @@
//
// $Id: TileSet.java,v 1.58 2003/07/28 04:06:14 mdb Exp $
// $Id: TileSet.java,v 1.59 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile;
import java.awt.Color;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.Serializable;
import java.lang.ref.SoftReference;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil;
import com.samskivert.util.Throttle;
import com.samskivert.util.Tuple;
import com.threerings.media.Log;
import com.threerings.media.MediaPrefs;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.Mirage;
src/java/com/threerings/media/tile/TileSetRepository.java
+2 -3
View File
@@ -1,12 +1,11 @@
//
// $Id: TileSetRepository.java,v 1.5 2003/06/18 05:48:45 mdb Exp $
// $Id: TileSetRepository.java,v 1.6 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile;
import java.util.Iterator;
import com.samskivert.io.PersistenceException;
import com.threerings.media.image.ImageDataProvider;
import com.samskivert.io.PersistenceException;
/**
* The tileset repository interface should be implemented by classes that
src/java/com/threerings/media/tile/TrimmedObjectTileSet.java
+2 -5
View File
@@ -1,20 +1,17 @@
//
// $Id: TrimmedObjectTileSet.java,v 1.13 2003/05/31 00:56:38 mdb Exp $
// $Id: TrimmedObjectTileSet.java,v 1.14 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile;
import java.awt.Rectangle;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
import com.threerings.media.image.Mirage;
import com.threerings.media.tile.util.TileSetTrimmer;
import com.threerings.media.image.Colorization;
import com.threerings.media.tile.util.TileSetTrimmer;
/**
* An object tileset in which the objects have been trimmed to the
src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
+1 -7
View File
@@ -1,24 +1,18 @@
//
// $Id: BundledTileSetRepository.java,v 1.13 2003/06/19 01:12:32 ray Exp $
// $Id: BundledTileSetRepository.java,v 1.14 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.bundle;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import com.samskivert.io.PersistenceException;
import com.samskivert.util.HashIntMap;
import com.threerings.resource.ResourceBundle;
import com.threerings.resource.ResourceManager;
import com.threerings.media.Log;
import com.threerings.media.image.ImageDataProvider;
import com.threerings.media.image.ImageManager;
import com.threerings.media.tile.IMImageProvider;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.TileSet;
src/java/com/threerings/media/tile/bundle/TileSetBundle.java
+2 -6
View File
@@ -1,23 +1,19 @@
//
// $Id: TileSetBundle.java,v 1.14 2003/04/27 06:35:09 mdb Exp $
// $Id: TileSetBundle.java,v 1.15 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.bundle;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Iterator;
import javax.imageio.ImageIO;
import com.samskivert.util.HashIntMap;
import com.threerings.resource.ResourceBundle;
import com.threerings.media.image.FastImageIO;
src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
+3 -12
View File
@@ -1,12 +1,9 @@
//
// $Id: TileSetBundler.java,v 1.18 2003/06/18 00:34:47 ray Exp $
// $Id: TileSetBundler.java,v 1.19 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.bundle.tools;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -15,28 +12,23 @@ import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import java.util.zip.Deflater;
import org.xml.sax.SAXException;
import javax.imageio.ImageIO;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.RuleSetBase;
import org.apache.commons.io.StreamUtils;
import org.xml.sax.SAXException;
import com.samskivert.io.NestableIOException;
import com.samskivert.io.PersistenceException;
import com.threerings.media.Log;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.FastImageIO;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.Mirage;
import com.threerings.media.tile.ImageProvider;
import com.threerings.media.tile.ObjectTileSet;
@@ -45,7 +37,6 @@ import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.TileSetIDBroker;
import com.threerings.media.tile.TrimmedObjectTileSet;
import com.threerings.media.tile.UniformTileSet;
import com.threerings.media.tile.bundle.BundleUtil;
import com.threerings.media.tile.bundle.TileSetBundle;
import com.threerings.media.tile.tools.xml.TileSetRuleSet;
src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
+1 -3
View File
@@ -1,11 +1,9 @@
//
// $Id: TileSetBundlerTask.java,v 1.7 2003/04/27 06:33:40 mdb Exp $
// $Id: TileSetBundlerTask.java,v 1.8 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.bundle.tools;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import org.apache.tools.ant.BuildException;
src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
+3 -7
View File
@@ -1,21 +1,17 @@
//
// $Id: ObjectTileSetRuleSet.java,v 1.9 2003/03/03 20:41:50 ray Exp $
// $Id: ObjectTileSetRuleSet.java,v 1.10 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.tools.xml;
import java.awt.Dimension;
import java.awt.Point;
import org.xml.sax.Attributes;
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.TileSet;
import com.threerings.media.tile.ObjectTileSet;
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/SwissArmyTileSetRuleSet.java
+1 -3
View File
@@ -1,19 +1,17 @@
//
// $Id: SwissArmyTileSetRuleSet.java,v 1.9 2002/04/01 22:53:39 mdb Exp $
// $Id: SwissArmyTileSetRuleSet.java,v 1.10 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.tools.xml;
import java.awt.Dimension;
import java.awt.Point;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil;
import com.samskivert.xml.CallMethodSpecialRule;
import com.threerings.media.Log;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.SwissArmyTileSet;
/**
src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
+1 -5
View File
@@ -1,16 +1,12 @@
//
// $Id: TileSetRuleSet.java,v 1.6 2002/02/05 20:29:10 mdb Exp $
// $Id: TileSetRuleSet.java,v 1.7 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.tools.xml;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.RuleSetBase;
import com.samskivert.util.StringUtil;
import com.samskivert.xml.ValidatedSetNextRule;
import com.samskivert.xml.ValidatedSetNextRule.Validator;
import com.threerings.media.Log;
src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
+1 -3
View File
@@ -1,13 +1,11 @@
//
// $Id: UniformTileSetRuleSet.java,v 1.8 2003/05/13 21:33:58 ray Exp $
// $Id: UniformTileSetRuleSet.java,v 1.9 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.tools.xml;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
import com.threerings.media.Log;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.UniformTileSet;
/**
src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
+2 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: XMLTileSetParser.java,v 1.7 2002/03/28 00:56:20 mdb Exp $
// $Id: XMLTileSetParser.java,v 1.8 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.tools.xml;
@@ -8,14 +8,11 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.xml.sax.SAXException;
import com.samskivert.util.ConfigUtil;
import com.samskivert.xml.ValidatedSetNextRule;
src/java/com/threerings/media/tile/util/TileSetTrimmer.java
+3 -10
View File
@@ -1,25 +1,18 @@
//
// $Id: TileSetTrimmer.java,v 1.8 2003/05/02 23:32:37 mdb Exp $
// $Id: TileSetTrimmer.java,v 1.9 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tile.util;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.awt.image.Raster;
import java.awt.image.RasterFormatException;
import java.awt.image.WritableRaster;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
import java.io.IOException;
import java.io.OutputStream;
import com.threerings.media.image.FastImageIO;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileSet;
/**