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/AbstractMedia.java
+1 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: AbstractMedia.java,v 1.9 2003/04/30 00:43:54 mdb Exp $
// $Id: AbstractMedia.java,v 1.10 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
@@ -12,8 +12,6 @@ import java.awt.geom.PathIterator;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import com.samskivert.util.ObserverList;
import com.samskivert.util.StringUtil;
src/java/com/threerings/media/BackFrameManager.java
+1 -6
View File
@@ -1,5 +1,5 @@
//
// $Id: BackFrameManager.java,v 1.6 2003/11/25 19:42:54 mdb Exp $
// $Id: BackFrameManager.java,v 1.7 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
@@ -7,11 +7,6 @@ import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Rectangle;
import java.awt.image.VolatileImage;
import javax.swing.JFrame;
import com.samskivert.util.StringUtil;
import com.threerings.media.timer.MediaTimer;
/**
* A {@link FrameManager} extension that uses a volatile off-screen image
src/java/com/threerings/media/FlipFrameManager.java
+1 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: FlipFrameManager.java,v 1.4 2003/05/05 01:41:57 mdb Exp $
// $Id: FlipFrameManager.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
@@ -10,10 +10,6 @@ import java.awt.ImageCapabilities;
import java.awt.Rectangle;
import java.awt.image.BufferStrategy;
import javax.swing.JFrame;
import com.threerings.media.timer.MediaTimer;
/**
* A {@link FrameManager} extension that uses a flip-buffer (via {@link
* BufferStrategy} to do its rendering.
src/java/com/threerings/media/FrameManager.java
+1 -9
View File
@@ -1,17 +1,12 @@
//
// $Id: FrameManager.java,v 1.49 2003/12/19 18:31:11 mdb Exp $
// $Id: FrameManager.java,v 1.50 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
import java.applet.Applet;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.GraphicsDevice;
import java.awt.KeyEventDispatcher;
import java.awt.KeyboardFocusManager;
import java.awt.Rectangle;
@@ -25,15 +20,12 @@ import java.awt.event.WindowListener;
import java.awt.EventQueue;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLayeredPane;
import javax.swing.RepaintManager;
import javax.swing.event.AncestorEvent;
import javax.swing.event.AncestorListener;
import com.samskivert.swing.Label;
import com.samskivert.util.DebugChords;
import com.samskivert.util.ObserverList;
import com.samskivert.util.RunAnywhere;
import com.samskivert.util.RuntimeAdjust;
src/java/com/threerings/media/FrameRepaintManager.java
+1 -3
View File
@@ -1,12 +1,11 @@
//
// $Id: FrameRepaintManager.java,v 1.19 2003/04/26 17:56:26 mdb Exp $
// $Id: FrameRepaintManager.java,v 1.20 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
import java.applet.Applet;
import java.awt.Component;
import java.awt.Font;
import java.awt.Frame;
import java.awt.Graphics2D;
import java.awt.Graphics;
@@ -15,7 +14,6 @@ import java.awt.Rectangle;
import java.awt.Window;
import javax.swing.CellRendererPane;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JEditorPane;
import javax.swing.JScrollPane;
src/java/com/threerings/media/Log.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: Log.java,v 1.2 2002/11/22 01:53:53 mdb Exp $
// $Id: Log.java,v 1.3 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
@@ -40,6 +40,6 @@ public class Log
public static int getLevel ()
{
return log.getLevel(PACKAGE);
return com.samskivert.util.Log.getLevel(PACKAGE);
}
}
src/java/com/threerings/media/MediaPanel.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: MediaPanel.java,v 1.40 2003/08/08 21:43:05 mdb Exp $
// $Id: MediaPanel.java,v 1.41 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
@@ -13,7 +13,6 @@ import java.awt.Rectangle;
import java.awt.Shape;
import javax.swing.JComponent;
import javax.swing.RepaintManager;
import javax.swing.SwingUtilities;
import javax.swing.event.AncestorEvent;
src/java/com/threerings/media/RegionManager.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: RegionManager.java,v 1.11 2004/02/03 07:32:41 ray Exp $
// $Id: RegionManager.java,v 1.12 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
@@ -7,7 +7,6 @@ import java.awt.EventQueue;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.List;
import com.samskivert.util.StringUtil;
src/java/com/threerings/media/VirtualMediaPanel.java
+1 -7
View File
@@ -1,25 +1,19 @@
//
// $Id: VirtualMediaPanel.java,v 1.24 2004/02/05 18:53:00 eric Exp $
// $Id: VirtualMediaPanel.java,v 1.25 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.event.MouseEvent;
import javax.swing.SwingUtilities;
import com.samskivert.util.RunAnywhere;
import com.samskivert.util.StringUtil;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.Mirage;
import com.threerings.media.util.MathUtil;
import com.threerings.media.util.Path;
import com.threerings.media.util.Pathable;
/**
src/java/com/threerings/media/animation/Animation.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: Animation.java,v 1.10 2003/04/30 00:45:02 mdb Exp $
// $Id: Animation.java,v 1.11 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.animation;
import java.awt.Rectangle;
import com.threerings.media.AbstractMedia;
import com.threerings.media.Log;
/**
* The animation class is an abstract class that should be extended to
src/java/com/threerings/media/animation/AnimationFrameSequencer.java
+1 -3
View File
@@ -1,10 +1,8 @@
//
// $Id: AnimationFrameSequencer.java,v 1.6 2003/04/30 00:45:02 mdb Exp $
// $Id: AnimationFrameSequencer.java,v 1.7 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.animation;
import java.util.Arrays;
import com.samskivert.util.ObserverList;
import com.threerings.media.util.FrameSequencer;
src/java/com/threerings/media/animation/AnimationManager.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: AnimationManager.java,v 1.16 2003/04/30 00:45:02 mdb Exp $
// $Id: AnimationManager.java,v 1.17 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.animation;
import com.samskivert.util.ObserverList;
import com.threerings.media.AbstractMediaManager;
import com.threerings.media.Log;
import com.threerings.media.RegionManager;
/**
src/java/com/threerings/media/animation/BobbleAnimation.java
+2 -5
View File
@@ -1,16 +1,13 @@
//
// $Id: BobbleAnimation.java,v 1.6 2003/01/13 22:49:46 mdb Exp $
// $Id: BobbleAnimation.java,v 1.7 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.animation;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import com.threerings.util.RandomUtil;
import com.threerings.media.Log;
import com.threerings.media.image.Mirage;
import com.threerings.util.RandomUtil;
/**
* An animation that bobbles an image around within a specific horizontal
src/java/com/threerings/media/animation/ExplodeAnimation.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: ExplodeAnimation.java,v 1.14 2003/01/13 22:49:46 mdb Exp $
// $Id: ExplodeAnimation.java,v 1.15 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.animation;
@@ -13,7 +13,6 @@ import java.awt.Shape;
import com.samskivert.util.StringUtil;
import com.threerings.util.RandomUtil;
import com.threerings.media.Log;
import com.threerings.media.image.Mirage;
/**
src/java/com/threerings/media/animation/FadeAnimation.java
+1 -2
View File
@@ -1,10 +1,9 @@
//
// $Id: FadeAnimation.java,v 1.6 2003/01/13 22:49:46 mdb Exp $
// $Id: FadeAnimation.java,v 1.7 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.animation;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
src/java/com/threerings/media/animation/SparkAnimation.java
+1 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: SparkAnimation.java,v 1.2 2003/01/13 22:49:46 mdb Exp $
// $Id: SparkAnimation.java,v 1.3 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.animation;
@@ -8,8 +8,6 @@ import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.Arrays;
import com.threerings.util.RandomUtil;
import com.threerings.media.animation.Animation;
src/java/com/threerings/media/image/CachedVolatileMirage.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: CachedVolatileMirage.java,v 1.3 2003/04/11 18:48:05 mdb Exp $
// $Id: CachedVolatileMirage.java,v 1.4 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.image;
@@ -9,7 +9,6 @@ import java.awt.Transparency;
import java.awt.image.BufferedImage;
import com.threerings.media.Log;
import com.samskivert.util.StringUtil;
/**
* A mirage implementation which allows the image to be maintained in
src/java/com/threerings/media/image/ImageManager.java
+1 -6
View File
@@ -1,21 +1,17 @@
//
// $Id: ImageManager.java,v 1.58 2003/07/28 04:06:14 mdb Exp $
// $Id: ImageManager.java,v 1.59 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.image;
import java.awt.Component;
import java.awt.EventQueue;
import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
@@ -26,7 +22,6 @@ import java.util.Iterator;
import javax.imageio.ImageIO;
import javax.imageio.stream.ImageInputStream;
import com.samskivert.io.NestableIOException;
import com.samskivert.util.LRUHashMap;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil;
src/java/com/threerings/media/image/ImageUtil.java
+1 -8
View File
@@ -1,5 +1,5 @@
//
// $Id: ImageUtil.java,v 1.33 2003/06/23 17:59:04 mdb Exp $
// $Id: ImageUtil.java,v 1.34 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.image;
@@ -11,7 +11,6 @@ import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.Transparency;
@@ -23,16 +22,10 @@ import java.awt.image.IndexColorModel;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.geom.Area;
import java.util.Arrays;
import java.util.Iterator;
import com.samskivert.swing.Label;
import com.samskivert.util.ArrayUtil;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
/**
* Image related utility functions.
src/java/com/threerings/media/image/VolatileMirage.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: VolatileMirage.java,v 1.4 2003/01/17 02:30:21 mdb Exp $
// $Id: VolatileMirage.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.image;
@@ -7,7 +7,6 @@ import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.awt.image.VolatileImage;
import com.samskivert.util.StringUtil;
src/java/com/threerings/media/sound/MidiPlayer.java
+1 -5
View File
@@ -1,19 +1,15 @@
//
// $Id: MidiPlayer.java,v 1.4 2003/01/08 04:09:02 mdb Exp $
// $Id: MidiPlayer.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.BufferedInputStream;
import java.io.InputStream;
import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.MetaEventListener;
import javax.sound.midi.MetaMessage;
import javax.sound.midi.MidiChannel;
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiSystem;
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Receiver;
import javax.sound.midi.Sequencer;
import javax.sound.midi.Synthesizer;
src/java/com/threerings/media/sound/ModPlayer.java
+1 -5
View File
@@ -1,23 +1,19 @@
//
// $Id: ModPlayer.java,v 1.6 2003/01/08 04:09:02 mdb Exp $
// $Id: ModPlayer.java,v 1.7 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.DataInputStream;
import java.io.InputStream;
import java.io.IOException;
import micromod.MicroMod;
import micromod.Module;
import micromod.ModuleLoader;
import micromod.output.JavaSoundOutputDevice;
import micromod.output.OutputDeviceException;
import micromod.output.PCM16StreamOutputDevice;
import micromod.output.converters.SS16LEAudioFormatConverter;
import micromod.resamplers.LinearResampler;
import com.threerings.resource.ResourceManager;
/**
* A player that plays .mod format music.
*/
src/java/com/threerings/media/sound/Mp3Player.java
+1 -7
View File
@@ -1,26 +1,20 @@
//
// $Id: Mp3Player.java,v 1.4 2003/01/08 04:09:02 mdb Exp $
// $Id: Mp3Player.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.DataLine.Info;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.Line;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
import org.apache.commons.io.StreamUtils;
import com.threerings.media.Log;
import com.threerings.resource.ResourceManager;
/**
* Plays mp3 files. Depends on three external jar files that aren't even
src/java/com/threerings/media/sound/SoundManager.java
+1 -8
View File
@@ -1,5 +1,5 @@
//
// $Id: SoundManager.java,v 1.70 2004/02/24 08:08:25 ray Exp $
// $Id: SoundManager.java,v 1.71 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
@@ -20,16 +20,10 @@ import java.util.LinkedList;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Clip;
import javax.sound.sampled.DataLine.Info;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.FloatControl;
import javax.sound.sampled.FloatControl.Type;
import javax.sound.sampled.Line;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.Mixer;
import javax.sound.sampled.SourceDataLine;
import javax.sound.sampled.UnsupportedAudioFileException;
@@ -42,7 +36,6 @@ import com.samskivert.util.IntervalManager;
import com.samskivert.util.LRUHashMap;
import com.samskivert.util.Queue;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.RunAnywhere;
import com.samskivert.util.StringUtil;
import com.threerings.resource.ResourceManager;
src/java/com/threerings/media/sound/Sounds.java
+1 -3
View File
@@ -1,10 +1,8 @@
//
// $Id: Sounds.java,v 1.4 2003/01/08 04:09:02 mdb Exp $
// $Id: Sounds.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.File;
/**
* A base class for sound repository classes. These would extend this
* class and define keys for the various sounds that are mapped in the
src/java/com/threerings/media/sprite/ImageSprite.java
+1 -10
View File
@@ -1,20 +1,11 @@
//
// $Id: ImageSprite.java,v 1.18 2003/06/24 02:25:10 ray Exp $
// $Id: ImageSprite.java,v 1.19 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sprite;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Iterator;
import com.threerings.media.Log;
import com.threerings.media.image.Mirage;
import com.threerings.media.util.MultiFrameImage;
import com.threerings.media.util.SingleFrameImageImpl;
src/java/com/threerings/media/sprite/LabelSprite.java
+1 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: LabelSprite.java,v 1.4 2002/10/08 21:03:37 ray Exp $
// $Id: LabelSprite.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sprite;
@@ -8,8 +8,6 @@ import java.awt.Graphics2D;
import com.samskivert.swing.Label;
import com.threerings.media.Log;
/**
* A sprite that uses a label to render itself. Assumes that the label
* has been previously laid out (see {@link Label#layout}). The label
src/java/com/threerings/media/sprite/Sprite.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: Sprite.java,v 1.65 2003/11/24 21:58:36 mdb Exp $
// $Id: Sprite.java,v 1.66 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sprite;
@@ -11,7 +11,6 @@ import com.samskivert.util.ObserverList;
import com.threerings.util.DirectionCodes;
import com.threerings.media.AbstractMedia;
import com.threerings.media.Log;
import com.threerings.media.util.Path;
import com.threerings.media.util.Pathable;
src/java/com/threerings/media/sprite/SpriteManager.java
+1 -4
View File
@@ -1,18 +1,15 @@
//
// $Id: SpriteManager.java,v 1.41 2003/04/30 00:44:36 mdb Exp $
// $Id: SpriteManager.java,v 1.42 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sprite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.Shape;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import com.threerings.media.AbstractMediaManager;
import com.threerings.media.Log;
import com.threerings.media.RegionManager;
/**
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;
/**
src/java/com/threerings/media/timer/SystemMediaTimer.java
+1 -3
View File
@@ -1,10 +1,8 @@
//
// $Id: SystemMediaTimer.java,v 1.4 2003/08/08 21:41:28 mdb Exp $
// $Id: SystemMediaTimer.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.timer;
import com.threerings.media.Log;
/**
* Implements the {@link MediaTimer} interface using {@link
* System#currentTimeMillis} to obtain timing information.
src/java/com/threerings/media/tools/RecolorImage.java
+3 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: RecolorImage.java,v 1.4 2004/02/22 18:55:26 ray Exp $
// $Id: RecolorImage.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.tools;
@@ -12,11 +12,11 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
@@ -31,7 +31,6 @@ import com.samskivert.swing.HGroupLayout;
import com.samskivert.swing.VGroupLayout;
import com.samskivert.swing.util.SwingUtil;
import com.threerings.media.Log;
import com.threerings.media.image.ImageUtil;
/**
src/java/com/threerings/media/util/ArcPath.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: ArcPath.java,v 1.3 2002/12/04 02:45:09 shaper Exp $
// $Id: ArcPath.java,v 1.4 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.util;
@@ -9,7 +9,6 @@ import java.awt.Point;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
import com.threerings.util.DirectionUtil;
/**
src/java/com/threerings/media/util/BackgroundTiler.java
+1 -2
View File
@@ -1,10 +1,9 @@
//
// $Id: BackgroundTiler.java,v 1.7 2003/11/19 18:27:10 mdb Exp $
// $Id: BackgroundTiler.java,v 1.8 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.util;
import java.awt.Graphics;
import java.awt.Shape;
import java.awt.image.BufferedImage;
import com.threerings.media.Log;
src/java/com/threerings/media/util/BobblePath.java
+1 -3
View File
@@ -1,13 +1,11 @@
//
// $Id: BobblePath.java,v 1.4 2003/01/17 23:19:20 ray Exp $
// $Id: BobblePath.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.util;
import java.awt.Color;
import java.awt.Graphics2D;
import com.threerings.media.Log;
import com.threerings.util.RandomUtil;
/**
src/java/com/threerings/media/util/LinePath.java
+1 -4
View File
@@ -1,17 +1,14 @@
//
// $Id: LinePath.java,v 1.12 2003/05/16 02:22:19 ray Exp $
// $Id: LinePath.java,v 1.13 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.util;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Point;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
/**
* The line path is used to cause a pathable to go from point A to point B
* in a certain number of milliseconds.
src/java/com/threerings/media/util/MathUtil.java
+1 -3
View File
@@ -1,10 +1,8 @@
//
// $Id: MathUtil.java,v 1.9 2003/04/19 22:28:28 mdb Exp $
// $Id: MathUtil.java,v 1.10 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.util;
import com.threerings.media.Log;
import java.awt.Point;
/**
src/java/com/threerings/media/util/PathSequence.java
+1 -2
View File
@@ -1,10 +1,9 @@
//
// $Id: PathSequence.java,v 1.3 2003/09/25 21:07:20 mdb Exp $
// $Id: PathSequence.java,v 1.4 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.util;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.List;
src/java/com/threerings/media/util/Pathable.java
+1 -2
View File
@@ -1,10 +1,9 @@
//
// $Id: Pathable.java,v 1.5 2002/12/04 02:45:09 shaper Exp $
// $Id: Pathable.java,v 1.6 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.util;
import java.awt.Rectangle;
import com.threerings.util.DirectionCodes;
/**
* Used in conjunction with a {@link Path}.