From 3e8061359fa44c5cc1284436611aaa24feea04ee Mon Sep 17 00:00:00 2001
From: Nathan Curtis <nathan@threerings.net>
Date: Tue, 24 Jun 2008 20:39:38 +0000
Subject: [PATCH] Ray points out that there is a nifty ValueEvent class right
 there in com.threerings.util.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5196 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/util/ElementExpiredEvent.as    | 30 -------------------
 src/as/com/threerings/util/ExpiringSet.as     | 11 ++++---
 2 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 src/as/com/threerings/util/ElementExpiredEvent.as

diff --git a/src/as/com/threerings/util/ElementExpiredEvent.as b/src/as/com/threerings/util/ElementExpiredEvent.as
deleted file mode 100644
index a9d5492bc..000000000
--- a/src/as/com/threerings/util/ElementExpiredEvent.as
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// $Id$
-
-package com.threerings.util {
-
-import flash.events.Event;
-
-public class ElementExpiredEvent extends Event
-{
-    public static const ELEMENT_EXPIRED :String = "ElementExpired";
-
-    public function ElementExpiredEvent (element :Object)
-    {
-        super(ELEMENT_EXPIRED);
-        _element = element;
-    }
-
-    public function get element () :Object
-    {
-        return _element;
-    }
-
-    override public function clone () :Event
-    {
-        return new ElementExpiredEvent(_element);
-    }
-
-    protected var _element :Object;
-}
-}
diff --git a/src/as/com/threerings/util/ExpiringSet.as b/src/as/com/threerings/util/ExpiringSet.as
index f5f263967..9caad76d8 100644
--- a/src/as/com/threerings/util/ExpiringSet.as
+++ b/src/as/com/threerings/util/ExpiringSet.as
@@ -12,9 +12,9 @@ import flash.utils.Timer;
 /**
  * Dispatched when a set element expires.
  *
- * @eventType com.threerings.util.ElementExpiredEvent.ELEMENT_EXPIRED
+ * @eventType com.threerings.util.ExpiringSet.ELEMENT_EXPIRED
  */
-[Event(name="ElementExpired", type="com.threerings.util.ElementExpiredEvent")]
+[Event(name="ElementExpired", type="com.threerings.util.ValueEvent")]
 
 /**
  * Data structure that keeps its elements for a short time, and then removes them automatically.
@@ -24,6 +24,9 @@ import flash.utils.Timer;
 public class ExpiringSet extends EventDispatcher
     implements Set
 {
+    /** The even that is dispatched when a member of this set expires. */
+    public static const ELEMENT_EXPIRED :String = "ElementExpired";
+
     /**
      * Initializes the expiring set.
      *
@@ -51,7 +54,7 @@ public class ExpiringSet extends EventDispatcher
 
     /**
      * Calling this function will not expire the elements, it simply removes them. No 
-     * ElementExpiredEvent will be dispatched.
+     * ValueEvent will be dispatched.
      */
     public function clear () :void
     {
@@ -140,7 +143,7 @@ public class ExpiringSet extends EventDispatcher
         while (headIsExpired(now)) {
             // pop the head off the queue and dispatch an event
             var head :ExpiringElement = _data.shift() as ExpiringElement;
-            dispatchEvent(new ElementExpiredEvent(head.element));
+            dispatchEvent(new ValueEvent(ELEMENT_EXPIRED, head.element));
         }
 
         // empty check