From 310ff1e3ba4d226e35c0d3195f782c09bc7a7ed6 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 8 Nov 2010 22:16:01 +0000
Subject: [PATCH] Moved CastUtil into tests, since it's test code. Added
 missing depend to miso-viewer build target.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1062 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml                                                 | 2 +-
 .../util => test/java/com/threerings/cast}/CastUtil.java  | 8 ++------
 .../com/threerings/miso/viewer/ViewerSceneViewPanel.java  | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename src/{main/java/com/threerings/cast/util => test/java/com/threerings/cast}/CastUtil.java (95%)

diff --git a/build.xml b/build.xml
index 5c02a2c2..5c451644 100644
--- a/build.xml
+++ b/build.xml
@@ -380,7 +380,7 @@
   </target>
 
   <property name="scene" value="idyll"/>
-  <target name="miso-viewer" depends="compile,test-tsbundles,test-cbundles"
+  <target name="miso-viewer" depends="compile,test-colorpos,test-tsbundles,test-cbundles"
           description="Runs the Miso scene viewer.">
     <java classname="com.threerings.miso.viewer.ViewerApp"
           fork="true" classpathref="test.classpath">
diff --git a/src/main/java/com/threerings/cast/util/CastUtil.java b/src/test/java/com/threerings/cast/CastUtil.java
similarity index 95%
rename from src/main/java/com/threerings/cast/util/CastUtil.java
rename to src/test/java/com/threerings/cast/CastUtil.java
index f7586489..4602747e 100644
--- a/src/main/java/com/threerings/cast/util/CastUtil.java
+++ b/src/test/java/com/threerings/cast/CastUtil.java
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.cast.util;
+package com.threerings.cast;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -32,14 +32,10 @@ import com.samskivert.util.RandomUtil;
 import com.threerings.media.image.ColorPository;
 import com.threerings.media.image.Colorization;
 
-import com.threerings.cast.CharacterDescriptor;
-import com.threerings.cast.ComponentClass;
-import com.threerings.cast.ComponentRepository;
-
 import static com.threerings.cast.Log.log;
 
 /**
- * Miscellaneous cast utility routines.
+ * Some Cast utilities that make use of our test resources.
  */
 public class CastUtil
 {
diff --git a/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java b/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
index e673cb90..46d0c86e 100644
--- a/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
+++ b/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
@@ -41,11 +41,11 @@ import com.threerings.miso.client.MisoScenePanel;
 import com.threerings.miso.data.MisoSceneModel;
 import com.threerings.miso.util.MisoContext;
 
+import com.threerings.cast.CastUtil;
 import com.threerings.cast.CharacterDescriptor;
 import com.threerings.cast.CharacterManager;
 import com.threerings.cast.CharacterSprite;
 import com.threerings.cast.ComponentRepository;
-import com.threerings.cast.util.CastUtil;
 
 import static com.threerings.miso.Log.log;