From 52fd670ba7ed5e92d6e1a2c94561001eea1d0f8c Mon Sep 17 00:00:00 2001
From: Darth Affe <darthaffe@wyrez.org>
Date: Wed, 8 Jul 2020 21:24:56 +0200
Subject: [PATCH] Improved usabillity of decorators a bit

---
 .../Decorators/AbstractDecorateable.cs        | 17 +++++++----------
 RGB.NET.Core/Decorators/AbstractDecorator.cs  | 19 +++++++++++--------
 RGB.NET.Core/Decorators/IDecoratable.cs       | 10 ++++++++--
 RGB.NET.Decorators/Brush/FlashDecorator.cs    |  2 +-
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/RGB.NET.Core/Decorators/AbstractDecorateable.cs b/RGB.NET.Core/Decorators/AbstractDecorateable.cs
index 94b8f05..d12afcd 100644
--- a/RGB.NET.Core/Decorators/AbstractDecorateable.cs
+++ b/RGB.NET.Core/Decorators/AbstractDecorateable.cs
@@ -12,18 +12,15 @@ namespace RGB.NET.Core
         #region Properties & Fields
 
         private readonly List<T> _decorators = new List<T>();
-        /// <summary>
-        /// Gets a readonly-list of all <see cref="IDecorator"/> attached to this <see cref="IDecoratable{T}"/>.
-        /// </summary>
-        protected IReadOnlyCollection<T> Decorators { get; }
 
-        #endregion
-
-        #region Constructors
-
-        protected AbstractDecoratable()
+        /// <inheritdoc />
+        public IReadOnlyCollection<T> Decorators
         {
-            Decorators = new ReadOnlyCollection<T>(_decorators);
+            get
+            {
+                lock (_decorators)
+                    return new ReadOnlyCollection<T>(_decorators);
+            }
         }
 
         #endregion
diff --git a/RGB.NET.Core/Decorators/AbstractDecorator.cs b/RGB.NET.Core/Decorators/AbstractDecorator.cs
index 381f4f5..50e007c 100644
--- a/RGB.NET.Core/Decorators/AbstractDecorator.cs
+++ b/RGB.NET.Core/Decorators/AbstractDecorator.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace RGB.NET.Core
 {
@@ -42,16 +44,17 @@ namespace RGB.NET.Core
         /// <summary>
         /// Detaches the decorator from all <see cref="IDecoratable"/> it is currently attached to.
         /// </summary>
-        /// <typeparam name="TDecoratable">The type of the <see cref="IDecoratable"/> this decorator is attached to.</typeparam>
-        /// <typeparam name="TDecorator">The type of this <see cref="IDecorator"/>.</typeparam>
-        protected virtual void Detach<TDecoratable, TDecorator>()
-            where TDecoratable : IDecoratable<TDecorator>
-            where TDecorator : AbstractDecorator
+        protected virtual void Detach()
         {
             List<IDecoratable> decoratables = new List<IDecoratable>(DecoratedObjects);
             foreach (IDecoratable decoratable in decoratables)
-                if (decoratable is TDecoratable typedDecoratable)
-                    typedDecoratable.RemoveDecorator((TDecorator)this);
+            {
+                IEnumerable<Type> types = decoratable.GetType().GetInterfaces().Where(t => t.IsGenericType
+                                                                                        && (t.Name == typeof(IDecoratable<>).Name)
+                                                                                        && t.GenericTypeArguments[0].IsInstanceOfType(this));
+                foreach (Type decoratableType in types)
+                    decoratableType.GetMethod(nameof(IDecoratable<IDecorator>.RemoveDecorator))?.Invoke(decoratable, new object[] { this });
+            }
         }
 
         #endregion
diff --git a/RGB.NET.Core/Decorators/IDecoratable.cs b/RGB.NET.Core/Decorators/IDecoratable.cs
index 9e2a32c..781d9f1 100644
--- a/RGB.NET.Core/Decorators/IDecoratable.cs
+++ b/RGB.NET.Core/Decorators/IDecoratable.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace RGB.NET.Core
 {
@@ -13,9 +14,14 @@ namespace RGB.NET.Core
     /// Represents a basic decoratable for a specific type of <see cref="T:RGB.NET.Core.IDecorator" />
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public interface IDecoratable<in T> : IDecoratable
+    public interface IDecoratable<T> : IDecoratable
         where T : IDecorator
     {
+        /// <summary>
+        /// Gets a readonly-list of all <see cref="IDecorator"/> attached to this <see cref="IDecoratable{T}"/>.
+        /// </summary>
+        IReadOnlyCollection<T> Decorators { get; }
+
         /// <summary>
         /// Adds an <see cref="IDecorator"/> to the <see cref="IDecoratable"/>.
         /// </summary>
diff --git a/RGB.NET.Decorators/Brush/FlashDecorator.cs b/RGB.NET.Decorators/Brush/FlashDecorator.cs
index 618b243..580fce4 100644
--- a/RGB.NET.Decorators/Brush/FlashDecorator.cs
+++ b/RGB.NET.Decorators/Brush/FlashDecorator.cs
@@ -129,7 +129,7 @@ namespace RGB.NET.Decorators.Brush
                 else
                 {
                     if ((++_repetitionCount >= Repetitions) && (Repetitions > 0))
-                        Detach<IBrush, FlashDecorator>();
+                        Detach();
                     _currentPhaseValue = Attack;
                     _currentPhase = ADSRPhase.Attack;
                 }