From a7e975f6da250b55c48625fa393bf4de36e92d06 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Tue, 15 Jan 2008 23:44:53 +0000
Subject: [PATCH] Added addListeners(), rename event handler functions.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@396 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/as/com/threerings/flash/MediaContainer.as | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/as/com/threerings/flash/MediaContainer.as b/src/as/com/threerings/flash/MediaContainer.as
index b5e2e930..d9a6fc34 100644
--- a/src/as/com/threerings/flash/MediaContainer.as
+++ b/src/as/com/threerings/flash/MediaContainer.as
@@ -238,13 +238,9 @@ public class MediaContainer extends Sprite
         // create our loader and set up some event listeners
         var loader :Loader = new Loader();
         _media = loader;
-        var info :LoaderInfo = loader.contentLoaderInfo;
-        info.addEventListener(Event.COMPLETE, loadingComplete);
-        info.addEventListener(Event.INIT, handleInit);
-        info.addEventListener(IOErrorEvent.IO_ERROR, loadError);
-        info.addEventListener(ProgressEvent.PROGRESS, loadProgress);
         addChildAt(loader, 0);
 
+        addListeners(loader.contentLoaderInfo);
         return loader;
     }
 
@@ -498,21 +494,32 @@ public class MediaContainer extends Sprite
         }
     }
 
+    /**
+     * Add our listeners to the LoaderInfo object.
+     */
+    protected function addListeners (info :LoaderInfo) :void
+    {
+        info.addEventListener(Event.COMPLETE, handleComplete);
+        info.addEventListener(Event.INIT, handleInit);
+        info.addEventListener(IOErrorEvent.IO_ERROR, handleIOError);
+        info.addEventListener(ProgressEvent.PROGRESS, handleProgress);
+    }
+
     /**
      * Remove our listeners from the LoaderInfo object.
      */
     protected function removeListeners (info :LoaderInfo) :void
     {
-        info.removeEventListener(Event.COMPLETE, loadingComplete);
+        info.removeEventListener(Event.COMPLETE, handleComplete);
         info.removeEventListener(Event.INIT, handleInit);
-        info.removeEventListener(IOErrorEvent.IO_ERROR, loadError);
-        info.removeEventListener(ProgressEvent.PROGRESS, loadProgress);
+        info.removeEventListener(IOErrorEvent.IO_ERROR, handleIOError);
+        info.removeEventListener(ProgressEvent.PROGRESS, handleProgress);
     }
 
     /**
      * A callback to receive IO_ERROR events.
      */
-    protected function loadError (event :IOErrorEvent) :void
+    protected function handleIOError (event :IOErrorEvent) :void
     {
         stoppedLoading();
         setupBrokenImage(-1, -1);
@@ -521,7 +528,7 @@ public class MediaContainer extends Sprite
     /**
      * A callback to receive PROGRESS events.
      */
-    protected function loadProgress (event :ProgressEvent) :void
+    protected function handleProgress (event :ProgressEvent) :void
     {
         updateLoadingProgress(event.bytesLoaded, event.bytesTotal);
         var info :LoaderInfo = (event.target as LoaderInfo);
@@ -566,7 +573,7 @@ public class MediaContainer extends Sprite
     /**
      * Callback function to receive COMPLETE events for swfs or images.
      */
-    protected function loadingComplete (event :Event) :void
+    protected function handleComplete (event :Event) :void
     {
         var info :LoaderInfo = (event.target as LoaderInfo);
         removeListeners(info);