From bd998aff3d601e77dcb511acc305669a9e3d8492 Mon Sep 17 00:00:00 2001
From: Walter Korman <shaper@threerings.net>
Date: Fri, 2 Nov 2001 03:09:10 +0000
Subject: [PATCH] Added getImageManager() to the miso context.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@586 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/miso/util/MisoContext.java |  9 ++++++++-
 .../java/com/threerings/miso/viewer/ViewerApp.java | 14 +++++++++++---
 .../com/threerings/miso/viewer/ViewerFrame.java    |  5 ++---
 .../miso/viewer/ViewerSceneViewPanel.java          |  9 ++++-----
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/java/com/threerings/miso/util/MisoContext.java b/src/java/com/threerings/miso/util/MisoContext.java
index 4d7a27ce7..22ddedc8b 100644
--- a/src/java/com/threerings/miso/util/MisoContext.java
+++ b/src/java/com/threerings/miso/util/MisoContext.java
@@ -1,14 +1,21 @@
 //
-// $Id: MisoContext.java,v 1.5 2001/10/15 23:53:43 shaper Exp $
+// $Id: MisoContext.java,v 1.6 2001/11/02 03:09:10 shaper Exp $
 
 package com.threerings.miso.util;
 
 import com.samskivert.util.Context;
 
+import com.threerings.media.ImageManager;
 import com.threerings.media.tile.TileManager;
 
 public interface MisoContext extends Context
 {
+    /**
+     * Returns a reference to the image manager.  This reference is
+     * valid for the lifetime of the application.
+     */
+    public ImageManager getImageManager ();
+
     /**
      * Returns a reference to the tile manager.  This reference is
      * valid for the lifetime of the application.
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
index a8beab4c3..10bb0a432 100644
--- a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
+++ b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
@@ -1,5 +1,5 @@
 //
-// $Id: ViewerApp.java,v 1.12 2001/11/02 02:52:16 shaper Exp $
+// $Id: ViewerApp.java,v 1.13 2001/11/02 03:09:10 shaper Exp $
 
 package com.threerings.miso.viewer;
 
@@ -37,8 +37,8 @@ public class ViewerApp
 	_config = MisoUtil.createConfig(
             ViewerModel.CONFIG_KEY, "rsrc/config/miso/viewer");
 	_model = createModel(_config, args);
-        ImageManager imgmgr = MisoUtil.createImageManager(_frame);
-	_tilemgr = MisoUtil.createTileManager(_config, imgmgr);
+        _imgmgr = MisoUtil.createImageManager(_frame);
+	_tilemgr = MisoUtil.createTileManager(_config, _imgmgr);
 	_screpo = MisoUtil.createSceneRepository(_config, _tilemgr);
 
 	// create the context object
@@ -69,6 +69,11 @@ public class ViewerApp
 	    return _config;
 	}
 
+        public ImageManager getImageManager ()
+        {
+            return _imgmgr;
+        }
+
 	public TileManager getTileManager ()
 	{
 	    return _tilemgr;
@@ -116,6 +121,9 @@ public class ViewerApp
     /** The tile manager object. */
     protected TileManager _tilemgr;
 
+    /** The image manager object. */
+    protected ImageManager _imgmgr;
+
     /** The viewer data model. */
     protected ViewerModel _model;
 
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java b/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java
index f06a3673a..811c28af4 100644
--- a/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java
+++ b/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java
@@ -1,5 +1,5 @@
 //
-// $Id: ViewerFrame.java,v 1.26 2001/11/01 01:40:43 shaper Exp $
+// $Id: ViewerFrame.java,v 1.27 2001/11/02 03:09:10 shaper Exp $
 
 package com.threerings.miso.viewer;
 
@@ -31,10 +31,9 @@ public class ViewerFrame extends JFrame
     public void init (ViewerContext ctx)
     {
         // create the various managers
-        ImageManager imgmgr = MisoUtil.createImageManager(this);
         SpriteManager spritemgr = new SpriteManager();
 
         // add the main panel to the frame
-	getContentPane().add(new ViewerSceneViewPanel(ctx, imgmgr, spritemgr));
+	getContentPane().add(new ViewerSceneViewPanel(ctx, spritemgr));
     }
 }
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java b/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
index 6db3f3897..75d81c0a5 100644
--- a/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
+++ b/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
@@ -1,5 +1,5 @@
 //
-// $Id: ViewerSceneViewPanel.java,v 1.27 2001/11/02 02:52:16 shaper Exp $
+// $Id: ViewerSceneViewPanel.java,v 1.28 2001/11/02 03:09:10 shaper Exp $
 
 package com.threerings.miso.viewer;
 
@@ -35,8 +35,7 @@ public class ViewerSceneViewPanel extends SceneViewPanel
     /**
      * Construct the panel and initialize it with a context.
      */
-    public ViewerSceneViewPanel (ViewerContext ctx, ImageManager imgmgr,
-                                 SpriteManager spritemgr)
+    public ViewerSceneViewPanel (ViewerContext ctx, SpriteManager spritemgr)
     {
 	super(ctx.getConfig(), spritemgr);
 
@@ -49,8 +48,8 @@ public class ViewerSceneViewPanel extends SceneViewPanel
         prepareStartingScene();
 
         // construct the character manager from which we obtain sprites
-        CharacterManager charmgr =
-            MisoUtil.createCharacterManager(ctx.getConfig(), imgmgr);
+        CharacterManager charmgr = MisoUtil.createCharacterManager(
+            ctx.getConfig(), ctx.getImageManager());
 
         // create the character descriptors
         _descUser = createCharacterDescriptor(charmgr);