From 0683cf91ede7cc4b987ce2778ed312a1d35b956d Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Wed, 14 Jun 2017 23:27:28 -0700
Subject: [PATCH] Cleanup send functions

---
 Ooui/EventTarget.cs | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/Ooui/EventTarget.cs b/Ooui/EventTarget.cs
index f3a0806..7ed5f4d 100644
--- a/Ooui/EventTarget.cs
+++ b/Ooui/EventTarget.cs
@@ -22,7 +22,12 @@ namespace Ooui
         protected EventTarget (string tagName)
         {
             TagName = tagName;
-            SendCreate ();
+            
+            Send (new Message {
+                MessageType = MessageType.Create,
+                TargetId = Id,
+                Key = TagName,
+            });
         }
 
         public void AddEventListener (string eventType, EventHandler handler)
@@ -41,7 +46,7 @@ namespace Ooui
             handlers.Add (handler);
 
             if (sendListen)
-                SendListen (eventType);
+                Send (Message.Listen (Id, eventType));
         }
 
         public void RemoveEventListener (string eventType, EventHandler handler)
@@ -74,19 +79,10 @@ namespace Ooui
 
         public virtual void Send (Message message)
         {
-            SaveStateMessage (message);
+            SaveStateMessageIfNeeded (message);
             MessageSent?.Invoke (message);
         }
 
-        protected void SendCreate ()
-        {
-            Send (new Message {
-                MessageType = MessageType.Create,
-                TargetId = Id,
-                Key = TagName,
-            });
-        }
-
         protected void SendCall (string methodName, params object[] args)
         {
             Send (new Message {
@@ -107,15 +103,6 @@ namespace Ooui
             });
         }
 
-        protected void SendListen (string eventType)
-        {
-            Send (new Message {
-                MessageType = MessageType.Listen,
-                TargetId = Id,
-                Key = eventType,
-            });
-        }
-
         public virtual void Receive (Message message)
         {
             if (message == null)