v0.9.15

jaykang920 · Jan 5, 2018 · 62f87c9 · 62f87c9
1 parent a5fbd8f
commit 62f87c9
Show file tree

Hide file tree

Showing 90 changed files with 151 additions and 120 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.9.15 (2018-01-05)
+
+Features:
+
+- EventSink: Bind/Unbind methods now returns the binder token
+
 ## 0.9.14 (2017-12-19)
 
 Features:

diff --git a/GlobalAssemblyInfo.cs b/GlobalAssemblyInfo.cs
@@ -1,16 +1,13 @@
-// Copyright (c) 2017 Jae-jun Kang
-// See the file LICENSE for details.
-
-using System.Reflection;
+using System.Reflection;
 
 [assembly: AssemblyProduct("x2net")]
-[assembly: AssemblyCopyright("Copyright © 2017 Jae-jun Kang")]
+[assembly: AssemblyCopyright("Copyright © 2017, 2018 Jae-jun Kang")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]
 #else
 [assembly: AssemblyConfiguration("Release")]
 #endif
 
-[assembly: AssemblyVersion("0.9.14.0")]
-[assembly: AssemblyFileVersion("0.9.14.0")]
+[assembly: AssemblyVersion("0.9.15.0")]
+[assembly: AssemblyFileVersion("0.9.15.0")]
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Jae-jun Kang
+Copyright (c) 2017, 2018 Jae-jun Kang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/x2net/Binder.cs b/src/x2net/Binder.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Buffer.cs b/src/x2net/Buffer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/BufferTransform.cs b/src/x2net/BufferTransform.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Case.cs b/src/x2net/Case.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Cell.cs b/src/x2net/Cell.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Config.cs b/src/x2net/Config.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/ConfigSection.cs b/src/x2net/ConfigSection.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/ConstsInfo.cs b/src/x2net/ConstsInfo.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Coroutine.cs b/src/x2net/Coroutine.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Deserializer.cs b/src/x2net/Deserializer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Event.cs b/src/x2net/Event.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/EventQueue.cs b/src/x2net/EventQueue.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/EventSink.cs b/src/x2net/EventSink.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;
@@ -118,86 +118,114 @@ protected void EnsureNotDisposed()
             }
         }
 
-        public void Bind<T>(T e, Action<T> handler)
+        public void Bind(Binder.Token binderToken)
+        {
+            var flow = Flow;
+            if (Object.ReferenceEquals(flow, null))
+            {
+                return;
+            }
+            flow.Subscribe(binderToken);
+        }
+
+        public Binder.Token? Bind<T>(T e, Action<T> handler)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Subscribe(e, handler);
+                return null;
             }
+            return flow.Subscribe(e, handler);
         }
 
-        public void Bind<T>(T e, Action<T> handler, Predicate<T> predicate)
+        public Binder.Token? Bind<T>(T e, Action<T> handler, Predicate<T> predicate)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Subscribe(e, handler, predicate);
+                return null;
             }
+            return flow.Subscribe(e, handler, predicate);
         }
 
-        public void Bind<T>(T e, Func<Coroutine, T, IEnumerator> handler)
+        public Binder.Token? Bind<T>(T e, Func<Coroutine, T, IEnumerator> handler)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Subscribe(e, handler);
+                return null;
             }
+            return flow.Subscribe(e, handler);
         }
 
-        public void Bind<T>(T e, Func<Coroutine, T, IEnumerator> handler,
+        public Binder.Token? Bind<T>(T e, Func<Coroutine, T, IEnumerator> handler,
             Predicate<T> predicate)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
+            {
+                return null;
+            }
+            return flow.Subscribe(e, handler, predicate);
+        }
+
+        public void Unbind(Binder.Token binderToken)
+        {
+            var flow = Flow;
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Subscribe(e, handler, predicate);
+                return;
             }
+            flow.Unsubscribe(binderToken);
         }
 
-        public void Unbind<T>(T e, Action<T> handler)
+        public Binder.Token? Unbind<T>(T e, Action<T> handler)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Unsubscribe(e, handler);
+                return null;
             }
+            return flow.Unsubscribe(e, handler);
         }
 
-        public void Unbind<T>(T e, Action<T> handler, Predicate<T> predicate)
+        public Binder.Token? Unbind<T>(T e, Action<T> handler, Predicate<T> predicate)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Unsubscribe(e, handler, predicate);
+                return null;
             }
+            return flow.Unsubscribe(e, handler, predicate);
         }
 
-        public void Unbind<T>(T e, Func<Coroutine, T, IEnumerator> handler)
+        public Binder.Token? Unbind<T>(T e, Func<Coroutine, T, IEnumerator> handler)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Unsubscribe(e, handler);
+                return null;
             }
+            return flow.Unsubscribe(e, handler);
         }
 
-        public void Unbind<T>(T e, Func<Coroutine, T, IEnumerator> handler,
+        public Binder.Token? Unbind<T>(T e, Func<Coroutine, T, IEnumerator> handler,
             Predicate<T> predicate)
             where T : Event
         {
             var flow = Flow;
-            if (flow != null)
+            if (Object.ReferenceEquals(flow, null))
             {
-                flow.Unsubscribe(e, handler, predicate);
+                return null;
             }
+            return flow.Unsubscribe(e, handler, predicate);
         }
 
         internal void AddBinding(Binder.Token binderToken)

diff --git a/src/x2net/Exceptions.cs b/src/x2net/Exceptions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Extensions.Array.cs b/src/x2net/Extensions.Array.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Extensions.Buffer.cs b/src/x2net/Extensions.Buffer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Extensions.Collections.cs b/src/x2net/Extensions.Collections.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Extensions.Coroutine.cs b/src/x2net/Extensions.Coroutine.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Extensions.Event.cs b/src/x2net/Extensions.Event.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Fingerprint.cs b/src/x2net/Fingerprint.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Flow.cs b/src/x2net/Flow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Flows/EventBasedFlow.cs b/src/x2net/Flows/EventBasedFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Flows/FrameBasedFlow.cs b/src/x2net/Flows/FrameBasedFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Flows/MultiThreadFlow.cs b/src/x2net/Flows/MultiThreadFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Flows/SingleThreadFlow.cs b/src/x2net/Flows/SingleThreadFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Flows/ThreadlessFlow.cs b/src/x2net/Flows/ThreadlessFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Flows/TimeFlow.cs b/src/x2net/Flows/TimeFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Handler.cs b/src/x2net/Handler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Hub.cs b/src/x2net/Hub.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Link.cs b/src/x2net/Link.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Links/ClientLink.cs b/src/x2net/Links/ClientLink.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Links/LinkSession.cs b/src/x2net/Links/LinkSession.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Links/SendBuffer.cs b/src/x2net/Links/SendBuffer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Links/ServerLink.cs b/src/x2net/Links/ServerLink.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Links/SessionBasedLink.cs b/src/x2net/Links/SessionBasedLink.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Links/Socket/AbstractTcpClient.cs b/src/x2net/Links/Socket/AbstractTcpClient.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;

diff --git a/src/x2net/Links/Socket/AbstractTcpServer.cs b/src/x2net/Links/Socket/AbstractTcpServer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Jae-jun Kang
+// Copyright (c) 2017, 2018 Jae-jun Kang
 // See the file LICENSE for details.
 
 using System;