#129 - Add support for registering IEventHandler<object> for getting …

…all nofitications for all events in DefaultEventManager.
neptuo · Jan 11, 2019 · 5d8d928 · 5d8d928
1 parent ba5c912
commit 5d8d928
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/Neptuo.Events/Internals/ThreeBranchStorage.cs b/src/Neptuo.Events/Internals/ThreeBranchStorage.cs
@@ -80,13 +80,27 @@ public void RemoveContextHandler(Type eventType, object handler)
 
         #region Reading handlers
 
+        private IEnumerable<object> ConcatHandlers(List<object> concreteHandlers, List<object> genericHandlers)
+        {
+            if (concreteHandlers == null && genericHandlers == null)
+                return Enumerable.Empty<object>();
+
+            if (concreteHandlers == null)
+                return genericHandlers;
+
+            if (genericHandlers == null)
+                return concreteHandlers;
+
+            return Enumerable.Concat(concreteHandlers, genericHandlers);
+        }
+
         private IEnumerable<object> GetHandlersInternal(Type eventType, Dictionary<Type, List<object>> storage, bool includeSubTypes)
         {
             if (storage != null)
             {
-                List<object> handlers;
-                if (storage.TryGetValue(eventType, out handlers))
-                    return handlers;
+                storage.TryGetValue(eventType, out var concreteHandlers);
+                storage.TryGetValue(typeof(object), out var genericHandlers);
+                return ConcatHandlers(concreteHandlers, genericHandlers);
             }
 
             return Enumerable.Empty<object>();