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 -4
View File
@@ -1,15 +1,12 @@
// //
// $Id: GeomUtil.java,v 1.6 2003/11/15 00:17:59 mdb Exp $ // $Id: GeomUtil.java,v 1.7 2004/02/25 14:42:30 mdb Exp $
package com.threerings.geom; package com.threerings.geom;
import java.awt.Point; import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.geom.Line2D;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import com.samskivert.util.StringUtil;
/** /**
* General geometry utilites. * General geometry utilites.
*/ */
+2 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: Log.java,v 1.1 2003/04/28 20:27:52 mdb Exp $ // $Id: Log.java,v 1.2 2004/02/25 14:42:30 mdb Exp $
package com.threerings.geom; package com.threerings.geom;
@@ -40,6 +40,6 @@ public class Log
public static int getLevel () public static int getLevel ()
{ {
return log.getLevel(PACKAGE); return com.samskivert.util.Log.getLevel(PACKAGE);
} }
} }
@@ -1,11 +1,10 @@
// //
// $Id: BasicStreamers.java,v 1.1 2002/07/23 05:42:34 mdb Exp $ // $Id: BasicStreamers.java,v 1.2 2004/02/25 14:42:46 mdb Exp $
package com.threerings.io; package com.threerings.io;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
/** /**
* Code to read and write basic object types (like arrays of primitives, * Code to read and write basic object types (like arrays of primitives,
@@ -1,15 +1,12 @@
// //
// $Id: FieldMarshaller.java,v 1.6 2004/02/03 15:02:13 mdb Exp $ // $Id: FieldMarshaller.java,v 1.7 2004/02/25 14:42:46 mdb Exp $
package com.threerings.io; package com.threerings.io;
import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import com.threerings.presents.Log;
/** /**
* Used to read and write a single field of a {@link Streamable} instance. * Used to read and write a single field of a {@link Streamable} instance.
*/ */
@@ -1,10 +1,8 @@
// //
// $Id: FramingOutputStream.java,v 1.3 2002/11/18 18:51:33 mdb Exp $ // $Id: FramingOutputStream.java,v 1.4 2004/02/25 14:42:46 mdb Exp $
package com.threerings.io; package com.threerings.io;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.BufferOverflowException; import java.nio.BufferOverflowException;
@@ -1,5 +1,5 @@
// //
// $Id: ObjectOutputStream.java,v 1.1 2002/07/23 05:42:34 mdb Exp $ // $Id: ObjectOutputStream.java,v 1.2 2004/02/25 14:42:46 mdb Exp $
package com.threerings.io; package com.threerings.io;
@@ -8,8 +8,6 @@ import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import com.threerings.presents.Log;
/** /**
* Used to write {@link Streamable} objects to an {@link OutputStream}. * Used to write {@link Streamable} objects to an {@link OutputStream}.
* Other common object types are supported as well: * Other common object types are supported as well:
@@ -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; package com.threerings.media;
@@ -12,8 +12,6 @@ import java.awt.geom.PathIterator;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import com.samskivert.util.ObserverList; import com.samskivert.util.ObserverList;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -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; package com.threerings.media;
@@ -7,11 +7,6 @@ import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration; import java.awt.GraphicsConfiguration;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.VolatileImage; 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 * A {@link FrameManager} extension that uses a volatile off-screen image
@@ -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; package com.threerings.media;
@@ -10,10 +10,6 @@ import java.awt.ImageCapabilities;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.BufferStrategy; 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 * A {@link FrameManager} extension that uses a flip-buffer (via {@link
* BufferStrategy} to do its rendering. * BufferStrategy} to do its rendering.
@@ -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; package com.threerings.media;
import java.applet.Applet; import java.applet.Applet;
import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.GraphicsDevice;
import java.awt.KeyEventDispatcher; import java.awt.KeyEventDispatcher;
import java.awt.KeyboardFocusManager; import java.awt.KeyboardFocusManager;
import java.awt.Rectangle; import java.awt.Rectangle;
@@ -25,15 +20,12 @@ import java.awt.event.WindowListener;
import java.awt.EventQueue; import java.awt.EventQueue;
import javax.swing.JComponent;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLayeredPane; import javax.swing.JLayeredPane;
import javax.swing.RepaintManager; import javax.swing.RepaintManager;
import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorEvent;
import javax.swing.event.AncestorListener; import javax.swing.event.AncestorListener;
import com.samskivert.swing.Label;
import com.samskivert.util.DebugChords;
import com.samskivert.util.ObserverList; import com.samskivert.util.ObserverList;
import com.samskivert.util.RunAnywhere; import com.samskivert.util.RunAnywhere;
import com.samskivert.util.RuntimeAdjust; import com.samskivert.util.RuntimeAdjust;
@@ -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; package com.threerings.media;
import java.applet.Applet; import java.applet.Applet;
import java.awt.Component; import java.awt.Component;
import java.awt.Font;
import java.awt.Frame; import java.awt.Frame;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Graphics; import java.awt.Graphics;
@@ -15,7 +14,6 @@ import java.awt.Rectangle;
import java.awt.Window; import java.awt.Window;
import javax.swing.CellRendererPane; import javax.swing.CellRendererPane;
import javax.swing.JButton;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JEditorPane; import javax.swing.JEditorPane;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
+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; package com.threerings.media;
@@ -40,6 +40,6 @@ public class Log
public static int getLevel () public static int getLevel ()
{ {
return log.getLevel(PACKAGE); return com.samskivert.util.Log.getLevel(PACKAGE);
} }
} }
@@ -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; package com.threerings.media;
@@ -13,7 +13,6 @@ import java.awt.Rectangle;
import java.awt.Shape; import java.awt.Shape;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.RepaintManager;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorEvent;
@@ -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; package com.threerings.media;
@@ -7,7 +7,6 @@ import java.awt.EventQueue;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -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; package com.threerings.media;
import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import com.samskivert.util.RunAnywhere; import com.samskivert.util.RunAnywhere;
import com.samskivert.util.StringUtil;
import com.threerings.media.image.ImageUtil; import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.Mirage; import com.threerings.media.image.Mirage;
import com.threerings.media.util.MathUtil; import com.threerings.media.util.MathUtil;
import com.threerings.media.util.Path;
import com.threerings.media.util.Pathable; import com.threerings.media.util.Pathable;
/** /**
@@ -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; package com.threerings.media.animation;
import java.awt.Rectangle; import java.awt.Rectangle;
import com.threerings.media.AbstractMedia; import com.threerings.media.AbstractMedia;
import com.threerings.media.Log;
/** /**
* The animation class is an abstract class that should be extended to * The animation class is an abstract class that should be extended to
@@ -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; package com.threerings.media.animation;
import java.util.Arrays;
import com.samskivert.util.ObserverList; import com.samskivert.util.ObserverList;
import com.threerings.media.util.FrameSequencer; import com.threerings.media.util.FrameSequencer;
@@ -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; package com.threerings.media.animation;
import com.samskivert.util.ObserverList; import com.samskivert.util.ObserverList;
import com.threerings.media.AbstractMediaManager; import com.threerings.media.AbstractMediaManager;
import com.threerings.media.Log;
import com.threerings.media.RegionManager; import com.threerings.media.RegionManager;
/** /**
@@ -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; package com.threerings.media.animation;
import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
import com.threerings.util.RandomUtil;
import com.threerings.media.Log;
import com.threerings.media.image.Mirage; import com.threerings.media.image.Mirage;
import com.threerings.util.RandomUtil;
/** /**
* An animation that bobbles an image around within a specific horizontal * An animation that bobbles an image around within a specific horizontal
@@ -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; package com.threerings.media.animation;
@@ -13,7 +13,6 @@ import java.awt.Shape;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.util.RandomUtil; import com.threerings.util.RandomUtil;
import com.threerings.media.Log;
import com.threerings.media.image.Mirage; import com.threerings.media.image.Mirage;
/** /**
@@ -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; package com.threerings.media.animation;
import java.awt.AlphaComposite; import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Composite; import java.awt.Composite;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
@@ -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; package com.threerings.media.animation;
@@ -8,8 +8,6 @@ import java.awt.Composite;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Arrays;
import com.threerings.util.RandomUtil; import com.threerings.util.RandomUtil;
import com.threerings.media.animation.Animation; import com.threerings.media.animation.Animation;
@@ -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; package com.threerings.media.image;
@@ -9,7 +9,6 @@ import java.awt.Transparency;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.samskivert.util.StringUtil;
/** /**
* A mirage implementation which allows the image to be maintained in * A mirage implementation which allows the image to be maintained in
@@ -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; package com.threerings.media.image;
import java.awt.Component; import java.awt.Component;
import java.awt.EventQueue;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration; import java.awt.GraphicsConfiguration;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.Transparency; import java.awt.Transparency;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -26,7 +22,6 @@ import java.util.Iterator;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.ImageInputStream;
import com.samskivert.io.NestableIOException;
import com.samskivert.util.LRUHashMap; import com.samskivert.util.LRUHashMap;
import com.samskivert.util.RuntimeAdjust; import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -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; package com.threerings.media.image;
@@ -11,7 +11,6 @@ import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice; import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException; import java.awt.HeadlessException;
import java.awt.Image;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.Shape; import java.awt.Shape;
import java.awt.Transparency; import java.awt.Transparency;
@@ -23,16 +22,10 @@ import java.awt.image.IndexColorModel;
import java.awt.image.Raster; import java.awt.image.Raster;
import java.awt.image.WritableRaster; import java.awt.image.WritableRaster;
import java.awt.geom.Area;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import com.samskivert.swing.Label; import com.samskivert.swing.Label;
import com.samskivert.util.ArrayUtil;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
/** /**
* Image related utility functions. * Image related utility functions.
@@ -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; package com.threerings.media.image;
@@ -7,7 +7,6 @@ import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.VolatileImage;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -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; package com.threerings.media.sound;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.InputStream; import java.io.InputStream;
import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.MetaEventListener; import javax.sound.midi.MetaEventListener;
import javax.sound.midi.MetaMessage; import javax.sound.midi.MetaMessage;
import javax.sound.midi.MidiChannel; import javax.sound.midi.MidiChannel;
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiSystem; import javax.sound.midi.MidiSystem;
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Receiver;
import javax.sound.midi.Sequencer; import javax.sound.midi.Sequencer;
import javax.sound.midi.Synthesizer; import javax.sound.midi.Synthesizer;
@@ -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; package com.threerings.media.sound;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.io.IOException;
import micromod.MicroMod; import micromod.MicroMod;
import micromod.Module; import micromod.Module;
import micromod.ModuleLoader; import micromod.ModuleLoader;
import micromod.output.JavaSoundOutputDevice; import micromod.output.JavaSoundOutputDevice;
import micromod.output.OutputDeviceException; import micromod.output.OutputDeviceException;
import micromod.output.PCM16StreamOutputDevice;
import micromod.output.converters.SS16LEAudioFormatConverter; import micromod.output.converters.SS16LEAudioFormatConverter;
import micromod.resamplers.LinearResampler; import micromod.resamplers.LinearResampler;
import com.threerings.resource.ResourceManager;
/** /**
* A player that plays .mod format music. * A player that plays .mod format music.
*/ */
@@ -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; package com.threerings.media.sound;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.DataLine.Info;
import javax.sound.sampled.DataLine; import javax.sound.sampled.DataLine;
import javax.sound.sampled.Line;
import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine; import javax.sound.sampled.SourceDataLine;
import org.apache.commons.io.StreamUtils;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.threerings.resource.ResourceManager;
/** /**
* Plays mp3 files. Depends on three external jar files that aren't even * Plays mp3 files. Depends on three external jar files that aren't even
@@ -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; package com.threerings.media.sound;
@@ -20,16 +20,10 @@ import java.util.LinkedList;
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem; 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.DataLine;
import javax.sound.sampled.FloatControl; import javax.sound.sampled.FloatControl;
import javax.sound.sampled.FloatControl.Type;
import javax.sound.sampled.Line; import javax.sound.sampled.Line;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.Mixer;
import javax.sound.sampled.SourceDataLine; import javax.sound.sampled.SourceDataLine;
import javax.sound.sampled.UnsupportedAudioFileException; import javax.sound.sampled.UnsupportedAudioFileException;
@@ -42,7 +36,6 @@ import com.samskivert.util.IntervalManager;
import com.samskivert.util.LRUHashMap; import com.samskivert.util.LRUHashMap;
import com.samskivert.util.Queue; import com.samskivert.util.Queue;
import com.samskivert.util.RuntimeAdjust; import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.RunAnywhere;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.resource.ResourceManager; import com.threerings.resource.ResourceManager;
@@ -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; package com.threerings.media.sound;
import java.io.File;
/** /**
* A base class for sound repository classes. These would extend this * A base class for sound repository classes. These would extend this
* class and define keys for the various sounds that are mapped in the * class and define keys for the various sounds that are mapped in the
@@ -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; package com.threerings.media.sprite;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle; 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.image.Mirage;
import com.threerings.media.util.MultiFrameImage; import com.threerings.media.util.MultiFrameImage;
import com.threerings.media.util.SingleFrameImageImpl; import com.threerings.media.util.SingleFrameImageImpl;
@@ -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; package com.threerings.media.sprite;
@@ -8,8 +8,6 @@ import java.awt.Graphics2D;
import com.samskivert.swing.Label; import com.samskivert.swing.Label;
import com.threerings.media.Log;
/** /**
* A sprite that uses a label to render itself. Assumes that the label * A sprite that uses a label to render itself. Assumes that the label
* has been previously laid out (see {@link Label#layout}). The label * has been previously laid out (see {@link Label#layout}). The label
@@ -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; package com.threerings.media.sprite;
@@ -11,7 +11,6 @@ import com.samskivert.util.ObserverList;
import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionCodes;
import com.threerings.media.AbstractMedia; import com.threerings.media.AbstractMedia;
import com.threerings.media.Log;
import com.threerings.media.util.Path; import com.threerings.media.util.Path;
import com.threerings.media.util.Pathable; import com.threerings.media.util.Pathable;
@@ -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; package com.threerings.media.sprite;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.Shape; import java.awt.Shape;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import com.threerings.media.AbstractMediaManager; import com.threerings.media.AbstractMediaManager;
import com.threerings.media.Log;
import com.threerings.media.RegionManager; import com.threerings.media.RegionManager;
/** /**
@@ -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; package com.threerings.media.tile;
@@ -12,8 +12,6 @@ import java.io.ObjectInputStream;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
/** /**
* The swiss army tileset supports a diverse variety of tiles in the * The swiss army tileset supports a diverse variety of tiles in the
* tileset image. Each row can contain varying numbers of tiles and each * tileset image. Each row can contain varying numbers of tiles and each
@@ -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; 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.HashMap;
import java.util.Iterator;
import com.samskivert.io.PersistenceException; 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.Log;
import com.threerings.media.tile.TileUtil; import com.threerings.media.image.ImageManager;
/** /**
* The tile manager provides a simplified interface for retrieving and * The tile manager provides a simplified interface for retrieving and
@@ -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; package com.threerings.media.tile;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import com.threerings.media.Log;
import com.threerings.media.util.MultiFrameImage; import com.threerings.media.util.MultiFrameImage;
/** /**
@@ -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; package com.threerings.media.tile;
import java.awt.Color;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.Serializable; import java.io.Serializable;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.samskivert.util.Throttle; import com.samskivert.util.Throttle;
import com.samskivert.util.Tuple;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.threerings.media.MediaPrefs;
import com.threerings.media.image.Colorization; import com.threerings.media.image.Colorization;
import com.threerings.media.image.Mirage; import com.threerings.media.image.Mirage;
@@ -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; package com.threerings.media.tile;
import java.util.Iterator; 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 * The tileset repository interface should be implemented by classes that
@@ -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; package com.threerings.media.tile;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.Serializable; import java.io.Serializable;
import com.samskivert.util.StringUtil; 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.image.Colorization;
import com.threerings.media.tile.util.TileSetTrimmer;
/** /**
* An object tileset in which the objects have been trimmed to the * An object tileset in which the objects have been trimmed to the
@@ -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; package com.threerings.media.tile.bundle;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import com.samskivert.io.PersistenceException; import com.samskivert.io.PersistenceException;
import com.samskivert.util.HashIntMap; import com.samskivert.util.HashIntMap;
import com.threerings.resource.ResourceBundle; import com.threerings.resource.ResourceBundle;
import com.threerings.resource.ResourceManager; import com.threerings.resource.ResourceManager;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.threerings.media.image.ImageDataProvider;
import com.threerings.media.image.ImageManager; import com.threerings.media.image.ImageManager;
import com.threerings.media.tile.IMImageProvider; import com.threerings.media.tile.IMImageProvider;
import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSet;
@@ -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; package com.threerings.media.tile.bundle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.Serializable; import java.io.Serializable;
import java.util.Iterator; import java.util.Iterator;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import com.samskivert.util.HashIntMap; import com.samskivert.util.HashIntMap;
import com.threerings.resource.ResourceBundle; import com.threerings.resource.ResourceBundle;
import com.threerings.media.image.FastImageIO; import com.threerings.media.image.FastImageIO;
@@ -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; package com.threerings.media.tile.bundle.tools;
import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@@ -15,28 +12,23 @@ import java.io.ObjectOutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream; import java.util.jar.JarOutputStream;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import java.util.zip.Deflater; 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.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.RuleSetBase;
import org.apache.commons.io.StreamUtils; import org.apache.commons.io.StreamUtils;
import org.xml.sax.SAXException;
import com.samskivert.io.NestableIOException; import com.samskivert.io.NestableIOException;
import com.samskivert.io.PersistenceException; import com.samskivert.io.PersistenceException;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.FastImageIO; import com.threerings.media.image.FastImageIO;
import com.threerings.media.image.ImageUtil; import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.Mirage;
import com.threerings.media.tile.ImageProvider; import com.threerings.media.tile.ImageProvider;
import com.threerings.media.tile.ObjectTileSet; 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.TileSetIDBroker;
import com.threerings.media.tile.TrimmedObjectTileSet; import com.threerings.media.tile.TrimmedObjectTileSet;
import com.threerings.media.tile.UniformTileSet; import com.threerings.media.tile.UniformTileSet;
import com.threerings.media.tile.bundle.BundleUtil; import com.threerings.media.tile.bundle.BundleUtil;
import com.threerings.media.tile.bundle.TileSetBundle; import com.threerings.media.tile.bundle.TileSetBundle;
import com.threerings.media.tile.tools.xml.TileSetRuleSet; import com.threerings.media.tile.tools.xml.TileSetRuleSet;
@@ -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; package com.threerings.media.tile.bundle.tools;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
@@ -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; 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 org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.samskivert.xml.CallMethodSpecialRule; 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.media.tile.ObjectTileSet;
import com.threerings.util.DirectionUtil;
/** /**
* Parses {@link ObjectTileSet} instances from a tileset description. An * Parses {@link ObjectTileSet} instances from a tileset description. An
* object tileset description looks like so: * object tileset description looks like so:
@@ -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; package com.threerings.media.tile.tools.xml;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Point; import java.awt.Point;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester; import org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.samskivert.xml.CallMethodSpecialRule; import com.samskivert.xml.CallMethodSpecialRule;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.SwissArmyTileSet; import com.threerings.media.tile.SwissArmyTileSet;
/** /**
@@ -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; package com.threerings.media.tile.tools.xml;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester; import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.RuleSetBase; import org.apache.commons.digester.RuleSetBase;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.samskivert.xml.ValidatedSetNextRule;
import com.samskivert.xml.ValidatedSetNextRule.Validator; import com.samskivert.xml.ValidatedSetNextRule.Validator;
import com.threerings.media.Log; import com.threerings.media.Log;
@@ -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; package com.threerings.media.tile.tools.xml;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester; import org.apache.commons.digester.Digester;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.UniformTileSet; import com.threerings.media.tile.UniformTileSet;
/** /**
@@ -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; package com.threerings.media.tile.tools.xml;
@@ -8,14 +8,11 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester; 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.util.ConfigUtil;
import com.samskivert.xml.ValidatedSetNextRule; import com.samskivert.xml.ValidatedSetNextRule;
@@ -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; 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.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.Raster; import java.awt.image.Raster;
import java.awt.image.RasterFormatException; import java.awt.image.RasterFormatException;
import java.awt.image.WritableRaster; import java.awt.image.WritableRaster;
import java.io.IOException;
import com.samskivert.util.StringUtil; import java.io.OutputStream;
import com.threerings.media.Log;
import com.threerings.media.image.FastImageIO; import com.threerings.media.image.FastImageIO;
import com.threerings.media.image.ImageUtil; import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSet;
/** /**
@@ -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; package com.threerings.media.timer;
import com.threerings.media.Log;
/** /**
* Implements the {@link MediaTimer} interface using {@link * Implements the {@link MediaTimer} interface using {@link
* System#currentTimeMillis} to obtain timing information. * System#currentTimeMillis} to obtain timing information.
@@ -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; package com.threerings.media.tools;
@@ -12,11 +12,11 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import javax.imageio.ImageIO;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JButton; import javax.swing.JButton;
@@ -31,7 +31,6 @@ import com.samskivert.swing.HGroupLayout;
import com.samskivert.swing.VGroupLayout; import com.samskivert.swing.VGroupLayout;
import com.samskivert.swing.util.SwingUtil; import com.samskivert.swing.util.SwingUtil;
import com.threerings.media.Log;
import com.threerings.media.image.ImageUtil; import com.threerings.media.image.ImageUtil;
/** /**
@@ -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; package com.threerings.media.util;
@@ -9,7 +9,6 @@ import java.awt.Point;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.media.Log;
import com.threerings.util.DirectionUtil; import com.threerings.util.DirectionUtil;
/** /**
@@ -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; package com.threerings.media.util;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Shape;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import com.threerings.media.Log; import com.threerings.media.Log;
@@ -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; package com.threerings.media.util;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import com.threerings.media.Log;
import com.threerings.util.RandomUtil; import com.threerings.util.RandomUtil;
/** /**
@@ -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; package com.threerings.media.util;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Point; import java.awt.Point;
import com.samskivert.util.StringUtil; 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 * The line path is used to cause a pathable to go from point A to point B
* in a certain number of milliseconds. * in a certain number of milliseconds.
@@ -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; package com.threerings.media.util;
import com.threerings.media.Log;
import java.awt.Point; import java.awt.Point;
/** /**
@@ -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; package com.threerings.media.util;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -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; package com.threerings.media.util;
import java.awt.Rectangle; import java.awt.Rectangle;
import com.threerings.util.DirectionCodes;
/** /**
* Used in conjunction with a {@link Path}. * Used in conjunction with a {@link Path}.
@@ -1,5 +1,5 @@
// //
// $Id: ChatPanel.java,v 1.25 2003/06/04 02:50:19 ray Exp $ // $Id: ChatPanel.java,v 1.26 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.client; package com.threerings.micasa.client;
@@ -19,7 +19,6 @@ import javax.swing.JTextField;
import javax.swing.JTextPane; import javax.swing.JTextPane;
import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorEvent;
import javax.swing.event.AncestorListener;
import javax.swing.text.BadLocationException; import javax.swing.text.BadLocationException;
import javax.swing.text.Document; import javax.swing.text.Document;
@@ -32,8 +31,6 @@ import com.samskivert.swing.HGroupLayout;
import com.samskivert.swing.VGroupLayout; import com.samskivert.swing.VGroupLayout;
import com.samskivert.swing.event.AncestorAdapter; import com.samskivert.swing.event.AncestorAdapter;
import com.threerings.util.MessageBundle;
import com.threerings.crowd.chat.client.ChatDirector; import com.threerings.crowd.chat.client.ChatDirector;
import com.threerings.crowd.chat.client.ChatDisplay; import com.threerings.crowd.chat.client.ChatDisplay;
import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.ChatCodes;
@@ -1,11 +1,10 @@
// //
// $Id: ClientController.java,v 1.16 2002/09/20 00:54:39 mdb Exp $ // $Id: ClientController.java,v 1.17 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.client; package com.threerings.micasa.client;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import com.samskivert.swing.Controller; import com.samskivert.swing.Controller;
import com.samskivert.util.StringUtil;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.client.SessionObserver; import com.threerings.presents.client.SessionObserver;
@@ -1,5 +1,5 @@
// //
// $Id: LogonPanel.java,v 1.8 2002/09/19 23:36:59 mdb Exp $ // $Id: LogonPanel.java,v 1.9 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.client; package com.threerings.micasa.client;
@@ -8,7 +8,6 @@ import java.awt.Font;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
@@ -1,5 +1,5 @@
// //
// $Id: MiCasaClient.java,v 1.17 2003/11/24 17:51:56 mdb Exp $ // $Id: MiCasaClient.java,v 1.18 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.client; package com.threerings.micasa.client;
@@ -21,7 +21,6 @@ import com.threerings.crowd.client.PlaceView;
import com.threerings.parlor.client.ParlorDirector; import com.threerings.parlor.client.ParlorDirector;
import com.threerings.micasa.Log;
import com.threerings.micasa.util.MiCasaContext; import com.threerings.micasa.util.MiCasaContext;
/** /**
@@ -1,24 +1,21 @@
// //
// $Id: LobbyDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ // $Id: LobbyDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.lobby; package com.threerings.micasa.lobby;
import com.threerings.micasa.lobby.LobbyMarshaller;
import com.threerings.micasa.lobby.LobbyService;
import com.threerings.micasa.lobby.LobbyService.CategoriesListener; import com.threerings.micasa.lobby.LobbyService.CategoriesListener;
import com.threerings.micasa.lobby.LobbyService.LobbiesListener; import com.threerings.micasa.lobby.LobbyService.LobbiesListener;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationException;
import java.util.List;
/** /**
* Dispatches requests to the {@link LobbyProvider}. * Dispatches requests to the {@link LobbyProvider}.
* *
* <p> Generated from <code> * <p> Generated from <code>
* $Id: LobbyDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ * $Id: LobbyDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
* </code> * </code>
*/ */
public class LobbyDispatcher extends InvocationDispatcher public class LobbyDispatcher extends InvocationDispatcher
@@ -1,12 +1,11 @@
// //
// $Id: LobbyManager.java,v 1.6 2003/06/03 21:41:33 ray Exp $ // $Id: LobbyManager.java,v 1.7 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.lobby; package com.threerings.micasa.lobby;
import java.util.Properties; import java.util.Properties;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.server.PlaceManager; import com.threerings.crowd.server.PlaceManager;
import com.threerings.micasa.Log; import com.threerings.micasa.Log;
@@ -1,11 +1,9 @@
// //
// $Id: LobbyMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ // $Id: LobbyMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.lobby; package com.threerings.micasa.lobby;
import com.threerings.micasa.lobby.LobbyService; import com.threerings.micasa.lobby.LobbyService;
import com.threerings.micasa.lobby.LobbyService.CategoriesListener;
import com.threerings.micasa.lobby.LobbyService.LobbiesListener;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent; import com.threerings.presents.dobj.InvocationResponseEvent;
@@ -19,7 +17,7 @@ import java.util.List;
* to the requesting client. * to the requesting client.
* *
* <p> Generated from <code> * <p> Generated from <code>
* $Id: LobbyMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ * $Id: LobbyMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
* </code> * </code>
*/ */
public class LobbyMarshaller extends InvocationMarshaller public class LobbyMarshaller extends InvocationMarshaller
@@ -1,5 +1,5 @@
// //
// $Id: LobbySelector.java,v 1.5 2002/08/14 19:07:49 mdb Exp $ // $Id: LobbySelector.java,v 1.6 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.lobby; package com.threerings.micasa.lobby;
@@ -10,10 +10,6 @@ import java.awt.event.*;
import java.util.*; import java.util.*;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.AncestorEvent;
import com.samskivert.swing.event.AncestorAdapter;
import com.samskivert.util.StringUtil;
import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.data.PlaceObject;
@@ -1,18 +1,13 @@
// //
// $Id: TableGameConfigurator.java,v 1.1 2002/07/25 23:20:22 mdb Exp $ // $Id: TableGameConfigurator.java,v 1.2 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.lobby.table; package com.threerings.micasa.lobby.table;
import javax.swing.JPanel;
import javax.swing.JSlider;
import com.samskivert.swing.HGroupLayout;
import com.samskivert.swing.VGroupLayout;
import com.samskivert.swing.SimpleSlider; import com.samskivert.swing.SimpleSlider;
import com.samskivert.swing.VGroupLayout;
import com.threerings.parlor.client.GameConfigurator; import com.threerings.parlor.client.GameConfigurator;
import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.util.ParlorContext;
/** /**
* Extends the basic game configurator with elements to support the * Extends the basic game configurator with elements to support the
@@ -1,42 +1,35 @@
// //
// $Id: TableListView.java,v 1.6 2003/01/11 01:03:02 shaper Exp $ // $Id: TableListView.java,v 1.7 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.lobby.table; package com.threerings.micasa.lobby.table;
import java.util.Iterator;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Iterator;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSlider;
import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.samskivert.swing.HGroupLayout; import com.samskivert.swing.HGroupLayout;
import com.samskivert.swing.VGroupLayout; import com.samskivert.swing.VGroupLayout;
import com.samskivert.swing.util.SwingUtil; import com.samskivert.swing.util.SwingUtil;
import com.threerings.crowd.client.PlaceView; import com.threerings.micasa.Log;
import com.threerings.crowd.data.PlaceObject; import com.threerings.micasa.lobby.LobbyConfig;
import com.threerings.micasa.util.MiCasaContext;
import com.threerings.parlor.client.GameConfigurator; import com.threerings.parlor.client.GameConfigurator;
import com.threerings.parlor.client.SeatednessObserver; import com.threerings.parlor.client.SeatednessObserver;
import com.threerings.parlor.client.TableDirector; import com.threerings.parlor.client.TableDirector;
import com.threerings.parlor.client.TableObserver; import com.threerings.parlor.client.TableObserver;
import com.threerings.parlor.data.Table; import com.threerings.parlor.data.Table;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.game.GameConfig;
import com.threerings.micasa.Log; import com.threerings.crowd.client.PlaceView;
import com.threerings.micasa.lobby.LobbyConfig; import com.threerings.crowd.data.PlaceObject;
import com.threerings.micasa.util.MiCasaContext;
/** /**
* A view that displays the tables in a table lobby. It displays two * A view that displays the tables in a table lobby. It displays two
@@ -1,5 +1,5 @@
// //
// $Id: SimpleClient.java,v 1.10 2003/12/10 03:31:41 mdb Exp $ // $Id: SimpleClient.java,v 1.11 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.client; package com.threerings.micasa.simulator.client;
@@ -24,9 +24,7 @@ import com.threerings.crowd.client.PlaceView;
import com.threerings.parlor.client.ParlorDirector; import com.threerings.parlor.client.ParlorDirector;
import com.threerings.parlor.util.ParlorContext; import com.threerings.parlor.util.ParlorContext;
import com.threerings.micasa.Log;
import com.threerings.micasa.client.MiCasaFrame; import com.threerings.micasa.client.MiCasaFrame;
import com.threerings.micasa.simulator.data.SimulatorInfo;
import com.threerings.micasa.util.MiCasaContext; import com.threerings.micasa.util.MiCasaContext;
public class SimpleClient public class SimpleClient
@@ -1,14 +1,11 @@
// //
// $Id: SimpleFrame.java,v 1.3 2002/07/12 03:49:37 mdb Exp $ // $Id: SimpleFrame.java,v 1.4 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.client; package com.threerings.micasa.simulator.client;
import java.awt.BorderLayout;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel;
import com.samskivert.swing.Controller; import com.samskivert.swing.Controller;
import com.samskivert.swing.util.SwingUtil;
import com.threerings.micasa.client.MiCasaFrame; import com.threerings.micasa.client.MiCasaFrame;
@@ -1,11 +1,10 @@
// //
// $Id: SimulatorController.java,v 1.1 2002/11/12 19:54:05 shaper Exp $ // $Id: SimulatorController.java,v 1.2 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.client; package com.threerings.micasa.simulator.client;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import com.samskivert.swing.Controller; import com.samskivert.swing.Controller;
import com.samskivert.util.StringUtil;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.client.SessionObserver; import com.threerings.presents.client.SessionObserver;
@@ -1,5 +1,5 @@
// //
// $Id: SimulatorMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ // $Id: SimulatorMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.data; package com.threerings.micasa.simulator.data;
@@ -7,7 +7,6 @@ import com.threerings.micasa.simulator.client.SimulatorService;
import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.game.GameConfig;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
/** /**
* Provides the implementation of the {@link SimulatorService} interface * Provides the implementation of the {@link SimulatorService} interface
@@ -17,7 +16,7 @@ import com.threerings.presents.dobj.InvocationResponseEvent;
* to the requesting client. * to the requesting client.
* *
* <p> Generated from <code> * <p> Generated from <code>
* $Id: SimulatorMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ * $Id: SimulatorMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
* </code> * </code>
*/ */
public class SimulatorMarshaller extends InvocationMarshaller public class SimulatorMarshaller extends InvocationMarshaller
@@ -1,11 +1,10 @@
// //
// $Id: SimpleServer.java,v 1.6 2002/08/15 23:21:45 mdb Exp $ // $Id: SimpleServer.java,v 1.7 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.server; package com.threerings.micasa.simulator.server;
import com.samskivert.util.ResultListener; import com.samskivert.util.ResultListener;
import com.threerings.crowd.data.BodyObject;
import com.threerings.micasa.server.MiCasaServer; import com.threerings.micasa.server.MiCasaServer;
/** /**
@@ -1,12 +1,10 @@
// //
// $Id: SimulatorDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ // $Id: SimulatorDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.server; package com.threerings.micasa.simulator.server;
import com.threerings.micasa.simulator.client.SimulatorService;
import com.threerings.micasa.simulator.data.SimulatorMarshaller; import com.threerings.micasa.simulator.data.SimulatorMarshaller;
import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.game.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationDispatcher;
@@ -16,7 +14,7 @@ import com.threerings.presents.server.InvocationException;
* Dispatches requests to the {@link SimulatorProvider}. * Dispatches requests to the {@link SimulatorProvider}.
* *
* <p> Generated from <code> * <p> Generated from <code>
* $Id: SimulatorDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $ * $Id: SimulatorDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
* </code> * </code>
*/ */
public class SimulatorDispatcher extends InvocationDispatcher public class SimulatorDispatcher extends InvocationDispatcher
@@ -1,5 +1,5 @@
// //
// $Id: SimulatorManager.java,v 1.14 2002/10/15 22:47:48 shaper Exp $ // $Id: SimulatorManager.java,v 1.15 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.server; package com.threerings.micasa.simulator.server;
@@ -10,7 +10,6 @@ import com.threerings.presents.dobj.RootDObjectManager;
import com.threerings.presents.server.ClientManager; import com.threerings.presents.server.ClientManager;
import com.threerings.presents.server.ClientResolutionListener; import com.threerings.presents.server.ClientResolutionListener;
import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.data.PlaceObject;
@@ -1,12 +1,10 @@
// //
// $Id: SimulatorServer.java,v 1.7 2002/06/10 19:16:41 shaper Exp $ // $Id: SimulatorServer.java,v 1.8 2004/02/25 14:43:37 mdb Exp $
package com.threerings.micasa.simulator.server; package com.threerings.micasa.simulator.server;
import com.samskivert.util.ResultListener; import com.samskivert.util.ResultListener;
import com.threerings.crowd.data.BodyObject;
/** /**
* The simulator manager needs a mechanism for faking body object * The simulator manager needs a mechanism for faking body object
* registrations, which is provided by implementations of this interface. * registrations, which is provided by implementations of this interface.
@@ -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; package com.threerings.miso.client;
import java.awt.Color;
import java.awt.Graphics2D; 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.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import com.samskivert.util.SortableArrayList; import com.samskivert.util.SortableArrayList;
import com.samskivert.util.StringUtil;
import com.threerings.media.Log; import com.threerings.media.Log;
import com.threerings.media.sprite.Sprite; import com.threerings.media.sprite.Sprite;
import com.threerings.media.tile.ObjectTile; import com.threerings.media.tile.ObjectTile;
import com.threerings.miso.MisoPrefs;
/** /**
* The dirty item list keeps track of dirty sprites and object tiles * The dirty item list keeps track of dirty sprites and object tiles
* in a scene. * 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; package com.threerings.miso.client;
@@ -9,7 +9,6 @@ import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Composite; import java.awt.Composite;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Font; import java.awt.Font;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.Graphics2D; 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.Tile;
import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.TileUtil;
import com.threerings.media.util.MathUtil; import com.threerings.media.util.MathUtil;
import com.threerings.media.util.Path; 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.MisoContext;
import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil; import com.threerings.miso.util.MisoUtil;
import com.threerings.miso.util.ObjectSet;
/** /**
* Renders a Miso scene for all to see. * 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; 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.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.ObjectTile; 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.tile.TileSet;
import com.threerings.media.util.MathUtil; 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; package com.threerings.miso.client;
@@ -11,15 +11,12 @@ import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.UIManager; import javax.swing.UIManager;
import com.samskivert.swing.Label; import com.samskivert.swing.Label;
import com.samskivert.swing.LabelSausage; 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.StringUtil;
import com.samskivert.util.SortableArrayList; 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; package com.threerings.miso.client;
@@ -11,9 +11,7 @@ import com.threerings.util.DirectionCodes;
import com.threerings.media.sprite.Sprite; import com.threerings.media.sprite.Sprite;
import com.threerings.media.util.LineSegmentPath; import com.threerings.media.util.LineSegmentPath;
import com.threerings.media.util.MathUtil; 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.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil; 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; package com.threerings.miso.data;
@@ -8,8 +8,6 @@ import java.util.Random;
import com.threerings.io.SimpleStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.media.tile.TileUtil;
import com.threerings.miso.util.ObjectSet; 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; package com.threerings.miso.data;
@@ -60,7 +60,7 @@ public class ObjectInfo extends SimpleStreamableObject
this.sx = other.sx; this.sx = other.sx;
this.sy = other.sy; this.sy = other.sy;
this.sorient = other.sorient; 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; package com.threerings.miso.data;
@@ -8,7 +8,6 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import com.samskivert.util.ArrayUtil; import com.samskivert.util.ArrayUtil;
import com.samskivert.util.IntListUtil;
import com.samskivert.util.ListUtil; import com.samskivert.util.ListUtil;
import com.samskivert.util.StringUtil; 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; package com.threerings.miso.data;
import java.awt.Rectangle;
/** /**
* A convenient base class for "virtual" scenes which do not allow editing * 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 * 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; package com.threerings.miso.tile;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.Transparency; import java.awt.Transparency;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Random;
import com.samskivert.util.CheapIntMap; import com.samskivert.util.CheapIntMap;
import com.samskivert.util.QuickSort; 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.BufferedMirage;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.NoSuchTileException; import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException; 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.TileManager;
import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSet;
import com.threerings.media.image.ImageUtil; import com.threerings.miso.Log;
import com.threerings.media.image.BackedVolatileMirage;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.Mirage;
import com.threerings.miso.data.MisoSceneModel; import com.threerings.miso.data.MisoSceneModel;
import com.threerings.miso.util.MisoUtil; 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; package com.threerings.miso.tile;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random;
import com.samskivert.util.HashIntMap; import com.samskivert.util.HashIntMap;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.miso.Log;
/** /**
* Used to manage data about which base tilesets fringe on which others * Used to manage data about which base tilesets fringe on which others
* and how they fringe. * 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; package com.threerings.miso.tile.tools.xml;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester; import org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.samskivert.xml.CallMethodSpecialRule; import com.samskivert.xml.CallMethodSpecialRule;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet; import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
import com.threerings.miso.Log; 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; package com.threerings.miso.tile.tools.xml;
@@ -7,7 +7,6 @@ import java.io.Serializable;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester; import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.samskivert.xml.SetPropertyFieldsRule; 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; package com.threerings.miso.tools.xml;
@@ -10,7 +10,6 @@ import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester; import org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.tools.xml.NestableRuleSet;
import com.threerings.miso.data.SimpleMisoSceneModel; 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; package com.threerings.miso.tools.xml;
@@ -11,7 +11,6 @@ import org.apache.commons.digester.Digester;
import com.samskivert.io.StreamUtil; import com.samskivert.io.StreamUtil;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.tools.xml.NestableRuleSet;
import com.threerings.miso.data.SparseMisoSceneModel; 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; package com.threerings.miso.tools.xml;
import java.util.ArrayList;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester; import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rule;
import com.samskivert.xml.CallMethodSpecialRule;
import com.samskivert.xml.SetFieldRule; import com.samskivert.xml.SetFieldRule;
import com.samskivert.xml.SetPropertyFieldsRule; 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; package com.threerings.miso.util;
@@ -10,9 +10,6 @@ import com.samskivert.util.HashIntMap;
import com.threerings.media.util.MathUtil; 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 * The <code>AStarPathUtil</code> class provides a facility for
* finding a reasonable path between two points in a scene using the * 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; package com.threerings.miso.util;
import java.awt.Point;
import java.awt.Rectangle;
/** /**
* Contains information on the configuration of a particular isometric * Contains information on the configuration of a particular isometric
* view. The member data are public to facilitate convenient referencing * 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; package com.threerings.miso.util;
import java.awt.Point; import java.awt.Point;
import java.awt.Polygon; import java.awt.Polygon;
import java.awt.Rectangle;
import com.samskivert.swing.SmartPolygon; 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.DirectionCodes;
import com.threerings.util.DirectionUtil; import com.threerings.util.DirectionUtil;
import com.threerings.miso.Log; import com.threerings.media.util.MathUtil;
import com.threerings.miso.MisoConfig;
/** /**
* Miscellaneous isometric-display-related utility routines. * Miscellaneous isometric-display-related utility routines.
+1 -2
View File
@@ -1,11 +1,10 @@
// //
// $Id: NodeMap.java,v 1.8 2002/06/15 01:59:43 shaper Exp $ // $Id: NodeMap.java,v 1.9 2004/02/25 14:44:33 mdb Exp $
package com.threerings.nodemap; package com.threerings.nodemap;
import java.awt.*; import java.awt.*;
import java.util.*; import java.util.*;
import javax.swing.JComponent;
import com.samskivert.swing.ToolTipManager; import com.samskivert.swing.ToolTipManager;
import com.samskivert.swing.ToolTipProvider; import com.samskivert.swing.ToolTipProvider;
@@ -1,5 +1,5 @@
// //
// $Id: DirectionalEdge.java,v 1.5 2002/06/15 02:13:11 shaper Exp $ // $Id: DirectionalEdge.java,v 1.6 2004/02/25 14:44:33 mdb Exp $
package com.threerings.nodemap.direction; package com.threerings.nodemap.direction;
@@ -7,8 +7,6 @@ import java.awt.Graphics2D;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Stroke; import java.awt.Stroke;
import com.threerings.util.DirectionCodes;
import com.threerings.nodemap.Edge; import com.threerings.nodemap.Edge;
import com.threerings.nodemap.Node; import com.threerings.nodemap.Node;
@@ -1,5 +1,5 @@
// //
// $Id: Invitation.java,v 1.1 2002/08/14 19:07:52 mdb Exp $ // $Id: Invitation.java,v 1.2 2004/02/25 14:44:54 mdb Exp $
package com.threerings.parlor.client; package com.threerings.parlor.client;
@@ -104,7 +104,7 @@ public class Invitation
public void inviteReceived (int inviteId) public void inviteReceived (int inviteId)
{ {
// fill in our invitation id // fill in our invitation id
inviteId = inviteId; this.inviteId = inviteId;
// if the invitation was cancelled before we heard back about // if the invitation was cancelled before we heard back about
// it, we need to send off a cancellation request now // it, we need to send off a cancellation request now

Some files were not shown because too many files have changed in this diff Show More