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

And of course, if I were thinking this morning, I would've rerun the organize imports

Browse Source 
thing before committing instead of just going "oh yeah, I've been having this stuff
sitting around uncommitted for a while waiting on it to be blessed" and missing
out on things that'd changed in the meantime.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@665 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Dave Hoover
2008-09-26 17:35:27 +00:00
parent b473318b12
commit 1daf5c206b
36 changed files with 97 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/cast/CharacterDescriptor.java
+2 -2
View File
@@ -21,10 +21,10 @@
package com.threerings.cast;
import java.awt.Point;
import java.util.Arrays;
import java.awt.Point;
import com.samskivert.util.StringUtil;
import com.threerings.media.image.Colorization;
src/java/com/threerings/cast/CompositedMultiFrameImage.java
+3 -3
View File
@@ -21,15 +21,15 @@
package com.threerings.cast;
import java.util.Arrays;
import java.util.Comparator;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.util.Arrays;
import java.util.Comparator;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.Mirage;
import com.threerings.media.image.VolatileMirage;
src/java/com/threerings/cast/bundle/BundledComponentRepository.java
+4 -4
View File
@@ -21,10 +21,6 @@
package com.threerings.cast.bundle;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
@@ -32,6 +28,10 @@ import java.util.Set;
import java.io.IOException;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import com.google.common.collect.Maps;
import com.samskivert.util.IntIntMap;
src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
-8
View File
@@ -21,14 +21,6 @@
package com.threerings.cast.bundle.tools;
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.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
src/java/com/threerings/media/AbstractMediaManager.java
+3 -3
View File
@@ -21,13 +21,13 @@
package com.threerings.media;
import java.util.Comparator;
import java.util.List;
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;
src/java/com/threerings/media/ActiveRepaintManager.java
-3
View File
@@ -33,9 +33,6 @@ 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;
src/java/com/threerings/media/MediaOverlay.java
+2 -2
View File
@@ -21,11 +21,11 @@
package com.threerings.media;
import java.util.List;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.List;
import javax.swing.JRootPane;
import com.threerings.media.animation.Animation;
src/java/com/threerings/media/MediaPanel.java
-2
View File
@@ -32,8 +32,6 @@ 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;
src/java/com/threerings/media/MetaMediaManager.java
+3 -3
View File
@@ -21,15 +21,15 @@
package com.threerings.media;
import java.util.Arrays;
import java.util.Iterator;
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;
import com.google.common.collect.Iterators;
import com.samskivert.util.IntListUtil;
src/java/com/threerings/media/RegionManager.java
+2 -2
View File
@@ -21,11 +21,11 @@
package com.threerings.media;
import java.util.List;
import java.awt.EventQueue;
import java.awt.Rectangle;
import java.util.List;
import com.google.common.collect.Lists;
import com.samskivert.util.StringUtil;
src/java/com/threerings/media/VirtualMediaPanel.java
+2 -2
View File
@@ -21,14 +21,14 @@
package com.threerings.media;
import java.util.ArrayList;
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;
import com.samskivert.util.RunAnywhere;
src/java/com/threerings/media/image/ImageDataProvider.java
+2 -2
View File
@@ -22,10 +22,10 @@
package com.threerings.media.image;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.awt.image.BufferedImage;
/**
* 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
+6 -6
View File
@@ -2,12 +2,6 @@
package com.threerings.media.image;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -17,6 +11,12 @@ import java.util.Map;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import com.google.common.collect.Maps;
import com.samskivert.util.LRUHashMap;
src/java/com/threerings/media/sprite/SpriteManager.java
+3 -3
View File
@@ -21,13 +21,13 @@
package com.threerings.media.sprite;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.awt.Graphics2D;
import java.awt.Shape;
import com.samskivert.util.Predicate;
import com.samskivert.util.SortableArrayList;
src/java/com/threerings/media/tile/SimpleCachingImageProvider.java
+3 -3
View File
@@ -21,13 +21,13 @@
package com.threerings.media.tile;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.util.Map;
import java.io.IOException;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import com.samskivert.util.LRUHashMap;
import com.threerings.media.image.BufferedMirage;
src/java/com/threerings/media/tile/TileSet.java
+3 -3
View File
@@ -23,14 +23,14 @@ package com.threerings.media.tile;
import java.lang.ref.SoftReference;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.util.Iterator;
import java.util.Map;
import java.io.Serializable;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import com.google.common.collect.Maps;
import com.samskivert.util.StringUtil;
src/java/com/threerings/media/tile/TrimmedTileSet.java
+2 -2
View File
@@ -21,11 +21,11 @@
package com.threerings.media.tile;
import java.awt.Rectangle;
import java.io.IOException;
import java.io.OutputStream;
import java.awt.Rectangle;
import com.threerings.resource.FastImageIO;
import com.threerings.media.image.Colorization;
src/java/com/threerings/media/tile/bundle/TileSetBundle.java
-2
View File
@@ -23,8 +23,6 @@ package com.threerings.media.tile.bundle;
import java.util.Iterator;
import java.util.Iterator;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
+2 -2
View File
@@ -21,8 +21,6 @@
package com.threerings.media.tile.bundle.tools;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.jar.JarEntry;
@@ -36,6 +34,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import org.xml.sax.SAXException;
src/java/com/threerings/media/tile/util/TileSetTrimmer.java
+3 -3
View File
@@ -21,15 +21,15 @@
package com.threerings.media.tile.util;
import java.io.IOException;
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 java.io.IOException;
import java.io.OutputStream;
import javax.imageio.ImageIO;
import com.threerings.resource.FastImageIO;
src/java/com/threerings/media/tools/RecolorImage.java
+9 -9
View File
@@ -21,6 +21,15 @@
package com.threerings.media.tools;
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 java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Graphics;
@@ -31,15 +40,6 @@ 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;
src/java/com/threerings/media/util/AStarPathUtil.java
-5
View File
@@ -28,11 +28,6 @@ import java.util.TreeSet;
import java.awt.Point;
import java.util.ArrayList;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import com.samskivert.util.HashIntMap;
/**
src/java/com/threerings/media/util/LineSegmentPath.java
+4 -4
View File
@@ -21,14 +21,14 @@
package com.threerings.media.util;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Point;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Point;
import com.samskivert.util.StringUtil;
import com.threerings.util.DirectionCodes;
src/java/com/threerings/miso/client/MisoScenePanel.java
+6 -6
View File
@@ -23,6 +23,12 @@ package com.threerings.miso.client;
import java.lang.ref.WeakReference;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import java.awt.AlphaComposite;
import java.awt.BasicStroke;
import java.awt.Color;
@@ -43,12 +49,6 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import javax.swing.Icon;
import javax.swing.JFrame;
src/java/com/threerings/miso/client/ObjectActionHandler.java
+2 -2
View File
@@ -21,10 +21,10 @@
package com.threerings.miso.client;
import java.awt.event.ActionEvent;
import java.util.HashMap;
import java.awt.event.ActionEvent;
import javax.swing.Icon;
import com.samskivert.util.StringUtil;
src/java/com/threerings/miso/client/RethinkOp.java
+2 -2
View File
@@ -1,10 +1,10 @@
package com.threerings.miso.client;
import java.util.Set;
import java.awt.Point;
import java.awt.Rectangle;
import java.util.Set;
import com.google.common.collect.Sets;
import com.threerings.media.util.MathUtil;
src/java/com/threerings/miso/client/SceneObjectIndicator.java
+2 -2
View File
@@ -1,10 +1,10 @@
package com.threerings.miso.client;
import java.util.Collection;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.Collection;
import javax.swing.Icon;
/**
src/java/com/threerings/miso/client/SceneObjectTip.java
-1
View File
@@ -30,7 +30,6 @@ import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import javax.swing.Icon;
import javax.swing.UIManager;
src/java/com/threerings/miso/tile/AutoFringer.java
+4 -4
View File
@@ -23,15 +23,15 @@ package com.threerings.miso.tile;
import java.lang.ref.WeakReference;
import java.awt.Graphics2D;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.awt.Graphics2D;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import com.google.common.collect.Lists;
import com.samskivert.util.CheapIntMap;
src/java/com/threerings/resource/FastImageIO.java
+8 -8
View File
@@ -21,14 +21,6 @@
package com.threerings.resource;
import java.awt.Point;
import java.awt.image.BufferedImage;
import java.awt.image.DataBuffer;
import java.awt.image.DataBufferByte;
import java.awt.image.IndexColorModel;
import java.awt.image.PixelInterleavedSampleModel;
import java.awt.image.WritableRaster;
import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
@@ -39,6 +31,14 @@ import java.nio.IntBuffer;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.awt.Point;
import java.awt.image.BufferedImage;
import java.awt.image.DataBuffer;
import java.awt.image.DataBufferByte;
import java.awt.image.IndexColorModel;
import java.awt.image.PixelInterleavedSampleModel;
import java.awt.image.WritableRaster;
/**
* Provides routines for writing and reading uncompressed 8-bit color
* mapped images in a manner that is extremely fast and generates a
src/java/com/threerings/resource/FileResourceBundle.java
+2 -2
View File
@@ -21,8 +21,6 @@
package com.threerings.resource;
import java.awt.image.BufferedImage;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -33,6 +31,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.awt.image.BufferedImage;
import org.apache.commons.io.IOUtils;
import com.samskivert.util.FileUtil;
src/java/com/threerings/resource/Handler.java
+3 -3
View File
@@ -26,13 +26,13 @@ import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.security.Permission;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import com.samskivert.io.ByteArrayOutInputStream;
src/java/com/threerings/resource/NetworkResourceBundle.java
+2 -2
View File
@@ -26,13 +26,13 @@ import java.net.URL;
import java.net.URLConnection;
import java.security.AccessControlException;
import java.awt.image.BufferedImage;
import java.util.HashSet;
import java.io.IOException;
import java.io.InputStream;
import java.awt.image.BufferedImage;
import static com.threerings.resource.Log.log;
/**
src/java/com/threerings/resource/ResourceBundle.java
+2 -2
View File
@@ -21,11 +21,11 @@
package com.threerings.resource;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.awt.image.BufferedImage;
/**
* A resource bundle provides access to media resources.
*/
src/java/com/threerings/resource/ResourceManager.java
+3 -3
View File
@@ -24,9 +24,6 @@ package com.threerings.resource;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.awt.EventQueue;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -45,6 +42,9 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.awt.EventQueue;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.MemoryCacheImageInputStream;
src/java/com/threerings/util/KeyboardManager.java
+3 -3
View File
@@ -21,6 +21,9 @@
package com.threerings.util;
import java.util.HashMap;
import java.util.Iterator;
import java.awt.KeyEventDispatcher;
import java.awt.KeyboardFocusManager;
import java.awt.Window;
@@ -28,9 +31,6 @@ import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
import java.util.HashMap;
import java.util.Iterator;
import javax.swing.JComponent;
import javax.swing.SwingUtilities;
import javax.swing.event.AncestorEvent;