diff --git a/src/java/com/threerings/geom/GeomUtil.java b/src/java/com/threerings/geom/GeomUtil.java index b8c6a6a49..dec1b3431 100644 --- a/src/java/com/threerings/geom/GeomUtil.java +++ b/src/java/com/threerings/geom/GeomUtil.java @@ -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; import java.awt.Point; import java.awt.Rectangle; -import java.awt.geom.Line2D; import java.awt.geom.Point2D; -import com.samskivert.util.StringUtil; - /** * General geometry utilites. */ diff --git a/src/java/com/threerings/geom/Log.java b/src/java/com/threerings/geom/Log.java index 26db5b321..c75a4196d 100644 --- a/src/java/com/threerings/geom/Log.java +++ b/src/java/com/threerings/geom/Log.java @@ -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; @@ -40,6 +40,6 @@ public class Log public static int getLevel () { - return log.getLevel(PACKAGE); + return com.samskivert.util.Log.getLevel(PACKAGE); } } diff --git a/src/java/com/threerings/io/BasicStreamers.java b/src/java/com/threerings/io/BasicStreamers.java index a62ffdf88..c42f6c728 100644 --- a/src/java/com/threerings/io/BasicStreamers.java +++ b/src/java/com/threerings/io/BasicStreamers.java @@ -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; import java.io.EOFException; import java.io.IOException; -import java.util.HashMap; /** * Code to read and write basic object types (like arrays of primitives, diff --git a/src/java/com/threerings/io/FieldMarshaller.java b/src/java/com/threerings/io/FieldMarshaller.java index 311542fae..39fb1fcda 100644 --- a/src/java/com/threerings/io/FieldMarshaller.java +++ b/src/java/com/threerings/io/FieldMarshaller.java @@ -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; -import java.io.IOException; import java.lang.reflect.Field; import java.util.Date; import java.util.HashMap; -import com.threerings.presents.Log; - /** * Used to read and write a single field of a {@link Streamable} instance. */ diff --git a/src/java/com/threerings/io/FramingOutputStream.java b/src/java/com/threerings/io/FramingOutputStream.java index 25c976ed8..cc91bb41a 100644 --- a/src/java/com/threerings/io/FramingOutputStream.java +++ b/src/java/com/threerings/io/FramingOutputStream.java @@ -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; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.OutputStream; import java.nio.BufferOverflowException; diff --git a/src/java/com/threerings/io/ObjectOutputStream.java b/src/java/com/threerings/io/ObjectOutputStream.java index b111f68fd..b676912f0 100644 --- a/src/java/com/threerings/io/ObjectOutputStream.java +++ b/src/java/com/threerings/io/ObjectOutputStream.java @@ -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; @@ -8,8 +8,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.HashMap; -import com.threerings.presents.Log; - /** * Used to write {@link Streamable} objects to an {@link OutputStream}. * Other common object types are supported as well: diff --git a/src/java/com/threerings/media/AbstractMedia.java b/src/java/com/threerings/media/AbstractMedia.java index 946a3b9ff..5e7603400 100644 --- a/src/java/com/threerings/media/AbstractMedia.java +++ b/src/java/com/threerings/media/AbstractMedia.java @@ -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; diff --git a/src/java/com/threerings/media/BackFrameManager.java b/src/java/com/threerings/media/BackFrameManager.java index 96808ce5b..2c7414451 100644 --- a/src/java/com/threerings/media/BackFrameManager.java +++ b/src/java/com/threerings/media/BackFrameManager.java @@ -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 diff --git a/src/java/com/threerings/media/FlipFrameManager.java b/src/java/com/threerings/media/FlipFrameManager.java index 422c7cc4d..d77e14ca8 100644 --- a/src/java/com/threerings/media/FlipFrameManager.java +++ b/src/java/com/threerings/media/FlipFrameManager.java @@ -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. diff --git a/src/java/com/threerings/media/FrameManager.java b/src/java/com/threerings/media/FrameManager.java index 6099dd822..dedf4d89d 100644 --- a/src/java/com/threerings/media/FrameManager.java +++ b/src/java/com/threerings/media/FrameManager.java @@ -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; diff --git a/src/java/com/threerings/media/FrameRepaintManager.java b/src/java/com/threerings/media/FrameRepaintManager.java index 004f27031..a27f92439 100644 --- a/src/java/com/threerings/media/FrameRepaintManager.java +++ b/src/java/com/threerings/media/FrameRepaintManager.java @@ -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; diff --git a/src/java/com/threerings/media/Log.java b/src/java/com/threerings/media/Log.java index f85e6f9f3..c854e4ade 100644 --- a/src/java/com/threerings/media/Log.java +++ b/src/java/com/threerings/media/Log.java @@ -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); } } diff --git a/src/java/com/threerings/media/MediaPanel.java b/src/java/com/threerings/media/MediaPanel.java index 14da37ca2..d980c7ee8 100644 --- a/src/java/com/threerings/media/MediaPanel.java +++ b/src/java/com/threerings/media/MediaPanel.java @@ -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; diff --git a/src/java/com/threerings/media/RegionManager.java b/src/java/com/threerings/media/RegionManager.java index de15892e5..91bf6f7e8 100644 --- a/src/java/com/threerings/media/RegionManager.java +++ b/src/java/com/threerings/media/RegionManager.java @@ -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; diff --git a/src/java/com/threerings/media/VirtualMediaPanel.java b/src/java/com/threerings/media/VirtualMediaPanel.java index 3ea0536a6..0348400c7 100644 --- a/src/java/com/threerings/media/VirtualMediaPanel.java +++ b/src/java/com/threerings/media/VirtualMediaPanel.java @@ -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; /** diff --git a/src/java/com/threerings/media/animation/Animation.java b/src/java/com/threerings/media/animation/Animation.java index 0a803ecc9..48ab9867b 100644 --- a/src/java/com/threerings/media/animation/Animation.java +++ b/src/java/com/threerings/media/animation/Animation.java @@ -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 diff --git a/src/java/com/threerings/media/animation/AnimationFrameSequencer.java b/src/java/com/threerings/media/animation/AnimationFrameSequencer.java index 52e269b29..dc32024d1 100644 --- a/src/java/com/threerings/media/animation/AnimationFrameSequencer.java +++ b/src/java/com/threerings/media/animation/AnimationFrameSequencer.java @@ -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; diff --git a/src/java/com/threerings/media/animation/AnimationManager.java b/src/java/com/threerings/media/animation/AnimationManager.java index 302f2a759..8aefe9ecb 100644 --- a/src/java/com/threerings/media/animation/AnimationManager.java +++ b/src/java/com/threerings/media/animation/AnimationManager.java @@ -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; /** diff --git a/src/java/com/threerings/media/animation/BobbleAnimation.java b/src/java/com/threerings/media/animation/BobbleAnimation.java index 84ac0adec..925fcc7f2 100644 --- a/src/java/com/threerings/media/animation/BobbleAnimation.java +++ b/src/java/com/threerings/media/animation/BobbleAnimation.java @@ -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 diff --git a/src/java/com/threerings/media/animation/ExplodeAnimation.java b/src/java/com/threerings/media/animation/ExplodeAnimation.java index 158788cc8..570a4aab1 100644 --- a/src/java/com/threerings/media/animation/ExplodeAnimation.java +++ b/src/java/com/threerings/media/animation/ExplodeAnimation.java @@ -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; /** diff --git a/src/java/com/threerings/media/animation/FadeAnimation.java b/src/java/com/threerings/media/animation/FadeAnimation.java index 7e837b828..48ca3ea1d 100644 --- a/src/java/com/threerings/media/animation/FadeAnimation.java +++ b/src/java/com/threerings/media/animation/FadeAnimation.java @@ -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; diff --git a/src/java/com/threerings/media/animation/SparkAnimation.java b/src/java/com/threerings/media/animation/SparkAnimation.java index 76b082ff2..d1712c80b 100644 --- a/src/java/com/threerings/media/animation/SparkAnimation.java +++ b/src/java/com/threerings/media/animation/SparkAnimation.java @@ -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; diff --git a/src/java/com/threerings/media/image/CachedVolatileMirage.java b/src/java/com/threerings/media/image/CachedVolatileMirage.java index 47d7e963b..8e1c8d726 100644 --- a/src/java/com/threerings/media/image/CachedVolatileMirage.java +++ b/src/java/com/threerings/media/image/CachedVolatileMirage.java @@ -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 diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java index 138775790..8908d1b9b 100644 --- a/src/java/com/threerings/media/image/ImageManager.java +++ b/src/java/com/threerings/media/image/ImageManager.java @@ -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; diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/java/com/threerings/media/image/ImageUtil.java index b0d33ab6d..64c399aa1 100644 --- a/src/java/com/threerings/media/image/ImageUtil.java +++ b/src/java/com/threerings/media/image/ImageUtil.java @@ -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. diff --git a/src/java/com/threerings/media/image/VolatileMirage.java b/src/java/com/threerings/media/image/VolatileMirage.java index 688a61973..7dd5112df 100644 --- a/src/java/com/threerings/media/image/VolatileMirage.java +++ b/src/java/com/threerings/media/image/VolatileMirage.java @@ -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; diff --git a/src/java/com/threerings/media/sound/MidiPlayer.java b/src/java/com/threerings/media/sound/MidiPlayer.java index 7cf6bd29e..afaceabfe 100644 --- a/src/java/com/threerings/media/sound/MidiPlayer.java +++ b/src/java/com/threerings/media/sound/MidiPlayer.java @@ -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; diff --git a/src/java/com/threerings/media/sound/ModPlayer.java b/src/java/com/threerings/media/sound/ModPlayer.java index 46ad4c22a..9221ff2f0 100644 --- a/src/java/com/threerings/media/sound/ModPlayer.java +++ b/src/java/com/threerings/media/sound/ModPlayer.java @@ -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. */ diff --git a/src/java/com/threerings/media/sound/Mp3Player.java b/src/java/com/threerings/media/sound/Mp3Player.java index f2790e4ea..e6f72e432 100644 --- a/src/java/com/threerings/media/sound/Mp3Player.java +++ b/src/java/com/threerings/media/sound/Mp3Player.java @@ -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 diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java index 05745cf6d..67a2712a9 100644 --- a/src/java/com/threerings/media/sound/SoundManager.java +++ b/src/java/com/threerings/media/sound/SoundManager.java @@ -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; diff --git a/src/java/com/threerings/media/sound/Sounds.java b/src/java/com/threerings/media/sound/Sounds.java index fa3c52751..da46a47a1 100644 --- a/src/java/com/threerings/media/sound/Sounds.java +++ b/src/java/com/threerings/media/sound/Sounds.java @@ -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 diff --git a/src/java/com/threerings/media/sprite/ImageSprite.java b/src/java/com/threerings/media/sprite/ImageSprite.java index 55f74184f..03c98a819 100644 --- a/src/java/com/threerings/media/sprite/ImageSprite.java +++ b/src/java/com/threerings/media/sprite/ImageSprite.java @@ -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; diff --git a/src/java/com/threerings/media/sprite/LabelSprite.java b/src/java/com/threerings/media/sprite/LabelSprite.java index 274bed5ef..038d4483c 100644 --- a/src/java/com/threerings/media/sprite/LabelSprite.java +++ b/src/java/com/threerings/media/sprite/LabelSprite.java @@ -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 diff --git a/src/java/com/threerings/media/sprite/Sprite.java b/src/java/com/threerings/media/sprite/Sprite.java index 81d790cc7..b4c929c2f 100644 --- a/src/java/com/threerings/media/sprite/Sprite.java +++ b/src/java/com/threerings/media/sprite/Sprite.java @@ -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; diff --git a/src/java/com/threerings/media/sprite/SpriteManager.java b/src/java/com/threerings/media/sprite/SpriteManager.java index 7825e91bc..bbfeefb2f 100644 --- a/src/java/com/threerings/media/sprite/SpriteManager.java +++ b/src/java/com/threerings/media/sprite/SpriteManager.java @@ -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; /** diff --git a/src/java/com/threerings/media/tile/SwissArmyTileSet.java b/src/java/com/threerings/media/tile/SwissArmyTileSet.java index a572d8feb..81013870e 100644 --- a/src/java/com/threerings/media/tile/SwissArmyTileSet.java +++ b/src/java/com/threerings/media/tile/SwissArmyTileSet.java @@ -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 diff --git a/src/java/com/threerings/media/tile/TileManager.java b/src/java/com/threerings/media/tile/TileManager.java index 026162fc5..202be8996 100644 --- a/src/java/com/threerings/media/tile/TileManager.java +++ b/src/java/com/threerings/media/tile/TileManager.java @@ -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 diff --git a/src/java/com/threerings/media/tile/TileMultiFrameImage.java b/src/java/com/threerings/media/tile/TileMultiFrameImage.java index 7a93fb439..4c84dfec1 100644 --- a/src/java/com/threerings/media/tile/TileMultiFrameImage.java +++ b/src/java/com/threerings/media/tile/TileMultiFrameImage.java @@ -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; /** diff --git a/src/java/com/threerings/media/tile/TileSet.java b/src/java/com/threerings/media/tile/TileSet.java index 040e0d424..537c9d668 100644 --- a/src/java/com/threerings/media/tile/TileSet.java +++ b/src/java/com/threerings/media/tile/TileSet.java @@ -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; diff --git a/src/java/com/threerings/media/tile/TileSetRepository.java b/src/java/com/threerings/media/tile/TileSetRepository.java index 3ec8191e0..606ea07da 100644 --- a/src/java/com/threerings/media/tile/TileSetRepository.java +++ b/src/java/com/threerings/media/tile/TileSetRepository.java @@ -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 diff --git a/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java b/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java index 79ee517e4..77ef258f2 100644 --- a/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java +++ b/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java @@ -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 diff --git a/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java b/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java index 50c5726fd..d36e91c1b 100644 --- a/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java +++ b/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java @@ -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; diff --git a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java index d834e7221..1cc5c006f 100644 --- a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java +++ b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java @@ -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; diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java index 6dae59170..142b05686 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java +++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java @@ -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; diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java index a57861aa9..37f11c800 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java +++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java @@ -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; diff --git a/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java index f165d1fab..45f77705c 100644 --- a/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java +++ b/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java @@ -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: diff --git a/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java index 1367d7d92..961501fd9 100644 --- a/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java +++ b/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java @@ -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; /** diff --git a/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java index 857910009..6be9df6ef 100644 --- a/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java +++ b/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java @@ -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; diff --git a/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java index 25c22866c..9240842bf 100644 --- a/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java +++ b/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java @@ -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; /** diff --git a/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java b/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java index 68bdfc34a..3eeb07e85 100644 --- a/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java +++ b/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java @@ -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; diff --git a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java index c581b5baf..b6047f669 100644 --- a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java +++ b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java @@ -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; /** diff --git a/src/java/com/threerings/media/timer/SystemMediaTimer.java b/src/java/com/threerings/media/timer/SystemMediaTimer.java index 430108c17..11a4b1f49 100644 --- a/src/java/com/threerings/media/timer/SystemMediaTimer.java +++ b/src/java/com/threerings/media/timer/SystemMediaTimer.java @@ -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. diff --git a/src/java/com/threerings/media/tools/RecolorImage.java b/src/java/com/threerings/media/tools/RecolorImage.java index 30e658b63..dc81a9460 100644 --- a/src/java/com/threerings/media/tools/RecolorImage.java +++ b/src/java/com/threerings/media/tools/RecolorImage.java @@ -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; /** diff --git a/src/java/com/threerings/media/util/ArcPath.java b/src/java/com/threerings/media/util/ArcPath.java index 5ba436c9f..87ef42628 100644 --- a/src/java/com/threerings/media/util/ArcPath.java +++ b/src/java/com/threerings/media/util/ArcPath.java @@ -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; /** diff --git a/src/java/com/threerings/media/util/BackgroundTiler.java b/src/java/com/threerings/media/util/BackgroundTiler.java index 815deb28e..0c8266a6a 100644 --- a/src/java/com/threerings/media/util/BackgroundTiler.java +++ b/src/java/com/threerings/media/util/BackgroundTiler.java @@ -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; diff --git a/src/java/com/threerings/media/util/BobblePath.java b/src/java/com/threerings/media/util/BobblePath.java index 8ad04af1f..13e859f9d 100644 --- a/src/java/com/threerings/media/util/BobblePath.java +++ b/src/java/com/threerings/media/util/BobblePath.java @@ -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; /** diff --git a/src/java/com/threerings/media/util/LinePath.java b/src/java/com/threerings/media/util/LinePath.java index 7d2f39c38..967f72953 100644 --- a/src/java/com/threerings/media/util/LinePath.java +++ b/src/java/com/threerings/media/util/LinePath.java @@ -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. diff --git a/src/java/com/threerings/media/util/MathUtil.java b/src/java/com/threerings/media/util/MathUtil.java index 46da6e072..c9248d952 100644 --- a/src/java/com/threerings/media/util/MathUtil.java +++ b/src/java/com/threerings/media/util/MathUtil.java @@ -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; /** diff --git a/src/java/com/threerings/media/util/PathSequence.java b/src/java/com/threerings/media/util/PathSequence.java index 48cbe6ab1..23a064fc9 100644 --- a/src/java/com/threerings/media/util/PathSequence.java +++ b/src/java/com/threerings/media/util/PathSequence.java @@ -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; diff --git a/src/java/com/threerings/media/util/Pathable.java b/src/java/com/threerings/media/util/Pathable.java index 8cea76615..71c95fba7 100644 --- a/src/java/com/threerings/media/util/Pathable.java +++ b/src/java/com/threerings/media/util/Pathable.java @@ -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}. diff --git a/src/java/com/threerings/micasa/client/ChatPanel.java b/src/java/com/threerings/micasa/client/ChatPanel.java index 4c6bd4140..b1141b530 100644 --- a/src/java/com/threerings/micasa/client/ChatPanel.java +++ b/src/java/com/threerings/micasa/client/ChatPanel.java @@ -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; @@ -19,7 +19,6 @@ import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.event.AncestorEvent; -import javax.swing.event.AncestorListener; import javax.swing.text.BadLocationException; import javax.swing.text.Document; @@ -32,8 +31,6 @@ import com.samskivert.swing.HGroupLayout; import com.samskivert.swing.VGroupLayout; import com.samskivert.swing.event.AncestorAdapter; -import com.threerings.util.MessageBundle; - import com.threerings.crowd.chat.client.ChatDirector; import com.threerings.crowd.chat.client.ChatDisplay; import com.threerings.crowd.chat.data.ChatCodes; diff --git a/src/java/com/threerings/micasa/client/ClientController.java b/src/java/com/threerings/micasa/client/ClientController.java index 4476a4e73..ee9053396 100644 --- a/src/java/com/threerings/micasa/client/ClientController.java +++ b/src/java/com/threerings/micasa/client/ClientController.java @@ -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; import java.awt.event.ActionEvent; import com.samskivert.swing.Controller; -import com.samskivert.util.StringUtil; import com.threerings.presents.client.Client; import com.threerings.presents.client.SessionObserver; diff --git a/src/java/com/threerings/micasa/client/LogonPanel.java b/src/java/com/threerings/micasa/client/LogonPanel.java index e7bed758b..2fbe820b1 100644 --- a/src/java/com/threerings/micasa/client/LogonPanel.java +++ b/src/java/com/threerings/micasa/client/LogonPanel.java @@ -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; @@ -8,7 +8,6 @@ import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/java/com/threerings/micasa/client/MiCasaClient.java b/src/java/com/threerings/micasa/client/MiCasaClient.java index 0ecb32482..ece366068 100644 --- a/src/java/com/threerings/micasa/client/MiCasaClient.java +++ b/src/java/com/threerings/micasa/client/MiCasaClient.java @@ -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; @@ -21,7 +21,6 @@ import com.threerings.crowd.client.PlaceView; import com.threerings.parlor.client.ParlorDirector; -import com.threerings.micasa.Log; import com.threerings.micasa.util.MiCasaContext; /** diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java index 5481ccab6..bca2cf4ab 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java +++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java @@ -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; -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.LobbiesListener; -import com.threerings.presents.client.Client; + import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; -import java.util.List; /** * Dispatches requests to the {@link LobbyProvider}. * *

Generated from - * $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 $ * */ public class LobbyDispatcher extends InvocationDispatcher diff --git a/src/java/com/threerings/micasa/lobby/LobbyManager.java b/src/java/com/threerings/micasa/lobby/LobbyManager.java index 656e5c3ed..af41e0802 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyManager.java +++ b/src/java/com/threerings/micasa/lobby/LobbyManager.java @@ -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; import java.util.Properties; import com.samskivert.util.StringUtil; -import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.server.PlaceManager; import com.threerings.micasa.Log; diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java index 72ffaf078..60645d6a3 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java +++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java @@ -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; 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.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; @@ -19,7 +17,7 @@ import java.util.List; * to the requesting client. * *

