From 822dabef8cd9e7bce2e5e1eefdb57952a6c3eb6e Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 18 Dec 2002 23:14:23 +0000
Subject: [PATCH] added a way to remove observers

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2073 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/media/AbstractMedia.java | 12 +++++++++++-
 src/java/com/threerings/media/sprite/Sprite.java | 10 +++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/media/AbstractMedia.java b/src/java/com/threerings/media/AbstractMedia.java
index 1b9fd0a1a..bee1fdeaa 100644
--- a/src/java/com/threerings/media/AbstractMedia.java
+++ b/src/java/com/threerings/media/AbstractMedia.java
@@ -1,5 +1,5 @@
 //
-// $Id: AbstractMedia.java,v 1.6 2002/12/12 23:54:59 shaper Exp $
+// $Id: AbstractMedia.java,v 1.7 2002/12/18 23:14:23 ray Exp $
 
 package com.threerings.media;
 
@@ -209,6 +209,16 @@ public abstract class AbstractMedia
         _observers.add(obs);
     }
 
+    /**
+     * Remove the specified observer from this media element.
+     */
+    protected void removeObserver (Object obs)
+    {
+        if (_observers != null) {
+            _observers.remove(obs);
+        }
+    }
+
     /**
      * Dumps this media to a String object.
      */
diff --git a/src/java/com/threerings/media/sprite/Sprite.java b/src/java/com/threerings/media/sprite/Sprite.java
index 347f70c30..0dda9b0a9 100644
--- a/src/java/com/threerings/media/sprite/Sprite.java
+++ b/src/java/com/threerings/media/sprite/Sprite.java
@@ -1,5 +1,5 @@
 //
-// $Id: Sprite.java,v 1.55 2002/12/04 02:45:09 shaper Exp $
+// $Id: Sprite.java,v 1.56 2002/12/18 23:14:23 ray Exp $
 
 package com.threerings.media.sprite;
 
@@ -321,6 +321,14 @@ public abstract class Sprite extends AbstractMedia
         addObserver(obs);
     }
 
+    /**
+     * Remove a sprite observer.
+     */
+    public void removeSpriteObserver (SpriteObserver obs)
+    {
+        removeObserver(obs);
+    }
+
     /**
      * Inform all sprite observers of a sprite event.
      *