From 2c17d66f0218aeab761dc70707500f93ebbdc11a Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Fri, 28 Jan 2011 19:33:46 +0000
Subject: [PATCH] Add the messageReceived and destroyed signals to DObject
 rather than generating them. If they were generated, subclassing would fail
 on field conflicts.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6470 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/presents/dobj/DObject.as   | 39 +++++++++++++++++++
 .../presents/tools/streamable_as.tmpl         | 15 +------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/main/as/com/threerings/presents/dobj/DObject.as b/src/main/as/com/threerings/presents/dobj/DObject.as
index 8679f3cd2..0b96ae759 100644
--- a/src/main/as/com/threerings/presents/dobj/DObject.as
+++ b/src/main/as/com/threerings/presents/dobj/DObject.as
@@ -20,6 +20,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.presents.dobj {
+import org.osflash.signals.Signal;
 
 import flash.errors.IllegalOperationError;
 
@@ -38,6 +39,11 @@ public class DObject // extends EventDispatcher
 {
     private static const log :Log = Log.getLog(DObject);
 
+    public function DObject ()
+    {
+        new Signaller(this);
+    }
+
     public function getOid ():int
     {
         return _oid;
@@ -72,6 +78,9 @@ public class DObject // extends EventDispatcher
         }
     }
 
+    public const messageReceived :Signal = new Signal(String, Array);
+    public const destroyed :Signal = new Signal();
+
     public function setDestroyOnLastSubscriberRemoved (deathWish :Boolean) :void
     {
         _deathWish = deathWish;
@@ -414,3 +423,33 @@ public class DObject // extends EventDispatcher
     protected var _deathWish :Boolean = false;
 }
 }
+
+import com.threerings.presents.dobj.MessageEvent;
+import com.threerings.presents.dobj.MessageListener;
+import com.threerings.presents.dobj.ObjectDeathListener;
+import com.threerings.presents.dobj.ObjectDestroyedEvent;
+
+import com.threerings.presents.dobj.DObject;
+
+class Signaller
+    implements MessageListener, ObjectDeathListener
+{
+    public function Signaller (obj :DObject)
+    {
+        _obj = obj;
+        _obj.addListener(this);
+    }
+
+    public function messageReceived (event :MessageEvent) :void
+    {
+        _obj.messageReceived.dispatch(event.getName(), event.getArgs());
+    }
+
+    public function objectDestroyed (event :ObjectDestroyedEvent) :void
+    {
+        _obj.destroyed.dispatch();
+    }
+
+    protected var _obj :DObject;
+}
+
diff --git a/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl b/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl
index c17742e4e..2a3e7c8a2 100644
--- a/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl
+++ b/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl
@@ -36,8 +36,6 @@ public class {{classname}} {{^extends.isEmpty}}extends {{extends}}
     public var {{name}}ObjectRemoved :Signal = new Signal(int);
 {{/oidList}}
 {{/pubFields}}
-    public var messageReceived :Signal = new Signal(String, Array);
-    public var destroyed :Signal = new Signal();
 
 {{#pubFields}}
     public static const {{dobjectField}} :String = "{{name}}";
@@ -111,8 +109,7 @@ import com.threerings.presents.dobj.SetListener;
 import {{package}}.{{classname}};
 
 class Signaller
-    implements AttributeChangeListener, SetListener, ElementUpdateListener, MessageListener,
-        ObjectDeathListener, OidListListener
+    implements AttributeChangeListener, SetListener, ElementUpdateListener, OidListListener
 {
     public function Signaller (obj :{{classname}})
     {
@@ -195,16 +192,6 @@ class Signaller
         signal.dispatch(event.getIndex(), event.getValue(), event.getOldValue());
     }
 
-    public function messageReceived (event :MessageEvent) :void
-    {
-        _obj.messageReceived.dispatch(event.getName(), event.getArgs());
-    }
-
-    public function objectDestroyed (event :ObjectDestroyedEvent) :void
-    {
-        _obj.destroyed.dispatch();
-    }
-
     public function objectAdded (event:ObjectAddedEvent) :void
     {
         var signal :Signal;