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/AbstractMedia.java
-1
View File
@@ -24,7 +24,6 @@ package com.threerings.media;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.geom.AffineTransform;
import java.awt.geom.PathIterator;
import java.awt.geom.Point2D;
src/java/com/threerings/media/AbstractMediaManager.java
+4 -2
View File
@@ -21,20 +21,22 @@
package com.threerings.media;
import static com.threerings.resource.Log.log;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.util.Comparator;
import java.util.List;
import com.google.common.collect.Lists;
import com.samskivert.util.ObserverList;
import com.samskivert.util.SortableArrayList;
import com.samskivert.util.Tuple;
import com.samskivert.util.ObserverList.ObserverOp;
import static com.threerings.resource.Log.log;
/**
* Manages, ticks, and paints {@link AbstractMedia}.
*/
src/java/com/threerings/media/ActiveRepaintManager.java
+4 -4
View File
@@ -24,12 +24,15 @@ package com.threerings.media;
import java.applet.Applet;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.Window;
import java.util.Iterator;
import java.util.Map;
import javax.swing.CellRendererPane;
import javax.swing.JComponent;
import javax.swing.JEditorPane;
@@ -38,9 +41,6 @@ import javax.swing.JTextField;
import javax.swing.RepaintManager;
import javax.swing.SwingUtilities;
import java.util.Iterator;
import java.util.Map;
import com.google.common.collect.Maps;
import com.samskivert.util.ListUtil;
src/java/com/threerings/media/FrameInterval.java
-3
View File
@@ -23,9 +23,6 @@ package com.threerings.media;
import java.awt.Component;
import com.threerings.media.FrameManager;
import com.threerings.media.FrameParticipant;
public abstract class FrameInterval
implements FrameParticipant
{
src/java/com/threerings/media/FrameManager.java
+3 -1
View File
@@ -22,6 +22,7 @@
package com.threerings.media;
import java.applet.Applet;
import java.awt.Component;
import java.awt.EventQueue;
import java.awt.Graphics2D;
@@ -32,11 +33,12 @@ import javax.swing.JLayeredPane;
import javax.swing.JRootPane;
import javax.swing.RepaintManager;
import com.samskivert.swing.RuntimeAdjust;
import com.samskivert.util.ListUtil;
import com.samskivert.util.RunAnywhere;
import com.samskivert.util.StringUtil;
import com.samskivert.swing.RuntimeAdjust;
import com.threerings.util.unsafe.Unsafe;
import com.threerings.media.timer.CalibratingTimer;
src/java/com/threerings/media/IconManager.java
+2 -2
View File
@@ -21,10 +21,11 @@
package com.threerings.media;
import java.io.IOException;
import java.util.Map;
import java.util.Properties;
import java.io.IOException;
import javax.swing.Icon;
import javax.swing.ImageIcon;
@@ -33,7 +34,6 @@ import com.samskivert.util.LRUHashMap;
import com.samskivert.util.StringUtil;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.TileIcon;
import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.TileSet;
src/java/com/threerings/media/ManagedJApplet.java
+1
View File
@@ -23,6 +23,7 @@ package com.threerings.media;
import java.awt.Component;
import java.awt.Window;
import javax.swing.JApplet;
/**
src/java/com/threerings/media/MediaOverlay.java
+1
View File
@@ -23,6 +23,7 @@ package com.threerings.media;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.List;
import javax.swing.JRootPane;
src/java/com/threerings/media/MediaPanel.java
+4 -7
View File
@@ -22,38 +22,35 @@
package com.threerings.media;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import javax.swing.JComponent;
import javax.swing.SwingUtilities;
import javax.swing.event.AncestorEvent;
import javax.swing.event.MouseInputAdapter;
import java.util.ArrayList;
import com.samskivert.swing.Controller;
import com.samskivert.swing.event.AncestorAdapter;
import com.samskivert.swing.event.CommandEvent;
import com.threerings.media.timer.MediaTimer;
import com.threerings.media.animation.Animation;
import com.threerings.media.animation.AnimationManager;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.sprite.SpriteManager;
import com.threerings.media.sprite.action.ActionSprite;
import com.threerings.media.sprite.action.ArmingSprite;
import com.threerings.media.sprite.action.CommandSprite;
import com.threerings.media.sprite.action.DisableableSprite;
import com.threerings.media.sprite.action.HoverSprite;
import com.threerings.media.timer.MediaTimer;
import static com.threerings.media.Log.log;
src/java/com/threerings/media/MetaMediaManager.java
+3 -2
View File
@@ -21,13 +21,12 @@
package com.threerings.media;
import static com.threerings.media.Log.log;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.Arrays;
import java.util.Iterator;
@@ -44,6 +43,8 @@ import com.threerings.media.sprite.Sprite;
import com.threerings.media.sprite.SpriteManager;
import com.threerings.media.timer.MediaTimer;
import static com.threerings.media.Log.log;
/**
* Coordinates interaction between a sprite and animation manager and the media host that hosts and
* renders them. This class is a little fiddly because {@link MediaPanel} has been around a long
src/java/com/threerings/media/RegionManager.java
+2
View File
@@ -23,9 +23,11 @@ package com.threerings.media;
import java.awt.EventQueue;
import java.awt.Rectangle;
import java.util.List;
import com.google.common.collect.Lists;
import com.samskivert.util.StringUtil;
import static com.threerings.resource.Log.log;
src/java/com/threerings/media/TimerView.java
+1 -1
View File
@@ -24,11 +24,11 @@ package com.threerings.media;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
import javax.swing.JComponent;
import com.samskivert.util.ResultListener;
/**
src/java/com/threerings/media/VirtualMediaPanel.java
+2 -1
View File
@@ -21,11 +21,12 @@
package com.threerings.media;
import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
import java.util.ArrayList;
import javax.swing.SwingUtilities;
src/java/com/threerings/media/VirtualRangeModel.java
-1
View File
@@ -25,7 +25,6 @@ import java.awt.Rectangle;
import javax.swing.BoundedRangeModel;
import javax.swing.DefaultBoundedRangeModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
src/java/com/threerings/media/animation/AnimationSprite.java
-1
View File
@@ -26,7 +26,6 @@ import java.awt.Rectangle;
import com.threerings.media.MediaPanel;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.animation.Animation;
/**
* A Sprite that wraps an animation so that a sequence of frames can be easily
src/java/com/threerings/media/animation/BobbleAnimation.java
+1
View File
@@ -25,6 +25,7 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import com.samskivert.util.RandomUtil;
import com.threerings.media.image.Mirage;
/**
src/java/com/threerings/media/animation/SparkAnimation.java
-1
View File
@@ -29,7 +29,6 @@ import java.awt.Shape;
import com.samskivert.util.RandomUtil;
import com.threerings.media.animation.Animation;
import com.threerings.media.image.Mirage;
/**
src/java/com/threerings/media/animation/SpriteAnimation.java
+1 -1
View File
@@ -24,9 +24,9 @@ package com.threerings.media.animation;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import com.threerings.media.sprite.PathObserver;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.sprite.SpriteManager;
import com.threerings.media.sprite.PathObserver;
import com.threerings.media.util.Path;
public class SpriteAnimation extends Animation
src/java/com/threerings/media/image/ClientImageManager.java
+3 -1
View File
@@ -26,9 +26,11 @@ import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import com.samskivert.swing.RuntimeAdjust;
import com.threerings.media.MediaPrefs;
import com.threerings.resource.ResourceManager;
import com.threerings.media.MediaPrefs;
/**
* Provides a single point of access for image retrieval and caching - just like the
* ImageManager but adds a tie in to the RuntimeAdjust system to control caching and
src/java/com/threerings/media/image/ColorPository.java
+3 -1
View File
@@ -22,6 +22,7 @@
package com.threerings.media.image;
import java.awt.Color;
import java.util.ArrayList;
import java.util.Iterator;
@@ -36,9 +37,10 @@ import com.samskivert.util.HashIntMap;
import com.samskivert.util.RandomUtil;
import com.samskivert.util.StringUtil;
import com.threerings.resource.ResourceManager;
import com.threerings.util.CompiledConfig;
import com.threerings.resource.ResourceManager;
import static com.threerings.media.Log.log;
/**
src/java/com/threerings/media/image/ImageDataProvider.java
+2 -1
View File
@@ -21,9 +21,10 @@
package com.threerings.media.image;
import java.io.IOException;
import java.awt.image.BufferedImage;
import java.io.IOException;
/**
* Provides access to image data for the image with the specified
* path. Images loaded from different data providers (which are
src/java/com/threerings/media/image/ImageManager.java
+7 -4
View File
@@ -2,29 +2,32 @@
package com.threerings.media.image;
import static com.threerings.media.Log.log;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.io.FileNotFoundException;
import java.io.IOException;
import com.google.common.collect.Maps;
import com.samskivert.util.LRUHashMap;
import com.samskivert.util.StringUtil;
import com.samskivert.util.Throttle;
import com.samskivert.util.Tuple;
import com.threerings.resource.ResourceManager;
import static com.threerings.media.Log.log;
/**
* Provides a single point of access for image retrieval and caching. This does not include
* any tie-in to runtime adjustments to control caching and mirage creation.
src/java/com/threerings/media/image/ImageUtil.java
-1
View File
@@ -32,7 +32,6 @@ import java.awt.HeadlessException;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.DataBuffer;
src/java/com/threerings/media/image/MirageIcon.java
+1 -1
View File
@@ -22,8 +22,8 @@
package com.threerings.media.image;
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/image/tools/DumpColorPository.java
+2 -1
View File
@@ -21,9 +21,10 @@
package com.threerings.media.image.tools;
import java.util.Iterator;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Iterator;
import com.threerings.media.image.ColorPository;
src/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java
+5 -3
View File
@@ -24,15 +24,17 @@ package com.threerings.media.image.tools.xml;
import java.io.Serializable;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import com.samskivert.xml.SetPropertyFieldsRule;
import com.threerings.tools.xml.CompiledConfigParser;
import com.threerings.media.image.ColorPository;
import com.threerings.media.image.ColorPository.ClassRecord;
import com.threerings.media.image.ColorPository.ColorRecord;
import com.threerings.media.image.ColorPository;
import com.threerings.tools.xml.CompiledConfigParser;
/**
* Parses the XML color repository definition and creates a {@link
src/java/com/threerings/media/sound/JavaSoundPlayer.java
+5 -3
View File
@@ -21,7 +21,7 @@
package com.threerings.media.sound;
import static com.threerings.media.Log.log;
import java.util.HashMap;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -29,7 +29,6 @@ import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
@@ -51,9 +50,12 @@ import com.samskivert.util.StringUtil;
import com.samskivert.swing.RuntimeAdjust;
import com.threerings.media.MediaPrefs;
import com.threerings.resource.ResourceManager;
import com.threerings.media.MediaPrefs;
import static com.threerings.media.Log.log;
/**
* Manages the playing of audio files via the Java Sound APIs.
*/
src/java/com/threerings/media/sound/SoundLoader.java
+4 -2
View File
@@ -1,19 +1,21 @@
package com.threerings.media.sound;
import static com.threerings.media.Log.log;
import java.util.Properties;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import org.apache.commons.io.IOUtils;
import com.samskivert.util.Config;
import com.samskivert.util.ConfigUtil;
import com.samskivert.util.LRUHashMap;
import com.threerings.resource.ResourceManager;
import static com.threerings.media.Log.log;
/**
* Loads sound clips specified by package-based properties files.
*/
src/java/com/threerings/media/sprite/ButtonSprite.java
+1
View File
@@ -24,6 +24,7 @@ package com.threerings.media.sprite;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import com.samskivert.swing.Label;
import com.samskivert.swing.util.SwingUtil;
src/java/com/threerings/media/sprite/OrientableImageSprite.java
-2
View File
@@ -23,12 +23,10 @@ package com.threerings.media.sprite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
import com.threerings.media.image.Mirage;
import com.threerings.media.util.MultiFrameImage;
/**
src/java/com/threerings/media/sprite/Sprite.java
+1
View File
@@ -26,6 +26,7 @@ import java.awt.Rectangle;
import java.awt.Shape;
import com.samskivert.util.ObserverList;
import com.threerings.util.DirectionCodes;
import com.threerings.media.AbstractMedia;
src/java/com/threerings/media/sprite/SpriteManager.java
+1 -1
View File
@@ -25,8 +25,8 @@ import java.awt.Graphics2D;
import java.awt.Shape;
import java.util.Collections;
import java.util.List;
import java.util.Iterator;
import java.util.List;
import com.samskivert.util.Predicate;
import com.samskivert.util.SortableArrayList;
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
src/java/com/threerings/media/timer/CalibratingTimer.java
+3 -1
View File
@@ -21,9 +21,11 @@
package com.threerings.media.timer;
import com.samskivert.swing.RuntimeAdjust;
import com.samskivert.util.Interval;
import com.samskivert.util.Logger;
import com.samskivert.swing.RuntimeAdjust;
import com.threerings.media.MediaPrefs;
/**
src/java/com/threerings/media/tools/RecolorImage.java
+5 -5
View File
@@ -25,22 +25,22 @@ import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Collections;
import java.util.Comparator;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import javax.imageio.ImageIO;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
src/java/com/threerings/media/tools/ResourceIndexerTask.java
+2 -1
View File
@@ -1,9 +1,10 @@
package com.threerings.media.tools;
import java.util.ArrayList;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
src/java/com/threerings/media/util/AStarPathUtil.java
+5 -3
View File
@@ -22,12 +22,14 @@
package com.threerings.media.util;
import java.awt.Point;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import com.samskivert.util.HashIntMap;
import com.threerings.media.util.MathUtil;
/**
* The <code>AStarPathUtil</code> class provides a facility for
* finding a reasonable path between two points in a scene using the
src/java/com/threerings/media/util/LineSegmentPath.java
+1 -3
View File
@@ -22,8 +22,8 @@
package com.threerings.media.util;
import java.awt.Color;
import java.awt.Point;
import java.awt.Graphics2D;
import java.awt.Point;
import java.util.ArrayList;
import java.util.Iterator;
@@ -34,8 +34,6 @@ import com.samskivert.util.StringUtil;
import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil;
import com.threerings.media.util.MathUtil;
import static com.threerings.media.Log.log;
/**
src/java/com/threerings/media/util/TiledArea.java
+1
View File
@@ -24,6 +24,7 @@ package com.threerings.media.util;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.image.BufferedImage;
import javax.swing.JComponent;
/**