From 4641d005839bf6dc6453084f3e325ef90e9eeb94 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sun, 24 Feb 2002 02:20:44 +0000
Subject: [PATCH] Moved ImageUtil into media.util with the rest of the util
 classes.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1067 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/cast/util/TileUtil.java          | 4 ++--
 src/java/com/threerings/media/image/ImageManager.java    | 3 ++-
 src/java/com/threerings/media/image/ImageUtil.java       | 4 ++--
 src/java/com/threerings/media/tile/SwissArmyTileSet.java | 4 ++--
 src/java/com/threerings/media/tile/TileSet.java          | 4 ++--
 src/java/com/threerings/media/tile/UniformTileSet.java   | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/java/com/threerings/cast/util/TileUtil.java b/src/java/com/threerings/cast/util/TileUtil.java
index 716097188..8bd3c7229 100644
--- a/src/java/com/threerings/cast/util/TileUtil.java
+++ b/src/java/com/threerings/cast/util/TileUtil.java
@@ -1,13 +1,13 @@
 //
-// $Id: TileUtil.java,v 1.7 2002/01/18 17:48:11 shaper Exp $
+// $Id: TileUtil.java,v 1.8 2002/02/24 02:20:43 mdb Exp $
 
 package com.threerings.cast.util;
 
 import java.awt.Image;
 
-import com.threerings.media.ImageUtil;
 import com.threerings.media.sprite.MultiFrameImage;
 import com.threerings.media.sprite.Sprite;
+import com.threerings.media.util.ImageUtil;
 
 import com.threerings.cast.Log;
 
diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java
index 81ea02760..0b9627d5c 100644
--- a/src/java/com/threerings/media/image/ImageManager.java
+++ b/src/java/com/threerings/media/image/ImageManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ImageManager.java,v 1.12 2002/01/18 17:55:43 shaper Exp $
+// $Id: ImageManager.java,v 1.13 2002/02/24 02:20:43 mdb Exp $
 
 package com.threerings.media;
 
@@ -22,6 +22,7 @@ import javax.imageio.stream.MemoryCacheImageInputStream;
 
 import com.threerings.resource.ResourceManager;
 import com.threerings.media.Log;
+import com.threerings.media.util.ImageUtil;
 
 /**
  * Provides a single point of access for image retrieval and caching.
diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/java/com/threerings/media/image/ImageUtil.java
index 7e330f077..f23a7e498 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.3 2002/01/18 17:55:43 shaper Exp $
+// $Id: ImageUtil.java,v 1.4 2002/02/24 02:20:44 mdb Exp $
 
-package com.threerings.media;
+package com.threerings.media.util;
 
 import java.awt.Image;
 import java.awt.Graphics;
diff --git a/src/java/com/threerings/media/tile/SwissArmyTileSet.java b/src/java/com/threerings/media/tile/SwissArmyTileSet.java
index 9c9f81db5..8478ea2f3 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.6 2002/01/17 23:43:14 mdb Exp $
+// $Id: SwissArmyTileSet.java,v 1.7 2002/02/24 02:20:44 mdb Exp $
 
 package com.threerings.media.tile;
 
@@ -13,7 +13,7 @@ import java.io.ObjectInputStream;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.media.Log;
-import com.threerings.media.ImageUtil;
+import com.threerings.media.util.ImageUtil;
 
 /**
  * The swiss army tileset supports a diverse variety of tiles in the
diff --git a/src/java/com/threerings/media/tile/TileSet.java b/src/java/com/threerings/media/tile/TileSet.java
index 1b46715bf..144f797ae 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.24 2002/01/18 17:48:11 shaper Exp $
+// $Id: TileSet.java,v 1.25 2002/02/24 02:20:44 mdb Exp $
 
 package com.threerings.media.tile;
 
@@ -9,8 +9,8 @@ import java.awt.Transparency;
 import java.io.IOException;
 import java.io.Serializable;
 
-import com.threerings.media.ImageUtil;
 import com.threerings.media.Log;
+import com.threerings.media.util.ImageUtil;
 
 /**
  * A tileset stores information on a single logical set of tiles. It
diff --git a/src/java/com/threerings/media/tile/UniformTileSet.java b/src/java/com/threerings/media/tile/UniformTileSet.java
index 4c97ec535..441e3f8c4 100644
--- a/src/java/com/threerings/media/tile/UniformTileSet.java
+++ b/src/java/com/threerings/media/tile/UniformTileSet.java
@@ -1,12 +1,12 @@
 //
-// $Id: UniformTileSet.java,v 1.6 2002/01/17 23:43:14 mdb Exp $
+// $Id: UniformTileSet.java,v 1.7 2002/02/24 02:20:44 mdb Exp $
 
 package com.threerings.media.tile;
 
 import java.awt.Image;
 
 import com.threerings.media.Log;
-import com.threerings.media.ImageUtil;
+import com.threerings.media.util.ImageUtil;
 
 /**
  * A uniform tileset is one that is composed of tiles that are all the