From 1ce6951cb6815b7a63fed5ad99529b69360bae1a Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 8 Jan 2003 04:09:03 +0000 Subject: [PATCH] Repackaged a few things in media: sounds stuff went into media.sound and image stuff went into media.image. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2100 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/cast/ActionFrames.java | 4 ++-- .../com/threerings/cast/CharacterDescriptor.java | 4 ++-- src/java/com/threerings/cast/CharacterManager.java | 4 ++-- .../com/threerings/cast/CompositedActionFrames.java | 6 +++--- .../cast/bundle/BundledComponentRepository.java | 10 +++++----- src/java/com/threerings/media/image/ColorUtil.java | 4 ++-- .../com/threerings/media/image/Colorization.java | 4 ++-- .../com/threerings/media/image/ImageIOLoader.java | 4 ++-- src/java/com/threerings/media/image/ImageLoader.java | 4 ++-- .../com/threerings/media/image/ImageManager.java | 12 ++---------- src/java/com/threerings/media/image/ImageUtil.java | 4 ++-- .../com/threerings/media/image/ToolkitLoader.java | 4 ++-- src/java/com/threerings/media/sound/MidiPlayer.java | 4 ++-- src/java/com/threerings/media/sound/ModPlayer.java | 4 ++-- src/java/com/threerings/media/sound/Mp3Player.java | 5 +++-- src/java/com/threerings/media/sound/MusicPlayer.java | 4 ++-- .../com/threerings/media/sound/SoundManager.java | 4 ++-- src/java/com/threerings/media/sound/Sounds.java | 4 ++-- src/java/com/threerings/media/tile/ObjectTile.java | 6 +----- .../com/threerings/media/tile/ObjectTileSet.java | 4 ++-- src/java/com/threerings/media/tile/Tile.java | 4 ++-- src/java/com/threerings/media/tile/TileManager.java | 4 ++-- src/java/com/threerings/media/tile/TileSet.java | 6 +++--- src/java/com/threerings/media/tile/TrimmedTile.java | 4 ++-- .../com/threerings/media/tile/UniformTileSet.java | 4 ++-- .../media/tile/bundle/BundledTileSetRepository.java | 4 ++-- .../threerings/media/tile/bundle/TileSetBundle.java | 7 ++++--- .../media/tile/bundle/tools/DumpBundle.java | 4 ++-- .../threerings/media/tile/util/TileSetTrimmer.java | 4 ++-- .../com/threerings/media/tools/RecolorImage.java | 4 ++-- .../threerings/media/util/MultiFrameImageImpl.java | 4 ++-- .../threerings/media/util/SingleFrameImageImpl.java | 4 ++-- src/java/com/threerings/miso/tile/AutoFringer.java | 4 ++-- .../com/threerings/miso/tile/MisoTileManager.java | 4 ++-- 34 files changed, 75 insertions(+), 85 deletions(-) diff --git a/src/java/com/threerings/cast/ActionFrames.java b/src/java/com/threerings/cast/ActionFrames.java index 3b604c042..5402d1553 100644 --- a/src/java/com/threerings/cast/ActionFrames.java +++ b/src/java/com/threerings/cast/ActionFrames.java @@ -1,12 +1,12 @@ // -// $Id: ActionFrames.java,v 1.7 2002/12/07 02:04:31 shaper Exp $ +// $Id: ActionFrames.java,v 1.8 2003/01/08 04:09:02 mdb Exp $ package com.threerings.cast; import java.awt.Graphics; import java.awt.Image; -import com.threerings.media.util.Colorization; +import com.threerings.media.image.Colorization; import com.threerings.util.DirectionCodes; /** diff --git a/src/java/com/threerings/cast/CharacterDescriptor.java b/src/java/com/threerings/cast/CharacterDescriptor.java index acc2fdb7b..7188e1845 100644 --- a/src/java/com/threerings/cast/CharacterDescriptor.java +++ b/src/java/com/threerings/cast/CharacterDescriptor.java @@ -1,11 +1,11 @@ // -// $Id: CharacterDescriptor.java,v 1.9 2002/10/07 23:58:29 mdb Exp $ +// $Id: CharacterDescriptor.java,v 1.10 2003/01/08 04:09:02 mdb Exp $ package com.threerings.cast; import java.util.Arrays; import com.samskivert.util.StringUtil; -import com.threerings.media.util.Colorization; +import com.threerings.media.image.Colorization; /** * The character descriptor object details the components that are diff --git a/src/java/com/threerings/cast/CharacterManager.java b/src/java/com/threerings/cast/CharacterManager.java index 83e792406..a06eecc4d 100644 --- a/src/java/com/threerings/cast/CharacterManager.java +++ b/src/java/com/threerings/cast/CharacterManager.java @@ -1,5 +1,5 @@ // -// $Id: CharacterManager.java,v 1.28 2002/12/23 20:33:19 mdb Exp $ +// $Id: CharacterManager.java,v 1.29 2003/01/08 04:09:02 mdb Exp $ package com.threerings.cast; @@ -11,7 +11,7 @@ import com.samskivert.util.StringUtil; import com.samskivert.util.Throttle; import com.samskivert.util.Tuple; -import com.threerings.media.util.Colorization; +import com.threerings.media.image.Colorization; import com.threerings.util.DirectionCodes; import com.threerings.cast.CompositedActionFrames.ComponentFrames; diff --git a/src/java/com/threerings/cast/CompositedActionFrames.java b/src/java/com/threerings/cast/CompositedActionFrames.java index 3124c12e0..7eacbd3f1 100644 --- a/src/java/com/threerings/cast/CompositedActionFrames.java +++ b/src/java/com/threerings/cast/CompositedActionFrames.java @@ -1,5 +1,5 @@ // -// $Id: CompositedActionFrames.java,v 1.10 2002/12/16 03:08:39 mdb Exp $ +// $Id: CompositedActionFrames.java,v 1.11 2003/01/08 04:09:02 mdb Exp $ package com.threerings.cast; @@ -11,8 +11,8 @@ import java.util.Comparator; import com.samskivert.util.StringUtil; -import com.threerings.media.util.Colorization; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.Colorization; +import com.threerings.media.image.ImageUtil; import com.threerings.media.util.MultiFrameImage; import com.threerings.cast.CharacterComponent; diff --git a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java index 85947e5c8..70f234412 100644 --- a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java +++ b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java @@ -1,5 +1,5 @@ // -// $Id: BundledComponentRepository.java,v 1.21 2003/01/07 07:55:58 mdb Exp $ +// $Id: BundledComponentRepository.java,v 1.22 2003/01/08 04:09:02 mdb Exp $ package com.threerings.cast.bundle; @@ -28,16 +28,16 @@ import org.apache.commons.collections.Predicate; import com.threerings.resource.ResourceBundle; import com.threerings.resource.ResourceManager; -import com.threerings.media.ImageManager; -import com.threerings.media.util.Colorization; -import com.threerings.media.util.ImageUtil; -import com.threerings.media.util.MultiFrameImage; +import com.threerings.media.image.Colorization; +import com.threerings.media.image.ImageManager; +import com.threerings.media.image.ImageUtil; import com.threerings.media.tile.ImageProvider; import com.threerings.media.tile.NoSuchTileException; import com.threerings.media.tile.Tile; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TrimmedTile; +import com.threerings.media.util.MultiFrameImage; import com.threerings.util.DirectionCodes; diff --git a/src/java/com/threerings/media/image/ColorUtil.java b/src/java/com/threerings/media/image/ColorUtil.java index 05860bfeb..83103467d 100644 --- a/src/java/com/threerings/media/image/ColorUtil.java +++ b/src/java/com/threerings/media/image/ColorUtil.java @@ -1,7 +1,7 @@ // -// $Id: ColorUtil.java,v 1.3 2002/07/18 23:14:02 ray Exp $ +// $Id: ColorUtil.java,v 1.4 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media.util; +package com.threerings.media.image; import java.awt.Color; diff --git a/src/java/com/threerings/media/image/Colorization.java b/src/java/com/threerings/media/image/Colorization.java index 5d4492e61..eca5cd0f7 100644 --- a/src/java/com/threerings/media/image/Colorization.java +++ b/src/java/com/threerings/media/image/Colorization.java @@ -1,7 +1,7 @@ // -// $Id: Colorization.java,v 1.5 2002/05/06 23:23:08 mdb Exp $ +// $Id: Colorization.java,v 1.6 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media.util; +package com.threerings.media.image; import java.awt.Color; diff --git a/src/java/com/threerings/media/image/ImageIOLoader.java b/src/java/com/threerings/media/image/ImageIOLoader.java index 52d9b9b79..408449e15 100644 --- a/src/java/com/threerings/media/image/ImageIOLoader.java +++ b/src/java/com/threerings/media/image/ImageIOLoader.java @@ -1,7 +1,7 @@ // -// $Id: ImageIOLoader.java,v 1.4 2001/12/13 07:31:53 mdb Exp $ +// $Id: ImageIOLoader.java,v 1.5 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.image; import java.awt.Image; import java.io.IOException; diff --git a/src/java/com/threerings/media/image/ImageLoader.java b/src/java/com/threerings/media/image/ImageLoader.java index 146a597b3..9889b723c 100644 --- a/src/java/com/threerings/media/image/ImageLoader.java +++ b/src/java/com/threerings/media/image/ImageLoader.java @@ -1,7 +1,7 @@ // -// $Id: ImageLoader.java,v 1.1 2001/12/07 01:33:29 mdb Exp $ +// $Id: ImageLoader.java,v 1.2 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.image; import java.awt.Image; import java.io.IOException; diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java index 8ae43a8e0..8ba12b6d6 100644 --- a/src/java/com/threerings/media/image/ImageManager.java +++ b/src/java/com/threerings/media/image/ImageManager.java @@ -1,7 +1,7 @@ // -// $Id: ImageManager.java,v 1.32 2003/01/07 07:55:24 mdb Exp $ +// $Id: ImageManager.java,v 1.33 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.image; import java.awt.Component; import java.awt.Graphics2D; @@ -13,19 +13,11 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; - -import javax.imageio.ImageReader; - -import javax.imageio.stream.ImageInputStream; -import javax.imageio.stream.MemoryCacheImageInputStream; - import com.samskivert.io.NestableIOException; import com.samskivert.util.LRUHashMap; import com.samskivert.util.Throttle; import com.threerings.media.Log; -import com.threerings.media.util.ImageUtil; import com.threerings.resource.ResourceManager; /** diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/java/com/threerings/media/image/ImageUtil.java index 41638e848..53f3ac34c 100644 --- a/src/java/com/threerings/media/image/ImageUtil.java +++ b/src/java/com/threerings/media/image/ImageUtil.java @@ -1,7 +1,7 @@ // -// $Id: ImageUtil.java,v 1.19 2002/12/07 02:04:32 shaper Exp $ +// $Id: ImageUtil.java,v 1.20 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media.util; +package com.threerings.media.image; import java.awt.AlphaComposite; import java.awt.Color; diff --git a/src/java/com/threerings/media/image/ToolkitLoader.java b/src/java/com/threerings/media/image/ToolkitLoader.java index b835b9246..8649a7c0f 100644 --- a/src/java/com/threerings/media/image/ToolkitLoader.java +++ b/src/java/com/threerings/media/image/ToolkitLoader.java @@ -1,7 +1,7 @@ // -// $Id: ToolkitLoader.java,v 1.2 2002/04/01 16:49:26 mdb Exp $ +// $Id: ToolkitLoader.java,v 1.3 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.image; import java.awt.Component; import java.awt.Image; diff --git a/src/java/com/threerings/media/sound/MidiPlayer.java b/src/java/com/threerings/media/sound/MidiPlayer.java index bf218c2b1..7cf6bd29e 100644 --- a/src/java/com/threerings/media/sound/MidiPlayer.java +++ b/src/java/com/threerings/media/sound/MidiPlayer.java @@ -1,7 +1,7 @@ // -// $Id: MidiPlayer.java,v 1.3 2002/11/26 02:39:40 ray Exp $ +// $Id: MidiPlayer.java,v 1.4 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.sound; import java.io.BufferedInputStream; import java.io.InputStream; diff --git a/src/java/com/threerings/media/sound/ModPlayer.java b/src/java/com/threerings/media/sound/ModPlayer.java index d813a4755..46ad4c22a 100644 --- a/src/java/com/threerings/media/sound/ModPlayer.java +++ b/src/java/com/threerings/media/sound/ModPlayer.java @@ -1,7 +1,7 @@ // -// $Id: ModPlayer.java,v 1.5 2002/11/26 02:39:40 ray Exp $ +// $Id: ModPlayer.java,v 1.6 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.sound; import java.io.DataInputStream; import java.io.InputStream; diff --git a/src/java/com/threerings/media/sound/Mp3Player.java b/src/java/com/threerings/media/sound/Mp3Player.java index dcbe5e882..f2790e4ea 100644 --- a/src/java/com/threerings/media/sound/Mp3Player.java +++ b/src/java/com/threerings/media/sound/Mp3Player.java @@ -1,7 +1,7 @@ // -// $Id: Mp3Player.java,v 1.3 2002/11/26 02:39:40 ray Exp $ +// $Id: Mp3Player.java,v 1.4 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.sound; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -19,6 +19,7 @@ import javax.sound.sampled.SourceDataLine; import org.apache.commons.io.StreamUtils; +import com.threerings.media.Log; import com.threerings.resource.ResourceManager; /** diff --git a/src/java/com/threerings/media/sound/MusicPlayer.java b/src/java/com/threerings/media/sound/MusicPlayer.java index d5ca3bf91..e9b7c8b3f 100644 --- a/src/java/com/threerings/media/sound/MusicPlayer.java +++ b/src/java/com/threerings/media/sound/MusicPlayer.java @@ -1,7 +1,7 @@ // -// $Id: MusicPlayer.java,v 1.3 2002/11/26 02:39:40 ray Exp $ +// $Id: MusicPlayer.java,v 1.4 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.sound; import java.io.InputStream; diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java index 7068b4b9b..cf5003c77 100644 --- a/src/java/com/threerings/media/sound/SoundManager.java +++ b/src/java/com/threerings/media/sound/SoundManager.java @@ -1,7 +1,7 @@ // -// $Id: SoundManager.java,v 1.41 2002/12/12 19:00:25 mdb Exp $ +// $Id: SoundManager.java,v 1.42 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.sound; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/src/java/com/threerings/media/sound/Sounds.java b/src/java/com/threerings/media/sound/Sounds.java index 6291b506f..fa3c52751 100644 --- a/src/java/com/threerings/media/sound/Sounds.java +++ b/src/java/com/threerings/media/sound/Sounds.java @@ -1,7 +1,7 @@ // -// $Id: Sounds.java,v 1.3 2002/11/27 00:08:36 ray Exp $ +// $Id: Sounds.java,v 1.4 2003/01/08 04:09:02 mdb Exp $ -package com.threerings.media; +package com.threerings.media.sound; import java.io.File; diff --git a/src/java/com/threerings/media/tile/ObjectTile.java b/src/java/com/threerings/media/tile/ObjectTile.java index 8a3b409ca..057c5027c 100644 --- a/src/java/com/threerings/media/tile/ObjectTile.java +++ b/src/java/com/threerings/media/tile/ObjectTile.java @@ -1,14 +1,10 @@ // -// $Id: ObjectTile.java,v 1.11 2002/06/25 01:19:08 mdb Exp $ +// $Id: ObjectTile.java,v 1.12 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile; import java.awt.Image; import java.awt.Rectangle; -import java.awt.image.BufferedImage; - -import com.threerings.media.Log; -import com.threerings.media.util.ImageUtil; /** * An object tile extends the base tile to provide support for objects diff --git a/src/java/com/threerings/media/tile/ObjectTileSet.java b/src/java/com/threerings/media/tile/ObjectTileSet.java index 12de8884e..281ae54c5 100644 --- a/src/java/com/threerings/media/tile/ObjectTileSet.java +++ b/src/java/com/threerings/media/tile/ObjectTileSet.java @@ -1,5 +1,5 @@ // -// $Id: ObjectTileSet.java,v 1.7 2002/05/06 18:08:32 mdb Exp $ +// $Id: ObjectTileSet.java,v 1.8 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile; @@ -8,7 +8,7 @@ import java.awt.Rectangle; import java.util.Arrays; import com.samskivert.util.StringUtil; -import com.threerings.media.ImageManager; +import com.threerings.media.image.ImageManager; /** * The object tileset supports the specification of object information for diff --git a/src/java/com/threerings/media/tile/Tile.java b/src/java/com/threerings/media/tile/Tile.java index 5f067205c..12a195c09 100644 --- a/src/java/com/threerings/media/tile/Tile.java +++ b/src/java/com/threerings/media/tile/Tile.java @@ -1,5 +1,5 @@ // -// $Id: Tile.java,v 1.24 2002/09/23 21:52:43 mdb Exp $ +// $Id: Tile.java,v 1.25 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile; @@ -12,7 +12,7 @@ import java.awt.image.BufferedImage; import com.samskivert.util.StringUtil; import com.threerings.media.Log; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.ImageUtil; /** * A tile represents a single square in a single layer in a scene. diff --git a/src/java/com/threerings/media/tile/TileManager.java b/src/java/com/threerings/media/tile/TileManager.java index b54303a2c..2c5e34a7c 100644 --- a/src/java/com/threerings/media/tile/TileManager.java +++ b/src/java/com/threerings/media/tile/TileManager.java @@ -1,5 +1,5 @@ // -// $Id: TileManager.java,v 1.25 2002/10/17 17:42:53 mdb Exp $ +// $Id: TileManager.java,v 1.26 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile; @@ -10,7 +10,7 @@ import com.samskivert.io.PersistenceException; import com.samskivert.util.HashIntMap; import com.threerings.media.Log; -import com.threerings.media.ImageManager; +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/TileSet.java b/src/java/com/threerings/media/tile/TileSet.java index 77a7dad46..0b187fef3 100644 --- a/src/java/com/threerings/media/tile/TileSet.java +++ b/src/java/com/threerings/media/tile/TileSet.java @@ -1,5 +1,5 @@ // -// $Id: TileSet.java,v 1.34 2002/10/27 18:49:51 mdb Exp $ +// $Id: TileSet.java,v 1.35 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile; @@ -15,8 +15,8 @@ import java.io.Serializable; import com.samskivert.util.StringUtil; import com.threerings.media.Log; -import com.threerings.media.util.Colorization; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.Colorization; +import com.threerings.media.image.ImageUtil; /** * A tileset stores information on a single logical set of tiles. It diff --git a/src/java/com/threerings/media/tile/TrimmedTile.java b/src/java/com/threerings/media/tile/TrimmedTile.java index f5fbc0c63..e11d091a0 100644 --- a/src/java/com/threerings/media/tile/TrimmedTile.java +++ b/src/java/com/threerings/media/tile/TrimmedTile.java @@ -1,5 +1,5 @@ // -// $Id: TrimmedTile.java,v 1.3 2002/06/19 23:28:14 mdb Exp $ +// $Id: TrimmedTile.java,v 1.4 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile; @@ -12,7 +12,7 @@ import java.awt.image.BufferedImage; import com.samskivert.util.StringUtil; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.ImageUtil; /** * Behaves just like a regular tile, but contains a "trimmed" image which diff --git a/src/java/com/threerings/media/tile/UniformTileSet.java b/src/java/com/threerings/media/tile/UniformTileSet.java index 346af3b10..5d28da9e3 100644 --- a/src/java/com/threerings/media/tile/UniformTileSet.java +++ b/src/java/com/threerings/media/tile/UniformTileSet.java @@ -1,5 +1,5 @@ // -// $Id: UniformTileSet.java,v 1.9 2002/06/19 08:27:35 mdb Exp $ +// $Id: UniformTileSet.java,v 1.10 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile; @@ -7,7 +7,7 @@ import java.awt.Image; import java.awt.Rectangle; import com.threerings.media.Log; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.ImageUtil; /** * A uniform tileset is one that is composed of tiles that are all the diff --git a/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java b/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java index 04418391f..eeb771a55 100644 --- a/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java +++ b/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java @@ -1,5 +1,5 @@ // -// $Id: BundledTileSetRepository.java,v 1.7 2002/10/16 23:23:32 shaper Exp $ +// $Id: BundledTileSetRepository.java,v 1.8 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile.bundle; @@ -16,7 +16,7 @@ import com.threerings.resource.ResourceBundle; import com.threerings.resource.ResourceManager; import com.threerings.media.Log; -import com.threerings.media.ImageManager; +import com.threerings.media.image.ImageManager; import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSetRepository; diff --git a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java index 3c7bc0261..86b195ba6 100644 --- a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java +++ b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java @@ -1,5 +1,5 @@ // -// $Id: TileSetBundle.java,v 1.11 2002/10/08 21:59:09 mdb Exp $ +// $Id: TileSetBundle.java,v 1.12 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile.bundle; @@ -19,9 +19,10 @@ import java.util.Iterator; import com.samskivert.util.HashIntMap; import com.threerings.resource.ResourceBundle; -import com.threerings.media.ImageManager; -import com.threerings.media.tile.TileSet; + +import com.threerings.media.image.ImageManager; import com.threerings.media.tile.ImageProvider; +import com.threerings.media.tile.TileSet; /** * A tileset bundle is used to load up tilesets by id from a persistent diff --git a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java index 1d2a723b7..f2b0a1e6f 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java +++ b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java @@ -1,5 +1,5 @@ // -// $Id: DumpBundle.java,v 1.7 2002/07/19 20:13:04 shaper Exp $ +// $Id: DumpBundle.java,v 1.8 2003/01/08 04:09:02 mdb Exp $ package com.threerings.media.tile.bundle.tools; @@ -9,7 +9,7 @@ import java.util.Iterator; import com.threerings.resource.ResourceManager; import com.threerings.resource.ResourceBundle; -import com.threerings.media.ImageManager; +import com.threerings.media.image.ImageManager; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.bundle.BundleUtil; diff --git a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java index d7560c81c..138cc4656 100644 --- a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java +++ b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java @@ -1,5 +1,5 @@ // -// $Id: TileSetTrimmer.java,v 1.4 2002/09/11 19:17:55 shaper Exp $ +// $Id: TileSetTrimmer.java,v 1.5 2003/01/08 04:09:03 mdb Exp $ package com.threerings.media.tile.util; @@ -19,10 +19,10 @@ import com.samskivert.util.StringUtil; import com.threerings.media.Log; +import com.threerings.media.image.ImageUtil; import com.threerings.media.tile.NoSuchTileException; import com.threerings.media.tile.Tile; import com.threerings.media.tile.TileSet; -import com.threerings.media.util.ImageUtil; /** * Contains routines for trimming the images from an existing tileset diff --git a/src/java/com/threerings/media/tools/RecolorImage.java b/src/java/com/threerings/media/tools/RecolorImage.java index 2e13717a2..1f553d8eb 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.2 2002/03/08 01:38:12 mdb Exp $ +// $Id: RecolorImage.java,v 1.3 2003/01/08 04:09:03 mdb Exp $ package com.threerings.media.tools; @@ -32,7 +32,7 @@ import com.samskivert.swing.VGroupLayout; import com.samskivert.swing.util.SwingUtil; import com.threerings.media.Log; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.ImageUtil; /** * Tests the image recoloring code. diff --git a/src/java/com/threerings/media/util/MultiFrameImageImpl.java b/src/java/com/threerings/media/util/MultiFrameImageImpl.java index 512fa7f98..d6dec84c5 100644 --- a/src/java/com/threerings/media/util/MultiFrameImageImpl.java +++ b/src/java/com/threerings/media/util/MultiFrameImageImpl.java @@ -1,12 +1,12 @@ // -// $Id: MultiFrameImageImpl.java,v 1.3 2002/09/17 19:11:13 mdb Exp $ +// $Id: MultiFrameImageImpl.java,v 1.4 2003/01/08 04:09:03 mdb Exp $ package com.threerings.media.util; import java.awt.Graphics; import java.awt.Image; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.ImageUtil; /** * A basic implementation of the {@link MultiFrameImage} interface diff --git a/src/java/com/threerings/media/util/SingleFrameImageImpl.java b/src/java/com/threerings/media/util/SingleFrameImageImpl.java index 944c5e6f0..e1e3e8193 100644 --- a/src/java/com/threerings/media/util/SingleFrameImageImpl.java +++ b/src/java/com/threerings/media/util/SingleFrameImageImpl.java @@ -1,12 +1,12 @@ // -// $Id: SingleFrameImageImpl.java,v 1.3 2002/09/17 19:11:13 mdb Exp $ +// $Id: SingleFrameImageImpl.java,v 1.4 2003/01/08 04:09:03 mdb Exp $ package com.threerings.media.util; import java.awt.Graphics; import java.awt.Image; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.ImageUtil; /** * The single frame image class is a basic implementation of the {@link diff --git a/src/java/com/threerings/miso/tile/AutoFringer.java b/src/java/com/threerings/miso/tile/AutoFringer.java index 9cbd3aef2..d6178209c 100644 --- a/src/java/com/threerings/miso/tile/AutoFringer.java +++ b/src/java/com/threerings/miso/tile/AutoFringer.java @@ -1,5 +1,5 @@ // -// $Id: AutoFringer.java,v 1.14 2002/12/07 02:30:37 shaper Exp $ +// $Id: AutoFringer.java,v 1.15 2003/01/08 04:09:03 mdb Exp $ package com.threerings.miso.tile; @@ -26,7 +26,7 @@ import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileUtil; import com.threerings.media.tile.UniformTileSet; -import com.threerings.media.util.ImageUtil; +import com.threerings.media.image.ImageUtil; import com.threerings.miso.scene.MisoSceneModel; diff --git a/src/java/com/threerings/miso/tile/MisoTileManager.java b/src/java/com/threerings/miso/tile/MisoTileManager.java index c7fb009a4..41a30c336 100644 --- a/src/java/com/threerings/miso/tile/MisoTileManager.java +++ b/src/java/com/threerings/miso/tile/MisoTileManager.java @@ -1,5 +1,5 @@ // -// $Id: MisoTileManager.java,v 1.2 2002/04/06 01:56:39 mdb Exp $ +// $Id: MisoTileManager.java,v 1.3 2003/01/08 04:09:03 mdb Exp $ package com.threerings.miso.tile; @@ -9,7 +9,7 @@ import java.io.InputStream; import com.threerings.resource.ResourceManager; import com.threerings.util.CompiledConfig; -import com.threerings.media.ImageManager; +import com.threerings.media.image.ImageManager; import com.threerings.media.tile.TileManager; import com.threerings.miso.Log;