From 3807953a55526fe2480ea6ca84b3eefb69838da8 Mon Sep 17 00:00:00 2001
From: Walter Korman <shaper@threerings.net>
Date: Sun, 15 Dec 2002 23:12:37 +0000
Subject: [PATCH] Added MediaPanel.clearAnimations(), fixed up comments and
 removed unnecessary SpriteManager.clearSprites().

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2069 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/media/AbstractMediaManager.java  |  7 ++++---
 src/java/com/threerings/media/MediaPanel.java       | 12 ++++++++++--
 .../com/threerings/media/sprite/SpriteManager.java  | 13 +------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/java/com/threerings/media/AbstractMediaManager.java b/src/java/com/threerings/media/AbstractMediaManager.java
index 80cb02091..ab06b195e 100644
--- a/src/java/com/threerings/media/AbstractMediaManager.java
+++ b/src/java/com/threerings/media/AbstractMediaManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: AbstractMediaManager.java,v 1.3 2002/11/26 02:47:04 shaper Exp $
+// $Id: AbstractMediaManager.java,v 1.4 2002/12/15 23:12:37 shaper Exp $
 
 package com.threerings.media;
 
@@ -146,8 +146,9 @@ public abstract class AbstractMediaManager
     }
 
     /**
-     * Clears all media from the manager. This does not invalidate their
-     * vacated bounds; it is assumed that it will be ok.
+     * Clears all media from the manager and calls {@link
+     * AbstractMedia#shutdown} on each. This does not invalidate the
+     * media's vacated bounds; it is assumed that it will be ok.
      */
     protected void clearMedia ()
     {
diff --git a/src/java/com/threerings/media/MediaPanel.java b/src/java/com/threerings/media/MediaPanel.java
index b475b40a1..de3d729b8 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.26 2002/12/08 02:49:53 mdb Exp $
+// $Id: MediaPanel.java,v 1.27 2002/12/15 23:12:37 shaper Exp $
 
 package com.threerings.media;
 
@@ -157,7 +157,7 @@ public class MediaPanel extends JComponent
      */
     public void clearSprites ()
     {
-        _spritemgr.clearSprites();
+        _spritemgr.clearMedia();
     }
 
     /**
@@ -176,6 +176,14 @@ public class MediaPanel extends JComponent
         _animmgr.unregisterAnimation(anim);
     }
 
+    /**
+     * Removes all animations from this panel.
+     */
+    public void clearAnimations ()
+    {
+        _animmgr.clearMedia();
+    }
+
     // documentation inherited from interface
     public void tick (long tickStamp)
     {
diff --git a/src/java/com/threerings/media/sprite/SpriteManager.java b/src/java/com/threerings/media/sprite/SpriteManager.java
index ee39b92ea..db0eff5a5 100644
--- a/src/java/com/threerings/media/sprite/SpriteManager.java
+++ b/src/java/com/threerings/media/sprite/SpriteManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpriteManager.java,v 1.39 2002/11/05 20:52:39 mdb Exp $
+// $Id: SpriteManager.java,v 1.40 2002/12/15 23:12:37 shaper Exp $
 
 package com.threerings.media.sprite;
 
@@ -109,17 +109,6 @@ public class SpriteManager extends AbstractMediaManager
         removeMedia(sprite);
     }
 
-    /**
-     * Clears all sprites from the sprite manager. This does not
-     * invalidate their vacated bounds because it is assumed that either
-     * the whole view will be repainted after this or it is going away
-     * entirely. The sprites will be {@link Sprite#shutdown}, however.
-     */
-    public void clearSprites ()
-    {
-        clearMedia();
-    }
-
     /**
      * Render the sprite paths to the given graphics context.
      *