Eclipse suggested cleanup.

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
@@ -1,27 +1,18 @@
//
// $Id: DirtyItemList.java,v 1.28 2003/04/28 23:33:43 mdb Exp $
// $Id: DirtyItemList.java,v 1.29 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.client;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Polygon;
import java.awt.Rectangle;
import java.awt.Shape;
import java.util.ArrayList;
import java.util.Comparator;
import com.samskivert.util.SortableArrayList;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.tile.ObjectTile;
import com.threerings.miso.MisoPrefs;
/**
* The dirty item list keeps track of dirty sprites and object tiles
* in a scene.
@@ -1,5 +1,5 @@
//
// $Id: MisoScenePanel.java,v 1.58 2004/02/22 18:55:26 ray Exp $
// $Id: MisoScenePanel.java,v 1.59 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.client;
@@ -9,7 +9,6 @@ import java.awt.Color;
import java.awt.Component;
import java.awt.Composite;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
@@ -46,7 +45,6 @@ import com.threerings.media.sprite.Sprite;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.TileUtil;
import com.threerings.media.util.MathUtil;
import com.threerings.media.util.Path;
@@ -60,7 +58,6 @@ import com.threerings.miso.util.AStarPathUtil;
import com.threerings.miso.util.MisoContext;
import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil;
import com.threerings.miso.util.ObjectSet;
/**
* Renders a Miso scene for all to see.
@@ -1,5 +1,5 @@
//
// $Id: SceneBlock.java,v 1.23 2003/11/12 23:13:45 ray Exp $
// $Id: SceneBlock.java,v 1.24 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.client;
@@ -18,8 +18,6 @@ import com.threerings.geom.GeomUtil;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.TileSet;
import com.threerings.media.util.MathUtil;
@@ -1,5 +1,5 @@
//
// $Id: SceneObjectTip.java,v 1.4 2004/01/11 08:26:18 mdb Exp $
// $Id: SceneObjectTip.java,v 1.5 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.client;
@@ -11,15 +11,12 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.Collection;
import java.util.Comparator;
import javax.swing.Icon;
import javax.swing.UIManager;
import com.samskivert.swing.Label;
import com.samskivert.swing.LabelSausage;
import com.samskivert.swing.LabelStyleConstants;
import com.samskivert.swing.util.SwingUtil;
import com.samskivert.util.StringUtil;
import com.samskivert.util.SortableArrayList;
@@ -1,5 +1,5 @@
//
// $Id: TilePath.java,v 1.17 2003/05/16 00:26:18 mdb Exp $
// $Id: TilePath.java,v 1.18 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.client;
@@ -11,9 +11,7 @@ import com.threerings.util.DirectionCodes;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.util.LineSegmentPath;
import com.threerings.media.util.MathUtil;
import com.threerings.media.util.PathNode;
import com.threerings.miso.Log;
import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil;
@@ -1,5 +1,5 @@
//
// $Id: MisoSceneModel.java,v 1.18 2003/04/25 22:26:25 mdb Exp $
// $Id: MisoSceneModel.java,v 1.19 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.data;
@@ -8,8 +8,6 @@ import java.util.Random;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.media.tile.TileUtil;
import com.threerings.miso.util.ObjectSet;
/**
@@ -1,5 +1,5 @@
//
// $Id: ObjectInfo.java,v 1.4 2003/07/12 04:16:10 mdb Exp $
// $Id: ObjectInfo.java,v 1.5 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.data;
@@ -60,7 +60,7 @@ public class ObjectInfo extends SimpleStreamableObject
this.sx = other.sx;
this.sy = other.sy;
this.sorient = other.sorient;
this.zations = zations;
this.zations = other.zations;
}
/**
@@ -1,5 +1,5 @@
//
// $Id: SparseMisoSceneModel.java,v 1.10 2004/01/11 12:21:17 mdb Exp $
// $Id: SparseMisoSceneModel.java,v 1.11 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.data;
@@ -8,7 +8,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import com.samskivert.util.ArrayUtil;
import com.samskivert.util.IntListUtil;
import com.samskivert.util.ListUtil;
import com.samskivert.util.StringUtil;
@@ -1,10 +1,8 @@
//
// $Id: VirtualMisoSceneModel.java,v 1.3 2003/04/19 22:40:34 mdb Exp $
// $Id: VirtualMisoSceneModel.java,v 1.4 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.data;
import java.awt.Rectangle;
/**
* A convenient base class for "virtual" scenes which do not allow editing
* and compute the base and object tiles rather than obtain them from some
@@ -1,24 +1,20 @@
//
// $Id: AutoFringer.java,v 1.27 2003/11/12 23:13:45 ray Exp $
// $Id: AutoFringer.java,v 1.28 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.tile;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Random;
import com.samskivert.util.CheapIntMap;
import com.samskivert.util.QuickSort;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
import com.threerings.media.image.BufferedMirage;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
@@ -26,12 +22,7 @@ import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.TileSet;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.BackedVolatileMirage;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.Mirage;
import com.threerings.miso.Log;
import com.threerings.miso.data.MisoSceneModel;
import com.threerings.miso.util.MisoUtil;
@@ -1,17 +1,14 @@
//
// $Id: FringeConfiguration.java,v 1.15 2003/05/29 01:58:06 ray Exp $
// $Id: FringeConfiguration.java,v 1.16 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.tile;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Random;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.StringUtil;
import com.threerings.miso.Log;
/**
* Used to manage data about which base tilesets fringe on which others
* and how they fringe.
@@ -1,15 +1,13 @@
//
// $Id: BaseTileSetRuleSet.java,v 1.9 2002/02/05 20:29:10 mdb Exp $
// $Id: BaseTileSetRuleSet.java,v 1.10 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.tile.tools.xml;
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.tile.TileSet;
import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
import com.threerings.miso.Log;
@@ -1,5 +1,5 @@
//
// $Id: FringeConfigurationParser.java,v 1.8 2002/05/07 00:05:02 mdb Exp $
// $Id: FringeConfigurationParser.java,v 1.9 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.tile.tools.xml;
@@ -7,7 +7,6 @@ import java.io.Serializable;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import com.samskivert.util.StringUtil;
import com.samskivert.xml.SetPropertyFieldsRule;
@@ -1,5 +1,5 @@
//
// $Id: SimpleMisoSceneParser.java,v 1.1 2003/04/17 19:21:16 mdb Exp $
// $Id: SimpleMisoSceneParser.java,v 1.2 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.tools.xml;
@@ -10,7 +10,6 @@ import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil;
import com.threerings.tools.xml.NestableRuleSet;
import com.threerings.miso.data.SimpleMisoSceneModel;
@@ -1,5 +1,5 @@
//
// $Id: SparseMisoSceneParser.java,v 1.2 2003/05/14 21:34:01 ray Exp $
// $Id: SparseMisoSceneParser.java,v 1.3 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.tools.xml;
@@ -11,7 +11,6 @@ import org.apache.commons.digester.Digester;
import com.samskivert.io.StreamUtil;
import com.samskivert.util.StringUtil;
import com.threerings.tools.xml.NestableRuleSet;
import com.threerings.miso.data.SparseMisoSceneModel;
@@ -1,15 +1,13 @@
//
// $Id: SparseMisoSceneRuleSet.java,v 1.2 2003/04/21 17:08:57 mdb Exp $
// $Id: SparseMisoSceneRuleSet.java,v 1.3 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.tools.xml;
import java.util.ArrayList;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import com.samskivert.xml.CallMethodSpecialRule;
import com.samskivert.xml.SetFieldRule;
import com.samskivert.xml.SetPropertyFieldsRule;
@@ -1,5 +1,5 @@
//
// $Id: AStarPathUtil.java,v 1.3 2004/01/12 05:52:05 mdb Exp $
// $Id: AStarPathUtil.java,v 1.4 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.util;
@@ -10,9 +10,6 @@ import com.samskivert.util.HashIntMap;
import com.threerings.media.util.MathUtil;
import com.threerings.miso.Log;
import com.threerings.miso.tile.BaseTile;
/**
* The <code>AStarPathUtil</code> class provides a facility for
* finding a reasonable path between two points in a scene using the
@@ -1,11 +1,8 @@
//
// $Id: MisoSceneMetrics.java,v 1.4 2003/05/12 02:04:16 mdb Exp $
// $Id: MisoSceneMetrics.java,v 1.5 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.util;
import java.awt.Point;
import java.awt.Rectangle;
/**
* Contains information on the configuration of a particular isometric
* view. The member data are public to facilitate convenient referencing
@@ -1,23 +1,17 @@
//
// $Id: MisoUtil.java,v 1.22 2003/05/29 01:58:06 ray Exp $
// $Id: MisoUtil.java,v 1.23 2004/02/25 14:43:57 mdb Exp $
package com.threerings.miso.util;
import java.awt.Point;
import java.awt.Polygon;
import java.awt.Rectangle;
import com.samskivert.swing.SmartPolygon;
import com.samskivert.util.StringUtil;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.util.MathUtil;
import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil;
import com.threerings.miso.Log;
import com.threerings.miso.MisoConfig;
import com.threerings.media.util.MathUtil;
/**
* Miscellaneous isometric-display-related utility routines.