Generated from - * $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 $ * */ public class LobbyMarshaller extends InvocationMarshaller diff --git a/src/java/com/threerings/micasa/lobby/LobbySelector.java b/src/java/com/threerings/micasa/lobby/LobbySelector.java index 95a2ee33c..88571a59e 100644 --- a/src/java/com/threerings/micasa/lobby/LobbySelector.java +++ b/src/java/com/threerings/micasa/lobby/LobbySelector.java @@ -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; @@ -10,10 +10,6 @@ import java.awt.event.*; import java.util.*; 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; diff --git a/src/java/com/threerings/micasa/lobby/table/TableGameConfigurator.java b/src/java/com/threerings/micasa/lobby/table/TableGameConfigurator.java index 50cf6ba3e..e99947be5 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableGameConfigurator.java +++ b/src/java/com/threerings/micasa/lobby/table/TableGameConfigurator.java @@ -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; -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.VGroupLayout; import com.threerings.parlor.client.GameConfigurator; import com.threerings.parlor.data.TableConfig; -import com.threerings.parlor.util.ParlorContext; /** * Extends the basic game configurator with elements to support the diff --git a/src/java/com/threerings/micasa/lobby/table/TableListView.java b/src/java/com/threerings/micasa/lobby/table/TableListView.java index cdecb1e4d..2a9721533 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableListView.java +++ b/src/java/com/threerings/micasa/lobby/table/TableListView.java @@ -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; -import java.util.Iterator; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Iterator; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; 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.VGroupLayout; import com.samskivert.swing.util.SwingUtil; -import com.threerings.crowd.client.PlaceView; -import com.threerings.crowd.data.PlaceObject; +import com.threerings.micasa.Log; +import com.threerings.micasa.lobby.LobbyConfig; +import com.threerings.micasa.util.MiCasaContext; import com.threerings.parlor.client.GameConfigurator; import com.threerings.parlor.client.SeatednessObserver; import com.threerings.parlor.client.TableDirector; import com.threerings.parlor.client.TableObserver; import com.threerings.parlor.data.Table; -import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.game.GameConfig; -import com.threerings.micasa.Log; -import com.threerings.micasa.lobby.LobbyConfig; -import com.threerings.micasa.util.MiCasaContext; +import com.threerings.crowd.client.PlaceView; +import com.threerings.crowd.data.PlaceObject; /** * A view that displays the tables in a table lobby. It displays two diff --git a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java index ca969882d..8e23918a3 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java +++ b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java @@ -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; @@ -24,9 +24,7 @@ import com.threerings.crowd.client.PlaceView; import com.threerings.parlor.client.ParlorDirector; import com.threerings.parlor.util.ParlorContext; -import com.threerings.micasa.Log; import com.threerings.micasa.client.MiCasaFrame; -import com.threerings.micasa.simulator.data.SimulatorInfo; import com.threerings.micasa.util.MiCasaContext; public class SimpleClient diff --git a/src/java/com/threerings/micasa/simulator/client/SimpleFrame.java b/src/java/com/threerings/micasa/simulator/client/SimpleFrame.java index f4c607a80..256cbd78d 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimpleFrame.java +++ b/src/java/com/threerings/micasa/simulator/client/SimpleFrame.java @@ -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; -import java.awt.BorderLayout; import javax.swing.JFrame; -import javax.swing.JPanel; import com.samskivert.swing.Controller; -import com.samskivert.swing.util.SwingUtil; import com.threerings.micasa.client.MiCasaFrame; diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorController.java b/src/java/com/threerings/micasa/simulator/client/SimulatorController.java index e84c6b255..f2e492a50 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorController.java +++ b/src/java/com/threerings/micasa/simulator/client/SimulatorController.java @@ -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; import java.awt.event.ActionEvent; import com.samskivert.swing.Controller; -import com.samskivert.util.StringUtil; import com.threerings.presents.client.Client; import com.threerings.presents.client.SessionObserver; diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java index 957239baf..96414a36b 100644 --- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java +++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java @@ -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; @@ -7,7 +7,6 @@ import com.threerings.micasa.simulator.client.SimulatorService; import com.threerings.parlor.game.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.dobj.InvocationResponseEvent; /** * Provides the implementation of the {@link SimulatorService} interface @@ -17,7 +16,7 @@ import com.threerings.presents.dobj.InvocationResponseEvent; * to the requesting client. * *

Generated from - * $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 $ * */ public class SimulatorMarshaller extends InvocationMarshaller diff --git a/src/java/com/threerings/micasa/simulator/server/SimpleServer.java b/src/java/com/threerings/micasa/simulator/server/SimpleServer.java index 19a0b25ad..a75da3b2f 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimpleServer.java +++ b/src/java/com/threerings/micasa/simulator/server/SimpleServer.java @@ -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; import com.samskivert.util.ResultListener; -import com.threerings.crowd.data.BodyObject; import com.threerings.micasa.server.MiCasaServer; /** diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java index 8a6b89b2a..c609ca26e 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java @@ -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; -import com.threerings.micasa.simulator.client.SimulatorService; import com.threerings.micasa.simulator.data.SimulatorMarshaller; import com.threerings.parlor.game.GameConfig; -import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; @@ -16,7 +14,7 @@ import com.threerings.presents.server.InvocationException; * Dispatches requests to the {@link SimulatorProvider}. * *

Generated from - * $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 $ * */ public class SimulatorDispatcher extends InvocationDispatcher diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java index 0dac3bacd..c687f65c1 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java @@ -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; @@ -10,7 +10,6 @@ import com.threerings.presents.dobj.RootDObjectManager; import com.threerings.presents.server.ClientManager; import com.threerings.presents.server.ClientResolutionListener; import com.threerings.presents.server.InvocationManager; -import com.threerings.presents.server.InvocationProvider; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.PlaceObject; diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorServer.java b/src/java/com/threerings/micasa/simulator/server/SimulatorServer.java index 618854010..ace1ab621 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorServer.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorServer.java @@ -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; import com.samskivert.util.ResultListener; -import com.threerings.crowd.data.BodyObject; - /** * The simulator manager needs a mechanism for faking body object * registrations, which is provided by implementations of this interface. diff --git a/src/java/com/threerings/miso/client/DirtyItemList.java b/src/java/com/threerings/miso/client/DirtyItemList.java index b283c3134..5370ca0d8 100644 --- a/src/java/com/threerings/miso/client/DirtyItemList.java +++ b/src/java/com/threerings/miso/client/DirtyItemList.java @@ -1,27 +1,18 @@ // -// $Id: DirtyItemList.java,v 1.28 2003/04/28 23:33:43 mdb Exp $ +// $Id: DirtyItemList.java,v 1.29 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.client; -import java.awt.Color; import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Polygon; -import java.awt.Rectangle; -import java.awt.Shape; - import java.util.ArrayList; import java.util.Comparator; import com.samskivert.util.SortableArrayList; -import com.samskivert.util.StringUtil; import com.threerings.media.Log; import com.threerings.media.sprite.Sprite; import com.threerings.media.tile.ObjectTile; -import com.threerings.miso.MisoPrefs; - /** * The dirty item list keeps track of dirty sprites and object tiles * in a scene. diff --git a/src/java/com/threerings/miso/client/MisoScenePanel.java b/src/java/com/threerings/miso/client/MisoScenePanel.java index 6e5d2c02e..bb0d9f66d 100644 --- a/src/java/com/threerings/miso/client/MisoScenePanel.java +++ b/src/java/com/threerings/miso/client/MisoScenePanel.java @@ -1,5 +1,5 @@ // -// $Id: MisoScenePanel.java,v 1.58 2004/02/22 18:55:26 ray Exp $ +// $Id: MisoScenePanel.java,v 1.59 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.client; @@ -9,7 +9,6 @@ import java.awt.Color; import java.awt.Component; import java.awt.Composite; import java.awt.Dimension; -import java.awt.EventQueue; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics2D; @@ -46,7 +45,6 @@ import com.threerings.media.sprite.Sprite; import com.threerings.media.tile.Tile; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; -import com.threerings.media.tile.TileUtil; import com.threerings.media.util.MathUtil; import com.threerings.media.util.Path; @@ -60,7 +58,6 @@ import com.threerings.miso.util.AStarPathUtil; import com.threerings.miso.util.MisoContext; import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoUtil; -import com.threerings.miso.util.ObjectSet; /** * Renders a Miso scene for all to see. diff --git a/src/java/com/threerings/miso/client/SceneBlock.java b/src/java/com/threerings/miso/client/SceneBlock.java index cf85319e8..ff50fccaa 100644 --- a/src/java/com/threerings/miso/client/SceneBlock.java +++ b/src/java/com/threerings/miso/client/SceneBlock.java @@ -1,5 +1,5 @@ // -// $Id: SceneBlock.java,v 1.23 2003/11/12 23:13:45 ray Exp $ +// $Id: SceneBlock.java,v 1.24 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.client; @@ -18,8 +18,6 @@ import com.threerings.geom.GeomUtil; import com.threerings.media.tile.NoSuchTileException; import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.ObjectTile; -import com.threerings.media.tile.Tile; -import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; import com.threerings.media.util.MathUtil; diff --git a/src/java/com/threerings/miso/client/SceneObjectTip.java b/src/java/com/threerings/miso/client/SceneObjectTip.java index 2840f76fa..5cec6e03b 100644 --- a/src/java/com/threerings/miso/client/SceneObjectTip.java +++ b/src/java/com/threerings/miso/client/SceneObjectTip.java @@ -1,5 +1,5 @@ // -// $Id: SceneObjectTip.java,v 1.4 2004/01/11 08:26:18 mdb Exp $ +// $Id: SceneObjectTip.java,v 1.5 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.client; @@ -11,15 +11,12 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.util.Collection; -import java.util.Comparator; import javax.swing.Icon; import javax.swing.UIManager; import com.samskivert.swing.Label; import com.samskivert.swing.LabelSausage; -import com.samskivert.swing.LabelStyleConstants; -import com.samskivert.swing.util.SwingUtil; import com.samskivert.util.StringUtil; import com.samskivert.util.SortableArrayList; diff --git a/src/java/com/threerings/miso/client/TilePath.java b/src/java/com/threerings/miso/client/TilePath.java index 45bbf6512..01a7ba804 100644 --- a/src/java/com/threerings/miso/client/TilePath.java +++ b/src/java/com/threerings/miso/client/TilePath.java @@ -1,5 +1,5 @@ // -// $Id: TilePath.java,v 1.17 2003/05/16 00:26:18 mdb Exp $ +// $Id: TilePath.java,v 1.18 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.client; @@ -11,9 +11,7 @@ import com.threerings.util.DirectionCodes; import com.threerings.media.sprite.Sprite; import com.threerings.media.util.LineSegmentPath; import com.threerings.media.util.MathUtil; -import com.threerings.media.util.PathNode; -import com.threerings.miso.Log; import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoUtil; diff --git a/src/java/com/threerings/miso/data/MisoSceneModel.java b/src/java/com/threerings/miso/data/MisoSceneModel.java index 992f3e9d4..74cf03fbf 100644 --- a/src/java/com/threerings/miso/data/MisoSceneModel.java +++ b/src/java/com/threerings/miso/data/MisoSceneModel.java @@ -1,5 +1,5 @@ // -// $Id: MisoSceneModel.java,v 1.18 2003/04/25 22:26:25 mdb Exp $ +// $Id: MisoSceneModel.java,v 1.19 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.data; @@ -8,8 +8,6 @@ import java.util.Random; import com.threerings.io.SimpleStreamableObject; -import com.threerings.media.tile.TileUtil; - import com.threerings.miso.util.ObjectSet; /** diff --git a/src/java/com/threerings/miso/data/ObjectInfo.java b/src/java/com/threerings/miso/data/ObjectInfo.java index f257d4ee7..c23a02dc6 100644 --- a/src/java/com/threerings/miso/data/ObjectInfo.java +++ b/src/java/com/threerings/miso/data/ObjectInfo.java @@ -1,5 +1,5 @@ // -// $Id: ObjectInfo.java,v 1.4 2003/07/12 04:16:10 mdb Exp $ +// $Id: ObjectInfo.java,v 1.5 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.data; @@ -60,7 +60,7 @@ public class ObjectInfo extends SimpleStreamableObject this.sx = other.sx; this.sy = other.sy; this.sorient = other.sorient; - this.zations = zations; + this.zations = other.zations; } /** diff --git a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java index 2011e7182..8a914883f 100644 --- a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java +++ b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java @@ -1,5 +1,5 @@ // -// $Id: SparseMisoSceneModel.java,v 1.10 2004/01/11 12:21:17 mdb Exp $ +// $Id: SparseMisoSceneModel.java,v 1.11 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.data; @@ -8,7 +8,6 @@ import java.util.ArrayList; import java.util.Iterator; import com.samskivert.util.ArrayUtil; -import com.samskivert.util.IntListUtil; import com.samskivert.util.ListUtil; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/miso/data/VirtualMisoSceneModel.java b/src/java/com/threerings/miso/data/VirtualMisoSceneModel.java index 79adcca03..c77dd114f 100644 --- a/src/java/com/threerings/miso/data/VirtualMisoSceneModel.java +++ b/src/java/com/threerings/miso/data/VirtualMisoSceneModel.java @@ -1,10 +1,8 @@ // -// $Id: VirtualMisoSceneModel.java,v 1.3 2003/04/19 22:40:34 mdb Exp $ +// $Id: VirtualMisoSceneModel.java,v 1.4 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.data; -import java.awt.Rectangle; - /** * A convenient base class for "virtual" scenes which do not allow editing * and compute the base and object tiles rather than obtain them from some diff --git a/src/java/com/threerings/miso/tile/AutoFringer.java b/src/java/com/threerings/miso/tile/AutoFringer.java index cdb065e11..9e94dc1cc 100644 --- a/src/java/com/threerings/miso/tile/AutoFringer.java +++ b/src/java/com/threerings/miso/tile/AutoFringer.java @@ -1,24 +1,20 @@ // -// $Id: AutoFringer.java,v 1.27 2003/11/12 23:13:45 ray Exp $ +// $Id: AutoFringer.java,v 1.28 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.tile; import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Rectangle; import java.awt.Transparency; import java.awt.image.BufferedImage; - import java.util.ArrayList; import java.util.HashMap; -import java.util.Random; import com.samskivert.util.CheapIntMap; import com.samskivert.util.QuickSort; -import com.samskivert.util.StringUtil; -import com.threerings.media.Log; import com.threerings.media.image.BufferedMirage; +import com.threerings.media.image.ImageManager; +import com.threerings.media.image.ImageUtil; import com.threerings.media.tile.NoSuchTileException; import com.threerings.media.tile.NoSuchTileSetException; @@ -26,12 +22,7 @@ import com.threerings.media.tile.Tile; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; -import com.threerings.media.image.ImageUtil; - -import com.threerings.media.image.BackedVolatileMirage; -import com.threerings.media.image.ImageManager; -import com.threerings.media.image.Mirage; - +import com.threerings.miso.Log; import com.threerings.miso.data.MisoSceneModel; import com.threerings.miso.util.MisoUtil; diff --git a/src/java/com/threerings/miso/tile/FringeConfiguration.java b/src/java/com/threerings/miso/tile/FringeConfiguration.java index ca9d2d47b..eb32183c2 100644 --- a/src/java/com/threerings/miso/tile/FringeConfiguration.java +++ b/src/java/com/threerings/miso/tile/FringeConfiguration.java @@ -1,17 +1,14 @@ // -// $Id: FringeConfiguration.java,v 1.15 2003/05/29 01:58:06 ray Exp $ +// $Id: FringeConfiguration.java,v 1.16 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.tile; import java.io.Serializable; import java.util.ArrayList; -import java.util.Random; import com.samskivert.util.HashIntMap; import com.samskivert.util.StringUtil; -import com.threerings.miso.Log; - /** * Used to manage data about which base tilesets fringe on which others * and how they fringe. diff --git a/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java b/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java index df1a1fc9e..57a5e0826 100644 --- a/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java +++ b/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java @@ -1,15 +1,13 @@ // -// $Id: BaseTileSetRuleSet.java,v 1.9 2002/02/05 20:29:10 mdb Exp $ +// $Id: BaseTileSetRuleSet.java,v 1.10 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.tile.tools.xml; -import org.xml.sax.Attributes; import org.apache.commons.digester.Digester; import com.samskivert.util.StringUtil; import com.samskivert.xml.CallMethodSpecialRule; -import com.threerings.media.tile.TileSet; import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet; import com.threerings.miso.Log; diff --git a/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java b/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java index 85b15be7a..fe7b58ef2 100644 --- a/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java +++ b/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java @@ -1,5 +1,5 @@ // -// $Id: FringeConfigurationParser.java,v 1.8 2002/05/07 00:05:02 mdb Exp $ +// $Id: FringeConfigurationParser.java,v 1.9 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.tile.tools.xml; @@ -7,7 +7,6 @@ import java.io.Serializable; import org.xml.sax.Attributes; import org.apache.commons.digester.Digester; -import org.apache.commons.digester.Rule; import com.samskivert.util.StringUtil; import com.samskivert.xml.SetPropertyFieldsRule; diff --git a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java index e43a923c5..8d6697d2a 100644 --- a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java +++ b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java @@ -1,5 +1,5 @@ // -// $Id: SimpleMisoSceneParser.java,v 1.1 2003/04/17 19:21:16 mdb Exp $ +// $Id: SimpleMisoSceneParser.java,v 1.2 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.tools.xml; @@ -10,7 +10,6 @@ import org.xml.sax.SAXException; import org.apache.commons.digester.Digester; import com.samskivert.util.StringUtil; -import com.threerings.tools.xml.NestableRuleSet; import com.threerings.miso.data.SimpleMisoSceneModel; diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java index a7a37eef7..3d2f33fbb 100644 --- a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java +++ b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java @@ -1,5 +1,5 @@ // -// $Id: SparseMisoSceneParser.java,v 1.2 2003/05/14 21:34:01 ray Exp $ +// $Id: SparseMisoSceneParser.java,v 1.3 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.tools.xml; @@ -11,7 +11,6 @@ import org.apache.commons.digester.Digester; import com.samskivert.io.StreamUtil; import com.samskivert.util.StringUtil; -import com.threerings.tools.xml.NestableRuleSet; import com.threerings.miso.data.SparseMisoSceneModel; diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java index fbaeb5f14..9a08f6c21 100644 --- a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java +++ b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java @@ -1,15 +1,13 @@ // -// $Id: SparseMisoSceneRuleSet.java,v 1.2 2003/04/21 17:08:57 mdb Exp $ +// $Id: SparseMisoSceneRuleSet.java,v 1.3 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.tools.xml; -import java.util.ArrayList; import org.xml.sax.Attributes; import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; -import com.samskivert.xml.CallMethodSpecialRule; import com.samskivert.xml.SetFieldRule; import com.samskivert.xml.SetPropertyFieldsRule; diff --git a/src/java/com/threerings/miso/util/AStarPathUtil.java b/src/java/com/threerings/miso/util/AStarPathUtil.java index 1c47296d8..98c9f993f 100644 --- a/src/java/com/threerings/miso/util/AStarPathUtil.java +++ b/src/java/com/threerings/miso/util/AStarPathUtil.java @@ -1,5 +1,5 @@ // -// $Id: AStarPathUtil.java,v 1.3 2004/01/12 05:52:05 mdb Exp $ +// $Id: AStarPathUtil.java,v 1.4 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.util; @@ -10,9 +10,6 @@ import com.samskivert.util.HashIntMap; import com.threerings.media.util.MathUtil; -import com.threerings.miso.Log; -import com.threerings.miso.tile.BaseTile; - /** * The AStarPathUtil class provides a facility for * finding a reasonable path between two points in a scene using the diff --git a/src/java/com/threerings/miso/util/MisoSceneMetrics.java b/src/java/com/threerings/miso/util/MisoSceneMetrics.java index d004be926..743e1777c 100644 --- a/src/java/com/threerings/miso/util/MisoSceneMetrics.java +++ b/src/java/com/threerings/miso/util/MisoSceneMetrics.java @@ -1,11 +1,8 @@ // -// $Id: MisoSceneMetrics.java,v 1.4 2003/05/12 02:04:16 mdb Exp $ +// $Id: MisoSceneMetrics.java,v 1.5 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.util; -import java.awt.Point; -import java.awt.Rectangle; - /** * Contains information on the configuration of a particular isometric * view. The member data are public to facilitate convenient referencing diff --git a/src/java/com/threerings/miso/util/MisoUtil.java b/src/java/com/threerings/miso/util/MisoUtil.java index be127f47d..390f33ea9 100644 --- a/src/java/com/threerings/miso/util/MisoUtil.java +++ b/src/java/com/threerings/miso/util/MisoUtil.java @@ -1,23 +1,17 @@ // -// $Id: MisoUtil.java,v 1.22 2003/05/29 01:58:06 ray Exp $ +// $Id: MisoUtil.java,v 1.23 2004/02/25 14:43:57 mdb Exp $ package com.threerings.miso.util; import java.awt.Point; import java.awt.Polygon; -import java.awt.Rectangle; import com.samskivert.swing.SmartPolygon; -import com.samskivert.util.StringUtil; - -import com.threerings.media.sprite.Sprite; -import com.threerings.media.util.MathUtil; import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; -import com.threerings.miso.Log; -import com.threerings.miso.MisoConfig; +import com.threerings.media.util.MathUtil; /** * Miscellaneous isometric-display-related utility routines. diff --git a/src/java/com/threerings/nodemap/NodeMap.java b/src/java/com/threerings/nodemap/NodeMap.java index 507385922..50e0c30a1 100644 --- a/src/java/com/threerings/nodemap/NodeMap.java +++ b/src/java/com/threerings/nodemap/NodeMap.java @@ -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; import java.awt.*; import java.util.*; -import javax.swing.JComponent; import com.samskivert.swing.ToolTipManager; import com.samskivert.swing.ToolTipProvider; diff --git a/src/java/com/threerings/nodemap/direction/DirectionalEdge.java b/src/java/com/threerings/nodemap/direction/DirectionalEdge.java index eff4151a0..a49dafb31 100644 --- a/src/java/com/threerings/nodemap/direction/DirectionalEdge.java +++ b/src/java/com/threerings/nodemap/direction/DirectionalEdge.java @@ -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; @@ -7,8 +7,6 @@ import java.awt.Graphics2D; import java.awt.Graphics; import java.awt.Stroke; -import com.threerings.util.DirectionCodes; - import com.threerings.nodemap.Edge; import com.threerings.nodemap.Node; diff --git a/src/java/com/threerings/parlor/client/Invitation.java b/src/java/com/threerings/parlor/client/Invitation.java index 087ab731e..89542768f 100644 --- a/src/java/com/threerings/parlor/client/Invitation.java +++ b/src/java/com/threerings/parlor/client/Invitation.java @@ -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; @@ -104,7 +104,7 @@ public class Invitation public void inviteReceived (int inviteId) { // fill in our invitation id - inviteId = inviteId; + this.inviteId = inviteId; // if the invitation was cancelled before we heard back about // it, we need to send off a cancellation request now diff --git a/src/java/com/threerings/parlor/client/InvitationHandler.java b/src/java/com/threerings/parlor/client/InvitationHandler.java index ee83340a1..056ef4d34 100644 --- a/src/java/com/threerings/parlor/client/InvitationHandler.java +++ b/src/java/com/threerings/parlor/client/InvitationHandler.java @@ -1,10 +1,8 @@ // -// $Id: InvitationHandler.java,v 1.3 2002/08/14 19:07:52 mdb Exp $ +// $Id: InvitationHandler.java,v 1.4 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.client; -import com.threerings.parlor.game.GameConfig; - /** * A client entity that wishes to handle invitations received by other * clients should implement this interface and register itself with the diff --git a/src/java/com/threerings/parlor/client/ParlorDirector.java b/src/java/com/threerings/parlor/client/ParlorDirector.java index e887cb110..80bf59c3e 100644 --- a/src/java/com/threerings/parlor/client/ParlorDirector.java +++ b/src/java/com/threerings/parlor/client/ParlorDirector.java @@ -1,10 +1,9 @@ // -// $Id: ParlorDirector.java,v 1.18 2002/12/12 23:55:31 shaper Exp $ +// $Id: ParlorDirector.java,v 1.19 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.client; import java.util.ArrayList; -import java.util.Iterator; import com.samskivert.util.HashIntMap; import com.threerings.presents.client.BasicDirector; diff --git a/src/java/com/threerings/parlor/client/ParlorReceiver.java b/src/java/com/threerings/parlor/client/ParlorReceiver.java index 4bfdfed04..1e862ff1c 100644 --- a/src/java/com/threerings/parlor/client/ParlorReceiver.java +++ b/src/java/com/threerings/parlor/client/ParlorReceiver.java @@ -1,11 +1,10 @@ // -// $Id: ParlorReceiver.java,v 1.1 2002/08/14 19:07:52 mdb Exp $ +// $Id: ParlorReceiver.java,v 1.2 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.client; import com.threerings.presents.client.InvocationReceiver; -import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.GameConfig; /** diff --git a/src/java/com/threerings/parlor/client/TableDirector.java b/src/java/com/threerings/parlor/client/TableDirector.java index dbf768d94..741252984 100644 --- a/src/java/com/threerings/parlor/client/TableDirector.java +++ b/src/java/com/threerings/parlor/client/TableDirector.java @@ -1,5 +1,5 @@ // -// $Id: TableDirector.java,v 1.9 2002/10/27 22:23:14 mdb Exp $ +// $Id: TableDirector.java,v 1.10 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.client; @@ -18,7 +18,6 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.parlor.Log; import com.threerings.parlor.data.Table; -import com.threerings.parlor.data.TableLobbyObject; import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.util.ParlorContext; diff --git a/src/java/com/threerings/parlor/game/AIGameTicker.java b/src/java/com/threerings/parlor/game/AIGameTicker.java index ec0c23e98..4dfacd9f9 100644 --- a/src/java/com/threerings/parlor/game/AIGameTicker.java +++ b/src/java/com/threerings/parlor/game/AIGameTicker.java @@ -1,12 +1,11 @@ // -// $Id: AIGameTicker.java,v 1.4 2003/06/21 15:32:29 mdb Exp $ +// $Id: AIGameTicker.java,v 1.5 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.game; import java.util.Iterator; import java.util.HashSet; -import com.samskivert.util.Interval; import com.samskivert.util.IntervalManager; import com.threerings.presents.server.util.SafeInterval; diff --git a/src/java/com/threerings/parlor/game/GameConfig.java b/src/java/com/threerings/parlor/game/GameConfig.java index ca77e115f..c91a045d0 100644 --- a/src/java/com/threerings/parlor/game/GameConfig.java +++ b/src/java/com/threerings/parlor/game/GameConfig.java @@ -1,10 +1,9 @@ // -// $Id: GameConfig.java,v 1.15 2003/03/20 19:50:35 ray Exp $ +// $Id: GameConfig.java,v 1.16 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.game; import com.threerings.crowd.data.PlaceConfig; -import com.threerings.parlor.client.GameConfigurator; /** * The game config class encapsulates the configuration information for a diff --git a/src/java/com/threerings/parlor/game/GameController.java b/src/java/com/threerings/parlor/game/GameController.java index 7831a35a9..cac87a697 100644 --- a/src/java/com/threerings/parlor/game/GameController.java +++ b/src/java/com/threerings/parlor/game/GameController.java @@ -1,15 +1,12 @@ // -// $Id: GameController.java,v 1.23 2003/11/25 22:35:10 mdb Exp $ +// $Id: GameController.java,v 1.24 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.game; import java.awt.event.ActionEvent; -import com.samskivert.swing.Controller; - import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; -import com.threerings.presents.dobj.MessageEvent; import com.threerings.crowd.client.PlaceController; import com.threerings.crowd.client.PlaceControllerDelegate; diff --git a/src/java/com/threerings/parlor/game/GameManager.java b/src/java/com/threerings/parlor/game/GameManager.java index 0fbbf72ef..a4240a6c3 100644 --- a/src/java/com/threerings/parlor/game/GameManager.java +++ b/src/java/com/threerings/parlor/game/GameManager.java @@ -1,5 +1,5 @@ // -// $Id: GameManager.java,v 1.69 2003/11/24 18:09:03 mdb Exp $ +// $Id: GameManager.java,v 1.70 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.game; @@ -13,13 +13,11 @@ import com.samskivert.util.StringUtil; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; -import com.threerings.presents.dobj.MessageEvent; import com.threerings.presents.server.util.SafeInterval; import com.threerings.crowd.chat.server.SpeakProvider; import com.threerings.crowd.data.BodyObject; -import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.PlaceManager; import com.threerings.crowd.server.CrowdServer; diff --git a/src/java/com/threerings/parlor/game/GameMarshaller.java b/src/java/com/threerings/parlor/game/GameMarshaller.java index e4218ac58..1caaabc3b 100644 --- a/src/java/com/threerings/parlor/game/GameMarshaller.java +++ b/src/java/com/threerings/parlor/game/GameMarshaller.java @@ -1,12 +1,11 @@ // -// $Id: GameMarshaller.java,v 1.3 2002/09/06 22:52:27 shaper Exp $ +// $Id: GameMarshaller.java,v 1.4 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.game; import com.threerings.parlor.game.GameService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.dobj.InvocationResponseEvent; /** * Provides the implementation of the {@link GameService} interface diff --git a/src/java/com/threerings/parlor/game/GameObject.java b/src/java/com/threerings/parlor/game/GameObject.java index 7168673d7..aa9010be5 100644 --- a/src/java/com/threerings/parlor/game/GameObject.java +++ b/src/java/com/threerings/parlor/game/GameObject.java @@ -1,9 +1,8 @@ // -// $Id: GameObject.java,v 1.16 2003/05/26 23:46:46 mdb Exp $ +// $Id: GameObject.java,v 1.17 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.game; -import com.samskivert.util.ListUtil; import com.samskivert.util.StringUtil; import com.threerings.crowd.data.PlaceObject; diff --git a/src/java/com/threerings/parlor/turn/TurnGameController.java b/src/java/com/threerings/parlor/turn/TurnGameController.java index c175967cf..8e1967f69 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameController.java +++ b/src/java/com/threerings/parlor/turn/TurnGameController.java @@ -1,10 +1,8 @@ // -// $Id: TurnGameController.java,v 1.4 2002/02/13 03:21:28 mdb Exp $ +// $Id: TurnGameController.java,v 1.5 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.turn; -import com.threerings.parlor.game.GameController; - /** * Games that wish to make use of the turn game services should have their * controller implement this interface and create an instance of {@link diff --git a/src/java/com/threerings/parlor/turn/TurnGameManager.java b/src/java/com/threerings/parlor/turn/TurnGameManager.java index f41fe2c55..7cd180236 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameManager.java +++ b/src/java/com/threerings/parlor/turn/TurnGameManager.java @@ -1,10 +1,8 @@ // -// $Id: TurnGameManager.java,v 1.8 2002/10/15 23:07:23 shaper Exp $ +// $Id: TurnGameManager.java,v 1.9 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.turn; -import com.threerings.parlor.game.GameManager; - /** * A game manager that wishes to make use of the turn game services should * implement this interface and create a {@link TurnGameManagerDelegate} diff --git a/src/java/com/threerings/parlor/turn/TurnGameObject.java b/src/java/com/threerings/parlor/turn/TurnGameObject.java index 9a4652996..a45e7bc89 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameObject.java +++ b/src/java/com/threerings/parlor/turn/TurnGameObject.java @@ -1,10 +1,8 @@ // -// $Id: TurnGameObject.java,v 1.4 2002/10/15 23:07:23 shaper Exp $ +// $Id: TurnGameObject.java,v 1.5 2004/02/25 14:44:54 mdb Exp $ package com.threerings.parlor.turn; -import com.threerings.parlor.game.GameObject; - /** * Games that wish to support turn-based play must implement this * interface with their {@link GameObject}. diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java index 53f77c9cf..32589ab2c 100644 --- a/src/java/com/threerings/presents/client/Client.java +++ b/src/java/com/threerings/presents/client/Client.java @@ -1,15 +1,11 @@ // -// $Id: Client.java,v 1.47 2003/12/19 18:30:23 mdb Exp $ +// $Id: Client.java,v 1.48 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.client; -import java.util.ArrayList; -import java.util.List; - import com.samskivert.util.Interval; import com.samskivert.util.IntervalManager; import com.samskivert.util.ObserverList; -import com.samskivert.util.ResultListener; import com.samskivert.util.RunAnywhere; import com.threerings.presents.Log; diff --git a/src/java/com/threerings/presents/client/Communicator.java b/src/java/com/threerings/presents/client/Communicator.java index f6ea87976..bbefed15f 100644 --- a/src/java/com/threerings/presents/client/Communicator.java +++ b/src/java/com/threerings/presents/client/Communicator.java @@ -1,5 +1,5 @@ // -// $Id: Communicator.java,v 1.33 2003/08/08 20:20:39 mdb Exp $ +// $Id: Communicator.java,v 1.34 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.client; @@ -28,11 +28,7 @@ import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; import com.threerings.presents.net.AuthResponseData; import com.threerings.presents.net.DownstreamMessage; -import com.threerings.presents.net.ForwardEventRequest; import com.threerings.presents.net.LogoffRequest; -import com.threerings.presents.net.PingRequest; -import com.threerings.presents.net.SubscribeRequest; -import com.threerings.presents.net.UnsubscribeRequest; import com.threerings.presents.net.UpstreamMessage; /** diff --git a/src/java/com/threerings/presents/client/DeltaCalculator.java b/src/java/com/threerings/presents/client/DeltaCalculator.java index c271445b6..7ce23f817 100644 --- a/src/java/com/threerings/presents/client/DeltaCalculator.java +++ b/src/java/com/threerings/presents/client/DeltaCalculator.java @@ -1,10 +1,9 @@ // -// $Id: DeltaCalculator.java,v 1.4 2003/09/25 15:57:38 mdb Exp $ +// $Id: DeltaCalculator.java,v 1.5 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.client; import java.util.Arrays; -import com.samskivert.util.StringUtil; import com.threerings.presents.Log; import com.threerings.presents.net.PingRequest; diff --git a/src/java/com/threerings/presents/client/InvocationDirector.java b/src/java/com/threerings/presents/client/InvocationDirector.java index 52388977c..f7614a35c 100644 --- a/src/java/com/threerings/presents/client/InvocationDirector.java +++ b/src/java/com/threerings/presents/client/InvocationDirector.java @@ -1,5 +1,5 @@ // -// $Id: InvocationDirector.java,v 1.32 2003/07/29 18:48:11 mdb Exp $ +// $Id: InvocationDirector.java,v 1.33 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.client; @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Iterator; import com.samskivert.util.HashIntMap; -import com.samskivert.util.ResultListener; import com.samskivert.util.StringUtil; import com.threerings.presents.Log; @@ -15,7 +14,6 @@ import com.threerings.presents.client.InvocationReceiver.Registration; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller.ListenerMarshaller; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/presents/client/util/SafeInterval.java b/src/java/com/threerings/presents/client/util/SafeInterval.java index 97f9e368c..ba7ccfe1b 100644 --- a/src/java/com/threerings/presents/client/util/SafeInterval.java +++ b/src/java/com/threerings/presents/client/util/SafeInterval.java @@ -1,10 +1,9 @@ // -// $Id: SafeInterval.java,v 1.2 2003/11/12 23:37:47 mdb Exp $ +// $Id: SafeInterval.java,v 1.3 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.client.util; import com.samskivert.util.Interval; -import com.samskivert.util.IntervalManager; import com.threerings.presents.client.Client; diff --git a/src/java/com/threerings/presents/data/ClientObject.dobj b/src/java/com/threerings/presents/data/ClientObject.dobj index c4f0e4426..b0aa6d388 100644 --- a/src/java/com/threerings/presents/data/ClientObject.dobj +++ b/src/java/com/threerings/presents/data/ClientObject.dobj @@ -1,13 +1,11 @@ // -// $Id: ClientObject.dobj,v 1.3 2002/11/26 02:14:24 mdb Exp $ +// $Id: ClientObject.dobj,v 1.4 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.data; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DSet; -import com.threerings.presents.Log; - /** * Every client in the system has an associated client object to which * only they subscribe. The client object can be used to deliver messages diff --git a/src/java/com/threerings/presents/data/ClientObject.java b/src/java/com/threerings/presents/data/ClientObject.java index 99b2ce10c..595663c81 100644 --- a/src/java/com/threerings/presents/data/ClientObject.java +++ b/src/java/com/threerings/presents/data/ClientObject.java @@ -1,13 +1,11 @@ // -// $Id: ClientObject.java,v 1.7 2003/04/30 22:45:57 mdb Exp $ +// $Id: ClientObject.java,v 1.8 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.data; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DSet; -import com.threerings.presents.Log; - /** * Every client in the system has an associated client object to which * only they subscribe. The client object can be used to deliver messages diff --git a/src/java/com/threerings/presents/dobj/CompoundEvent.java b/src/java/com/threerings/presents/dobj/CompoundEvent.java index 1c0044e51..cabec805f 100644 --- a/src/java/com/threerings/presents/dobj/CompoundEvent.java +++ b/src/java/com/threerings/presents/dobj/CompoundEvent.java @@ -1,9 +1,8 @@ // -// $Id: CompoundEvent.java,v 1.9 2003/04/10 17:48:42 mdb Exp $ +// $Id: CompoundEvent.java,v 1.10 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.dobj; -import java.util.ArrayList; import java.util.List; import com.threerings.util.StreamableArrayList; diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index 2c477ed15..2878cc181 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -1,12 +1,11 @@ // -// $Id: DObject.java,v 1.71 2003/12/11 18:36:32 mdb Exp $ +// $Id: DObject.java,v 1.72 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.dobj; import java.lang.reflect.Array; import java.lang.reflect.Field; -import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; diff --git a/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java b/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java index 18b382db2..8742331b8 100644 --- a/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java +++ b/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java @@ -1,5 +1,5 @@ // -// $Id: ElementUpdatedEvent.java,v 1.7 2003/05/01 02:05:51 ray Exp $ +// $Id: ElementUpdatedEvent.java,v 1.8 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.dobj; @@ -8,8 +8,6 @@ import java.lang.reflect.Field; import com.samskivert.util.StringUtil; -import com.threerings.presents.Log; - /** * An element updated event is dispatched when an element of an array * field in a distributed object is updated. It can also be constructed to diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index 528cda223..e2f02dd8f 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/src/java/com/threerings/presents/server/InvocationManager.java @@ -1,5 +1,5 @@ // -// $Id: InvocationManager.java,v 1.19 2003/12/09 20:41:23 mdb Exp $ +// $Id: InvocationManager.java,v 1.20 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.server; @@ -9,24 +9,20 @@ import com.samskivert.util.HashIntMap; import com.samskivert.util.LRUHashMap; import com.samskivert.util.StringUtil; -import com.threerings.io.Streamable; import com.threerings.util.StreamableArrayList; import com.threerings.presents.Log; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller.ListenerMarshaller; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.data.InvocationObject; import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.EventListener; import com.threerings.presents.dobj.InvocationRequestEvent; -import com.threerings.presents.dobj.MessageEvent; import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.RootDObjectManager; import com.threerings.presents.dobj.Subscriber; -import com.threerings.presents.dobj.Subscriber; /** * The invocation services provide client to server invocations (service diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java index 10cf0b54b..edd9f7661 100644 --- a/src/java/com/threerings/presents/server/PresentsServer.java +++ b/src/java/com/threerings/presents/server/PresentsServer.java @@ -1,5 +1,5 @@ // -// $Id: PresentsServer.java,v 1.38 2003/08/13 22:46:13 mdb Exp $ +// $Id: PresentsServer.java,v 1.39 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.server; @@ -14,7 +14,6 @@ import com.threerings.util.signal.SignalManager; import com.threerings.presents.Log; import com.threerings.presents.client.Client; -import com.threerings.presents.dobj.DObjectManager; import com.threerings.presents.server.net.ConnectionManager; import com.threerings.presents.server.util.SafeInterval; import com.threerings.presents.util.Invoker; diff --git a/src/java/com/threerings/presents/server/net/Connection.java b/src/java/com/threerings/presents/server/net/Connection.java index 687710e4f..c431f4507 100644 --- a/src/java/com/threerings/presents/server/net/Connection.java +++ b/src/java/com/threerings/presents/server/net/Connection.java @@ -1,16 +1,12 @@ // -// $Id: Connection.java,v 1.17 2004/02/21 00:51:02 mdb Exp $ +// $Id: Connection.java,v 1.18 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.server.net; import java.io.EOFException; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.net.InetAddress; -import java.net.Socket; -import java.net.SocketTimeoutException; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 3908837c7..8c9f7c6a5 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -1,5 +1,5 @@ // -// $Id: ConnectionManager.java,v 1.37 2003/10/26 05:18:13 mdb Exp $ +// $Id: ConnectionManager.java,v 1.38 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.server.net; @@ -13,7 +13,6 @@ import java.nio.channels.SocketChannel; import java.nio.channels.spi.SelectorProvider; import java.net.InetSocketAddress; -import java.net.SocketException; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +25,6 @@ import com.threerings.io.FramingOutputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.presents.Log; -import com.threerings.presents.client.Client; import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; diff --git a/src/java/com/threerings/presents/server/net/RunningConnection.java b/src/java/com/threerings/presents/server/net/RunningConnection.java index d56eca297..906d9b01c 100644 --- a/src/java/com/threerings/presents/server/net/RunningConnection.java +++ b/src/java/com/threerings/presents/server/net/RunningConnection.java @@ -1,5 +1,5 @@ // -// $Id: RunningConnection.java,v 1.11 2002/12/22 19:13:38 mdb Exp $ +// $Id: RunningConnection.java,v 1.12 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.server.net; @@ -7,8 +7,6 @@ import java.io.IOException; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import com.samskivert.util.StringUtil; - import com.threerings.presents.net.UpstreamMessage; /** diff --git a/src/java/com/threerings/presents/server/util/SafeInterval.java b/src/java/com/threerings/presents/server/util/SafeInterval.java index bc388297a..8656f0aad 100644 --- a/src/java/com/threerings/presents/server/util/SafeInterval.java +++ b/src/java/com/threerings/presents/server/util/SafeInterval.java @@ -1,10 +1,9 @@ // -// $Id: SafeInterval.java,v 1.2 2002/05/24 21:38:24 mdb Exp $ +// $Id: SafeInterval.java,v 1.3 2004/02/25 14:45:16 mdb Exp $ package com.threerings.presents.server.util; import com.samskivert.util.Interval; -import com.samskivert.util.IntervalManager; import com.threerings.presents.server.PresentsDObjectMgr; diff --git a/src/java/com/threerings/puzzle/client/PlayerStatusView.java b/src/java/com/threerings/puzzle/client/PlayerStatusView.java index fbb6252ee..3355015f7 100644 --- a/src/java/com/threerings/puzzle/client/PlayerStatusView.java +++ b/src/java/com/threerings/puzzle/client/PlayerStatusView.java @@ -1,5 +1,5 @@ // -// $Id: PlayerStatusView.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: PlayerStatusView.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.client; @@ -7,7 +7,6 @@ import javax.swing.JPanel; import com.threerings.parlor.game.GameObject; -import com.threerings.puzzle.Log; import com.threerings.puzzle.data.BoardSummary; import com.threerings.puzzle.data.PuzzleConfig; import com.threerings.puzzle.data.PuzzleObject; diff --git a/src/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java b/src/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java index c605fb5f4..5ff5d81db 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java +++ b/src/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java @@ -1,11 +1,10 @@ // -// $Id: PuzzleAnimationWaiter.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: PuzzleAnimationWaiter.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.client; import com.threerings.media.animation.AnimationWaiter; -import com.threerings.puzzle.Log; import com.threerings.puzzle.data.PuzzleObject; /** diff --git a/src/java/com/threerings/puzzle/client/PuzzleBoardView.java b/src/java/com/threerings/puzzle/client/PuzzleBoardView.java index 95ba165b8..3a544547b 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleBoardView.java +++ b/src/java/com/threerings/puzzle/client/PuzzleBoardView.java @@ -1,5 +1,5 @@ // -// $Id: PuzzleBoardView.java,v 1.6 2003/12/10 03:32:07 mdb Exp $ +// $Id: PuzzleBoardView.java,v 1.7 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.client; @@ -7,9 +7,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics2D; -import java.awt.Graphics; import java.awt.Rectangle; -import java.awt.Shape; import java.awt.geom.AffineTransform; import java.util.ArrayList; @@ -24,7 +22,6 @@ import com.threerings.media.animation.Animation; import com.threerings.media.animation.AnimationAdapter; import com.threerings.media.image.Mirage; import com.threerings.media.sprite.Sprite; -import com.threerings.media.sprite.SpriteManager; import com.threerings.puzzle.Log; import com.threerings.puzzle.data.Board; diff --git a/src/java/com/threerings/puzzle/client/PuzzleController.java b/src/java/com/threerings/puzzle/client/PuzzleController.java index 673a6dd85..d451f10c2 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleController.java +++ b/src/java/com/threerings/puzzle/client/PuzzleController.java @@ -1,5 +1,5 @@ // -// $Id: PuzzleController.java,v 1.3 2003/12/05 02:39:12 mdb Exp $ +// $Id: PuzzleController.java,v 1.4 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.client; @@ -12,42 +12,25 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import javax.swing.JButton; - -import com.samskivert.swing.GroupLayout; -import com.samskivert.swing.event.CommandEvent; import com.samskivert.util.CollectionUtil; import com.samskivert.util.ObserverList; -import com.samskivert.util.StringUtil; - -import com.threerings.io.Streamable; -import com.threerings.util.MessageBundle; -import com.threerings.util.StreamableArrayList; import com.threerings.media.FrameParticipant; import com.threerings.media.sound.SoundCodes; -import com.threerings.presents.client.InvocationReceiver; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.ElementUpdateListener; import com.threerings.presents.dobj.ElementUpdatedEvent; -import com.threerings.crowd.client.OccupantDirector; import com.threerings.crowd.client.PlaceControllerDelegate; -import com.threerings.crowd.data.BodyObject; -import com.threerings.crowd.data.OccupantInfo; import com.threerings.crowd.data.PlaceObject; import com.threerings.parlor.game.GameController; -import com.threerings.parlor.game.GameObject; import com.threerings.puzzle.Log; import com.threerings.puzzle.data.Board; -import com.threerings.puzzle.data.BoardSummary; import com.threerings.puzzle.data.PuzzleCodes; import com.threerings.puzzle.data.PuzzleConfig; import com.threerings.puzzle.data.PuzzleObject; @@ -547,7 +530,7 @@ public abstract class PuzzleController extends GameController canClear[0] = (_pview.getActionCount() == 0); if (!canClear[0]) { _pview.dumpActors(); - _pview.DEBUG_ACTION = true; + PuzzleBoardView.DEBUG_ACTION = true; } // let our delegates do their business @@ -587,7 +570,7 @@ public abstract class PuzzleController extends GameController // make a note that we've cleared the action _astate = ACTION_CLEARED; - _pview.DEBUG_ACTION = false; + PuzzleBoardView.DEBUG_ACTION = false; // let our delegates do their business applyToDelegates(PuzzleControllerDelegate.class, new DelegateOp() { diff --git a/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java b/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java index 8e1de6dfb..d1af09c81 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java +++ b/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: PuzzleControllerDelegate.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: PuzzleControllerDelegate.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.client; @@ -8,7 +8,6 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.parlor.game.GameControllerDelegate; import com.threerings.puzzle.data.Board; -import com.threerings.puzzle.data.BoardSummary; import com.threerings.puzzle.data.PuzzleCodes; import com.threerings.puzzle.data.PuzzleGameCodes; import com.threerings.puzzle.data.PuzzleObject; diff --git a/src/java/com/threerings/puzzle/client/PuzzlePanel.java b/src/java/com/threerings/puzzle/client/PuzzlePanel.java index e10dbddb2..0523dc648 100644 --- a/src/java/com/threerings/puzzle/client/PuzzlePanel.java +++ b/src/java/com/threerings/puzzle/client/PuzzlePanel.java @@ -1,18 +1,15 @@ // -// $Id: PuzzlePanel.java,v 1.2 2003/11/26 17:46:06 mdb Exp $ +// $Id: PuzzlePanel.java,v 1.3 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.client; import java.awt.BorderLayout; -import java.awt.Graphics; -import java.io.IOException; import javax.swing.JPanel; import com.samskivert.swing.Controller; import com.samskivert.swing.ControllerProvider; import com.samskivert.swing.util.SwingUtil; -import com.threerings.media.image.Mirage; import com.threerings.util.KeyTranslator; import com.threerings.util.RobotPlayer; @@ -20,11 +17,9 @@ import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.data.PlaceObject; import com.threerings.puzzle.Log; -import com.threerings.puzzle.data.BoardSummary; import com.threerings.puzzle.data.PuzzleCodes; import com.threerings.puzzle.data.PuzzleConfig; import com.threerings.puzzle.data.PuzzleGameCodes; -import com.threerings.puzzle.data.PuzzleObject; import com.threerings.puzzle.util.PuzzleContext; /** diff --git a/src/java/com/threerings/puzzle/client/ScoreAnimation.java b/src/java/com/threerings/puzzle/client/ScoreAnimation.java index b209a3c83..425694352 100644 --- a/src/java/com/threerings/puzzle/client/ScoreAnimation.java +++ b/src/java/com/threerings/puzzle/client/ScoreAnimation.java @@ -1,12 +1,10 @@ // -// $Id: ScoreAnimation.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: ScoreAnimation.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.client; import java.awt.AlphaComposite; -import java.awt.Color; import java.awt.Composite; -import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Rectangle; @@ -14,8 +12,6 @@ import com.samskivert.swing.Label; import com.threerings.media.animation.Animation; -import com.threerings.puzzle.Log; - public class ScoreAnimation extends Animation { /** diff --git a/src/java/com/threerings/puzzle/data/PuzzlerObject.java b/src/java/com/threerings/puzzle/data/PuzzlerObject.java index 52e09c979..5c6811f6d 100644 --- a/src/java/com/threerings/puzzle/data/PuzzlerObject.java +++ b/src/java/com/threerings/puzzle/data/PuzzlerObject.java @@ -1,10 +1,8 @@ // -// $Id: PuzzlerObject.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: PuzzlerObject.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.data; -import com.threerings.crowd.data.BodyObject; - /** * An interface that must be implemented by {@link BodyObject} derivations * that wish to be usable with the puzzle services. diff --git a/src/java/com/threerings/puzzle/drop/client/DropBlockSprite.java b/src/java/com/threerings/puzzle/drop/client/DropBlockSprite.java index ca92a9bc1..19d4a7e58 100644 --- a/src/java/com/threerings/puzzle/drop/client/DropBlockSprite.java +++ b/src/java/com/threerings/puzzle/drop/client/DropBlockSprite.java @@ -1,12 +1,10 @@ // -// $Id: DropBlockSprite.java,v 1.2 2003/12/31 01:26:23 ray Exp $ +// $Id: DropBlockSprite.java,v 1.3 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.client; import java.awt.Rectangle; -import com.threerings.puzzle.Log; - /** * The drop block sprite represents a block of multiple pieces that can be * rotated to any of the four cardinal compass directions. As such, it diff --git a/src/java/com/threerings/puzzle/drop/client/DropBoardView.java b/src/java/com/threerings/puzzle/drop/client/DropBoardView.java index b7de42ec8..b33fdfcf4 100644 --- a/src/java/com/threerings/puzzle/drop/client/DropBoardView.java +++ b/src/java/com/threerings/puzzle/drop/client/DropBoardView.java @@ -1,5 +1,5 @@ // -// $Id: DropBoardView.java,v 1.2 2003/11/26 02:07:45 mdb Exp $ +// $Id: DropBoardView.java,v 1.3 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.client; @@ -8,16 +8,12 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; -import java.awt.Shape; import java.util.Iterator; -import com.samskivert.swing.Label; - import com.threerings.media.image.Mirage; import com.threerings.media.sprite.Sprite; -import com.threerings.puzzle.Log; import com.threerings.puzzle.client.PuzzleBoardView; import com.threerings.puzzle.client.ScoreAnimation; import com.threerings.puzzle.data.Board; diff --git a/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java b/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java index 5faef641e..69a6006f7 100644 --- a/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java +++ b/src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: DropControllerDelegate.java,v 1.2 2003/12/31 01:26:23 ray Exp $ +// $Id: DropControllerDelegate.java,v 1.3 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.client; @@ -11,13 +11,10 @@ import java.awt.event.ActionEvent; import java.util.List; import com.samskivert.util.IntListUtil; -import com.samskivert.util.StringUtil; -import com.threerings.util.DirectionUtil; import com.threerings.media.FrameParticipant; import com.threerings.media.animation.Animation; import com.threerings.media.animation.AnimationAdapter; -import com.threerings.media.sprite.Sprite; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.util.CrowdContext; @@ -36,7 +33,6 @@ import com.threerings.puzzle.drop.data.DropCodes; import com.threerings.puzzle.drop.data.DropConfig; import com.threerings.puzzle.drop.data.DropLogic; import com.threerings.puzzle.drop.data.DropPieceCodes; -import com.threerings.puzzle.drop.util.DropBoardUtil; import com.threerings.puzzle.drop.util.DropPieceProvider; import com.threerings.puzzle.drop.util.PieceDropLogic; import com.threerings.puzzle.drop.util.PieceDropper.PieceDropInfo; diff --git a/src/java/com/threerings/puzzle/drop/client/DropSprite.java b/src/java/com/threerings/puzzle/drop/client/DropSprite.java index 5a272eab6..59e87a77f 100644 --- a/src/java/com/threerings/puzzle/drop/client/DropSprite.java +++ b/src/java/com/threerings/puzzle/drop/client/DropSprite.java @@ -1,5 +1,5 @@ // -// $Id: DropSprite.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: DropSprite.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.client; @@ -13,9 +13,6 @@ import com.threerings.util.DirectionUtil; import com.threerings.media.image.Mirage; import com.threerings.media.sprite.Sprite; -import com.threerings.media.tile.TileManager; - -import com.threerings.puzzle.Log; /** * The drop sprite is a sprite that displays one or more pieces falling diff --git a/src/java/com/threerings/puzzle/drop/client/NextBlockView.java b/src/java/com/threerings/puzzle/drop/client/NextBlockView.java index 1beca3418..b12cca61d 100644 --- a/src/java/com/threerings/puzzle/drop/client/NextBlockView.java +++ b/src/java/com/threerings/puzzle/drop/client/NextBlockView.java @@ -1,16 +1,13 @@ // -// $Id: NextBlockView.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: NextBlockView.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.client; -import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Rectangle; import javax.swing.JComponent; -import javax.swing.border.Border; import com.threerings.media.image.Mirage; import com.threerings.util.DirectionCodes; diff --git a/src/java/com/threerings/puzzle/drop/data/DropBoard.java b/src/java/com/threerings/puzzle/drop/data/DropBoard.java index c33ebf3ff..4b8d3cc64 100644 --- a/src/java/com/threerings/puzzle/drop/data/DropBoard.java +++ b/src/java/com/threerings/puzzle/drop/data/DropBoard.java @@ -1,21 +1,17 @@ // -// $Id: DropBoard.java,v 1.3 2003/12/31 01:26:23 ray Exp $ +// $Id: DropBoard.java,v 1.4 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.data; import java.awt.Point; import java.awt.Rectangle; -import java.util.Arrays; - import org.apache.commons.lang.Strings; -import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; import com.threerings.puzzle.Log; import com.threerings.puzzle.data.Board; -import com.threerings.puzzle.drop.client.DropControllerDelegate; import com.threerings.puzzle.drop.data.DropPieceCodes; import com.threerings.puzzle.drop.util.DropBoardUtil; diff --git a/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java b/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java index 8e4fd0073..a57b9d456 100644 --- a/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java +++ b/src/java/com/threerings/puzzle/drop/data/SegmentInfo.java @@ -1,12 +1,10 @@ // -// $Id: SegmentInfo.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: SegmentInfo.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.data; import com.samskivert.util.StringUtil; -import com.threerings.util.DirectionCodes; - /** * Describes a segment of pieces in a {@link DropBoard}. */ diff --git a/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java b/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java index eb8b927a6..5e09dcc8c 100644 --- a/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java +++ b/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java @@ -1,31 +1,21 @@ // -// $Id: DropManagerDelegate.java,v 1.2 2003/11/26 03:17:16 mdb Exp $ +// $Id: DropManagerDelegate.java,v 1.3 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.server; -import java.util.List; - -import com.threerings.util.MessageBundle; - import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; -import com.threerings.parlor.game.GameManager; - import com.threerings.puzzle.Log; import com.threerings.puzzle.data.Board; -import com.threerings.puzzle.data.BoardSummary; import com.threerings.puzzle.data.PuzzleCodes; -import com.threerings.puzzle.data.PuzzleObject; import com.threerings.puzzle.server.PuzzleManager; import com.threerings.puzzle.server.PuzzleManagerDelegate; import com.threerings.puzzle.drop.data.DropBoard; -import com.threerings.puzzle.drop.data.DropBoardSummary; import com.threerings.puzzle.drop.data.DropCodes; import com.threerings.puzzle.drop.data.DropConfig; import com.threerings.puzzle.drop.data.DropLogic; -import com.threerings.puzzle.drop.util.DropPieceProvider; import com.threerings.puzzle.drop.util.PieceDropLogic; import com.threerings.puzzle.drop.util.PieceDropper; diff --git a/src/java/com/threerings/puzzle/drop/util/DropBoardUtil.java b/src/java/com/threerings/puzzle/drop/util/DropBoardUtil.java index 7d652cf1a..78d8eaae2 100644 --- a/src/java/com/threerings/puzzle/drop/util/DropBoardUtil.java +++ b/src/java/com/threerings/puzzle/drop/util/DropBoardUtil.java @@ -1,12 +1,10 @@ // -// $Id: DropBoardUtil.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: DropBoardUtil.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.util; import com.threerings.util.DirectionCodes; -import com.threerings.puzzle.drop.data.DropBoard; - public class DropBoardUtil implements DirectionCodes { diff --git a/src/java/com/threerings/puzzle/drop/util/PieceDropLogic.java b/src/java/com/threerings/puzzle/drop/util/PieceDropLogic.java index 7861e3727..0b1e19a72 100644 --- a/src/java/com/threerings/puzzle/drop/util/PieceDropLogic.java +++ b/src/java/com/threerings/puzzle/drop/util/PieceDropLogic.java @@ -1,9 +1,8 @@ // -// $Id: PieceDropLogic.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: PieceDropLogic.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.drop.util; -import com.threerings.util.DirectionCodes; import com.threerings.puzzle.drop.data.DropBoard; /** diff --git a/src/java/com/threerings/puzzle/server/PuzzleManager.java b/src/java/com/threerings/puzzle/server/PuzzleManager.java index 13e8e589c..a57d85f3e 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleManager.java +++ b/src/java/com/threerings/puzzle/server/PuzzleManager.java @@ -1,38 +1,28 @@ // -// $Id: PuzzleManager.java,v 1.6 2004/01/30 23:03:22 ray Exp $ +// $Id: PuzzleManager.java,v 1.7 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.server; import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; import com.samskivert.util.IntListUtil; -import com.samskivert.util.IntTuple; import com.samskivert.util.IntervalManager; -import com.samskivert.util.ResultListener; import com.samskivert.util.StringUtil; -import com.samskivert.util.Tuple; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.DObject; -import com.threerings.presents.dobj.DSet; import com.threerings.presents.dobj.OidList; import com.threerings.presents.server.util.SafeInterval; import com.threerings.crowd.data.BodyObject; -import com.threerings.crowd.data.OccupantInfo; import com.threerings.crowd.server.CrowdServer; import com.threerings.crowd.server.PlaceManagerDelegate; import com.threerings.parlor.game.GameManager; -import com.threerings.parlor.game.GameObject; -import com.threerings.parlor.game.PartyGameConfig; import com.threerings.util.MessageBundle; import com.threerings.util.RandomUtil; -import com.threerings.util.StreamableArrayList; import com.threerings.puzzle.Log; import com.threerings.puzzle.data.Board; diff --git a/src/java/com/threerings/puzzle/server/PuzzleProvider.java b/src/java/com/threerings/puzzle/server/PuzzleProvider.java index 0bf38fd49..b6fd33550 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleProvider.java +++ b/src/java/com/threerings/puzzle/server/PuzzleProvider.java @@ -1,10 +1,8 @@ // -// $Id: PuzzleProvider.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: PuzzleProvider.java,v 1.2 2004/02/25 14:48:44 mdb Exp $ package com.threerings.puzzle.server; -import com.samskivert.util.StringUtil; - import com.threerings.presents.client.InvocationService.InvocationListener; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.RootDObjectManager; @@ -12,7 +10,6 @@ import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; import com.threerings.crowd.data.BodyObject; -import com.threerings.crowd.data.OccupantInfo; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.PlaceManager; @@ -22,8 +19,6 @@ import com.threerings.parlor.game.GameManager; import com.threerings.puzzle.Log; import com.threerings.puzzle.client.PuzzleService.EnterPuzzleListener; -import com.threerings.puzzle.data.Board; -import com.threerings.puzzle.data.BoardSummary; import com.threerings.puzzle.data.PuzzleCodes; import com.threerings.puzzle.data.PuzzleObject; import com.threerings.puzzle.data.PuzzlerObject; diff --git a/src/java/com/threerings/whirled/Log.java b/src/java/com/threerings/whirled/Log.java index f696727dd..ade4c17c0 100644 --- a/src/java/com/threerings/whirled/Log.java +++ b/src/java/com/threerings/whirled/Log.java @@ -1,5 +1,5 @@ // -// $Id: Log.java,v 1.2 2003/09/22 23:57:20 mdb Exp $ +// $Id: Log.java,v 1.3 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled; @@ -15,7 +15,8 @@ public class Log /** Convenience function. */ public static boolean debug () { - return log.getLevel() == com.samskivert.util.Log.DEBUG; + return (com.samskivert.util.Log.getLevel() == + com.samskivert.util.Log.DEBUG); } /** Convenience function. */ diff --git a/src/java/com/threerings/whirled/client/SceneDirector.java b/src/java/com/threerings/whirled/client/SceneDirector.java index 18cdd0d3a..0798bb472 100644 --- a/src/java/com/threerings/whirled/client/SceneDirector.java +++ b/src/java/com/threerings/whirled/client/SceneDirector.java @@ -1,5 +1,5 @@ // -// $Id: SceneDirector.java,v 1.25 2003/10/03 20:41:31 mdb Exp $ +// $Id: SceneDirector.java,v 1.26 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.client; @@ -9,13 +9,9 @@ import com.samskivert.util.ResultListener; import com.threerings.presents.client.BasicDirector; import com.threerings.presents.client.Client; -import com.threerings.presents.dobj.DObject; -import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.crowd.client.LocationDirector; -import com.threerings.crowd.client.LocationObserver; import com.threerings.crowd.data.PlaceConfig; -import com.threerings.crowd.data.PlaceObject; import com.threerings.whirled.Log; import com.threerings.whirled.client.persist.SceneRepository; diff --git a/src/java/com/threerings/whirled/data/SceneCodes.java b/src/java/com/threerings/whirled/data/SceneCodes.java index 0d688a6e0..068270687 100644 --- a/src/java/com/threerings/whirled/data/SceneCodes.java +++ b/src/java/com/threerings/whirled/data/SceneCodes.java @@ -1,10 +1,9 @@ // -// $Id: SceneCodes.java,v 1.4 2003/06/11 04:14:11 mdb Exp $ +// $Id: SceneCodes.java,v 1.5 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.data; import com.threerings.crowd.data.LocationCodes; -import com.threerings.whirled.client.SceneDirector; /** * Contains codes used by the scene invocation services. diff --git a/src/java/com/threerings/whirled/server/SceneManager.java b/src/java/com/threerings/whirled/server/SceneManager.java index 2af5c6f73..d68f85920 100644 --- a/src/java/com/threerings/whirled/server/SceneManager.java +++ b/src/java/com/threerings/whirled/server/SceneManager.java @@ -1,5 +1,5 @@ // -// $Id: SceneManager.java,v 1.14 2003/06/11 04:14:11 mdb Exp $ +// $Id: SceneManager.java,v 1.15 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.server; @@ -11,7 +11,6 @@ import com.threerings.presents.util.Invoker; import com.threerings.whirled.Log; import com.threerings.whirled.data.Scene; import com.threerings.whirled.data.SceneCodes; -import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.server.WhirledServer; import com.threerings.whirled.util.UpdateList; diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java index b75524fd0..c017ff0df 100644 --- a/src/java/com/threerings/whirled/server/SceneProvider.java +++ b/src/java/com/threerings/whirled/server/SceneProvider.java @@ -1,5 +1,5 @@ // -// $Id: SceneProvider.java,v 1.18 2003/10/25 00:10:35 mdb Exp $ +// $Id: SceneProvider.java,v 1.19 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.server; @@ -9,7 +9,6 @@ import com.threerings.presents.server.InvocationProvider; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.PlaceConfig; -import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.LocationProvider; import com.threerings.whirled.Log; diff --git a/src/java/com/threerings/whirled/server/SceneRegistry.java b/src/java/com/threerings/whirled/server/SceneRegistry.java index 598fd3b08..73d37d855 100644 --- a/src/java/com/threerings/whirled/server/SceneRegistry.java +++ b/src/java/com/threerings/whirled/server/SceneRegistry.java @@ -1,10 +1,9 @@ // -// $Id: SceneRegistry.java,v 1.21 2003/11/24 21:06:36 mdb Exp $ +// $Id: SceneRegistry.java,v 1.22 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.server; import java.util.ArrayList; -import java.util.Properties; import com.samskivert.util.HashIntMap; import com.threerings.presents.util.Invoker; @@ -13,12 +12,10 @@ import com.threerings.presents.server.InvocationManager; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.server.CrowdServer; -import com.threerings.crowd.server.PlaceManager; import com.threerings.whirled.Log; import com.threerings.whirled.data.Scene; import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneObject; import com.threerings.whirled.server.persist.SceneRepository; import com.threerings.whirled.util.SceneFactory; import com.threerings.whirled.util.UpdateList; diff --git a/src/java/com/threerings/whirled/server/WhirledServer.java b/src/java/com/threerings/whirled/server/WhirledServer.java index dae03a074..43e2586b9 100644 --- a/src/java/com/threerings/whirled/server/WhirledServer.java +++ b/src/java/com/threerings/whirled/server/WhirledServer.java @@ -1,12 +1,11 @@ // -// $Id: WhirledServer.java,v 1.16 2003/02/12 07:23:31 mdb Exp $ +// $Id: WhirledServer.java,v 1.17 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.server; import com.threerings.crowd.server.CrowdServer; import com.threerings.whirled.Log; -import com.threerings.whirled.server.persist.DummySceneRepository; import com.threerings.whirled.server.persist.SceneRepository; import com.threerings.whirled.util.SceneFactory; diff --git a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java index 2aa669a92..00d86231f 100644 --- a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java +++ b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java @@ -1,9 +1,8 @@ // -// $Id: SpotSceneDirector.java,v 1.32 2003/09/16 21:26:14 ray Exp $ +// $Id: SpotSceneDirector.java,v 1.33 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.client; -import java.util.Iterator; import com.samskivert.util.ResultListener; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/whirled/spot/data/Cluster.java b/src/java/com/threerings/whirled/spot/data/Cluster.java index eb50d2de8..a2ba7bdaf 100644 --- a/src/java/com/threerings/whirled/spot/data/Cluster.java +++ b/src/java/com/threerings/whirled/spot/data/Cluster.java @@ -1,5 +1,5 @@ // -// $Id: Cluster.java,v 1.6 2003/03/27 15:57:47 mdb Exp $ +// $Id: Cluster.java,v 1.7 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.data; @@ -7,7 +7,6 @@ import java.awt.Rectangle; import com.samskivert.util.StringUtil; -import com.threerings.io.SimpleStreamableObject; import com.threerings.io.Streamable; import com.threerings.presents.dobj.DSet; diff --git a/src/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java b/src/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java index 34a74c340..ed32e37a8 100644 --- a/src/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java +++ b/src/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java @@ -1,9 +1,8 @@ // -// $Id: ClusteredBodyObject.java,v 1.2 2003/05/06 00:21:59 mdb Exp $ +// $Id: ClusteredBodyObject.java,v 1.3 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.data; -import com.threerings.crowd.data.BodyObject; import com.threerings.whirled.data.ScenedBodyObject; /** diff --git a/src/java/com/threerings/whirled/spot/data/Location.java b/src/java/com/threerings/whirled/spot/data/Location.java index b81d5be8b..ccd74e27f 100644 --- a/src/java/com/threerings/whirled/spot/data/Location.java +++ b/src/java/com/threerings/whirled/spot/data/Location.java @@ -1,10 +1,9 @@ // -// $Id: Location.java,v 1.7 2003/03/25 19:28:58 mdb Exp $ +// $Id: Location.java,v 1.8 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.data; import com.threerings.io.SimpleStreamableObject; -import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; /** diff --git a/src/java/com/threerings/whirled/spot/data/SpotCodes.java b/src/java/com/threerings/whirled/spot/data/SpotCodes.java index 3738ae926..f34147009 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotCodes.java +++ b/src/java/com/threerings/whirled/spot/data/SpotCodes.java @@ -1,12 +1,11 @@ // -// $Id: SpotCodes.java,v 1.7 2003/06/03 21:41:33 ray Exp $ +// $Id: SpotCodes.java,v 1.8 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.data; import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.whirled.data.SceneCodes; -import com.threerings.whirled.spot.client.SpotSceneDirector; /** * Contains codes used by the Spot invocation services. diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneImpl.java b/src/java/com/threerings/whirled/spot/data/SpotSceneImpl.java index 47ea2d932..148c97c98 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotSceneImpl.java +++ b/src/java/com/threerings/whirled/spot/data/SpotSceneImpl.java @@ -1,12 +1,11 @@ // -// $Id: SpotSceneImpl.java,v 1.2 2003/06/11 04:14:11 mdb Exp $ +// $Id: SpotSceneImpl.java,v 1.3 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.data; import java.util.Iterator; import com.samskivert.util.HashIntMap; -import com.samskivert.util.ListUtil; import com.threerings.whirled.spot.Log; diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java b/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java index 1679b7d20..4c4be2bd2 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java +++ b/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java @@ -1,5 +1,5 @@ // -// $Id: SpotSceneModel.java,v 1.9 2003/02/12 07:23:31 mdb Exp $ +// $Id: SpotSceneModel.java,v 1.10 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.data; @@ -7,7 +7,6 @@ import com.samskivert.util.ArrayUtil; import com.samskivert.util.ListUtil; import com.threerings.io.SimpleStreamableObject; -import com.threerings.util.DirectionUtil; import com.threerings.whirled.data.AuxModel; import com.threerings.whirled.data.SceneModel; diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java index 44d54f8a8..a2192f3a7 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java +++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java @@ -1,5 +1,5 @@ // -// $Id: SpotProvider.java,v 1.22 2003/11/24 18:17:41 mdb Exp $ +// $Id: SpotProvider.java,v 1.23 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.server; @@ -8,17 +8,13 @@ import com.samskivert.util.StringUtil; import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.RootDObjectManager; import com.threerings.presents.server.InvocationException; -import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.InvocationProvider; import com.threerings.crowd.chat.server.CommunicationAuthorizer; import com.threerings.crowd.data.BodyObject; -import com.threerings.crowd.data.PlaceConfig; -import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.PlaceRegistry; import com.threerings.whirled.client.SceneService.SceneMoveListener; -import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.ScenedBodyObject; import com.threerings.whirled.server.SceneManager; import com.threerings.whirled.server.SceneRegistry; diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index 8ea2f4d0a..a82fa5046 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java @@ -1,15 +1,12 @@ // -// $Id: SpotSceneManager.java,v 1.49 2003/12/11 22:50:55 mdb Exp $ +// $Id: SpotSceneManager.java,v 1.50 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.server; -import java.awt.Point; import java.util.Iterator; -import com.samskivert.util.ArrayIntSet; import com.samskivert.util.HashIntMap; import com.samskivert.util.IntIntMap; -import com.samskivert.util.StringUtil; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.Subscriber; @@ -31,7 +28,6 @@ import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.SceneLocation; import com.threerings.whirled.spot.data.SpotCodes; import com.threerings.whirled.spot.data.SpotScene; -import com.threerings.whirled.spot.data.SpotSceneModel; import com.threerings.whirled.spot.data.SpotSceneObject; /** diff --git a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java index 0be472e33..411691d17 100644 --- a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java +++ b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java @@ -1,5 +1,5 @@ // -// $Id: SpotSceneWriter.java,v 1.7 2003/02/12 07:23:31 mdb Exp $ +// $Id: SpotSceneWriter.java,v 1.8 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.spot.tools.xml; @@ -9,7 +9,6 @@ import org.xml.sax.helpers.AttributesImpl; import com.megginson.sax.DataWriter; import com.threerings.tools.xml.NestableWriter; -import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.SpotSceneModel; import com.threerings.whirled.spot.tools.EditablePortal; diff --git a/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java b/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java index 6ee2ed930..4b7e30246 100644 --- a/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java +++ b/src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java @@ -1,11 +1,10 @@ // -// $Id: SceneRuleSet.java,v 1.3 2003/02/12 07:23:31 mdb Exp $ +// $Id: SceneRuleSet.java,v 1.4 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.tools.xml; import org.apache.commons.digester.Digester; -import com.samskivert.util.StringUtil; import com.samskivert.xml.SetPropertyFieldsRule; import com.threerings.tools.xml.NestableRuleSet; diff --git a/src/java/com/threerings/whirled/tools/xml/SceneWriter.java b/src/java/com/threerings/whirled/tools/xml/SceneWriter.java index ffbfb9109..9badba5d3 100644 --- a/src/java/com/threerings/whirled/tools/xml/SceneWriter.java +++ b/src/java/com/threerings/whirled/tools/xml/SceneWriter.java @@ -1,5 +1,5 @@ // -// $Id: SceneWriter.java,v 1.4 2003/02/12 07:23:32 mdb Exp $ +// $Id: SceneWriter.java,v 1.5 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.tools.xml; @@ -7,13 +7,11 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.HashMap; -import java.util.Iterator; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import com.megginson.sax.DataWriter; -import com.samskivert.util.StringUtil; import com.threerings.tools.xml.NestableWriter; import com.threerings.whirled.Log; diff --git a/src/java/com/threerings/whirled/zone/data/SceneSummary.java b/src/java/com/threerings/whirled/zone/data/SceneSummary.java index cac06e510..81f1cb5ca 100644 --- a/src/java/com/threerings/whirled/zone/data/SceneSummary.java +++ b/src/java/com/threerings/whirled/zone/data/SceneSummary.java @@ -1,14 +1,12 @@ // -// $Id: SceneSummary.java,v 1.6 2003/07/22 07:29:11 mdb Exp $ +// $Id: SceneSummary.java,v 1.7 2004/02/25 14:50:28 mdb Exp $ package com.threerings.whirled.zone.data; import com.samskivert.util.StringUtil; -import com.threerings.util.DirectionCodes; -import com.threerings.util.DirectionUtil; - import com.threerings.io.Streamable; +import com.threerings.util.DirectionUtil; /** * The scene summary class is used to provide info about the connected