AuxiliaryObject is now an abstract class inheriting from an IAuxiliar…

…yObject interface. Being abstract class in the first place was stupid decision
meso-unimpressed · Nov 1, 2018 · c052e63 · c052e63
1 parent 3c02d23
commit c052e63
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/Notui/Behaviors/MouseWheelScroll.cs b/Notui/Behaviors/MouseWheelScroll.cs
@@ -27,7 +27,7 @@ public class BehaviorState : AuxiliaryObject
             public Vector2 DeltaPos = Vector2.Zero;
 
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override AuxiliaryObject Copy()
+            public override IAuxiliaryObject Copy()
             {
                 return new BehaviorState
                 {
@@ -36,7 +36,7 @@ public override AuxiliaryObject Copy()
             }
 
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override void UpdateFrom(AuxiliaryObject other)
+            public override void UpdateFrom(IAuxiliaryObject other)
             {
                 if (!(other is BehaviorState bs)) return;
                 DeltaPos = bs.DeltaPos;

diff --git a/Notui/Behaviors/MoveToTopOnTouch.cs b/Notui/Behaviors/MoveToTopOnTouch.cs
@@ -46,13 +46,13 @@ public BehaviorState(NotuiElement element)
             }
 
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override AuxiliaryObject Copy()
+            public override IAuxiliaryObject Copy()
             {
                 return new BehaviorState(_element);
             }
 
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override void UpdateFrom(AuxiliaryObject other) { }
+            public override void UpdateFrom(IAuxiliaryObject other) { }
         }
 
         /// <summary>

diff --git a/Notui/Behaviors/Sliding.cs b/Notui/Behaviors/Sliding.cs
@@ -57,7 +57,7 @@ public class BehaviorState : AuxiliaryObject, IMainlooping
             public Delay<Vector4> DelayedDeltas = new Delay<Vector4>(TimeSpan.FromSeconds(1.0));
 
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override AuxiliaryObject Copy()
+            public override IAuxiliaryObject Copy()
             {
                 return new BehaviorState
                 {
@@ -69,7 +69,7 @@ public override AuxiliaryObject Copy()
             }
 
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override void UpdateFrom(AuxiliaryObject other)
+            public override void UpdateFrom(IAuxiliaryObject other)
             {
                 if (!(other is BehaviorState bs)) return;
                 DeltaPos = bs.DeltaPos;

diff --git a/Notui/Behaviors/ValueSlider2D.cs b/Notui/Behaviors/ValueSlider2D.cs
@@ -21,13 +21,13 @@ public class ValueSlider2D : InteractionBehavior
         public class BehaviorState : AuxiliaryObject
         {
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override AuxiliaryObject Copy()
+            public override IAuxiliaryObject Copy()
             {
                 return new BehaviorState();
             }
 
             /// <inheritdoc cref="AuxiliaryObject"/>
-            public override void UpdateFrom(AuxiliaryObject other) { }
+            public override void UpdateFrom(IAuxiliaryObject other) { }
         }
 
         /// <summary>

diff --git a/Notui/ElementCommon.cs b/Notui/ElementCommon.cs
@@ -10,15 +10,20 @@
 
 namespace Notui
 {
+    /// <summary>
+    /// Base interface for auxiliary attached element object
+    /// </summary>
+    public interface IAuxiliaryObject : ICloneable<IAuxiliaryObject>, IUpdateable<IAuxiliaryObject> { }
+
     /// <summary>
     /// Base class for auxiliary attached element object
     /// </summary>
-    public abstract class AuxiliaryObject : ICloneable<AuxiliaryObject>, IUpdateable<AuxiliaryObject>
+    public abstract class AuxiliaryObject : IAuxiliaryObject
     {
         /// <inheritdoc cref="ICloneable{T}"/>
-        public abstract AuxiliaryObject Copy();
+        public abstract IAuxiliaryObject Copy();
         /// <inheritdoc cref="IUpdateable{T}"/>
-        public abstract void UpdateFrom(AuxiliaryObject other);
+        public abstract void UpdateFrom(IAuxiliaryObject other);
         /// <inheritdoc cref="ICloneable"/>
         public object Clone() => Copy();
     }
@@ -41,7 +46,7 @@ public class AttachedValues : ICloneable<AttachedValues>, IUpdateable<AttachedVa
         /// <summary>
         /// Whatever you want as long as it's clonable
         /// </summary>
-        public readonly Dictionary<string, AuxiliaryObject> Auxiliary = new Dictionary<string, AuxiliaryObject>();
+        public readonly Dictionary<string, IAuxiliaryObject> Auxiliary = new Dictionary<string, IAuxiliaryObject>();
 
         /// <inheritdoc cref="ICloneable{T}"/>
         public AttachedValues Copy()
@@ -151,7 +156,7 @@ public interface IElementCommon
         /// <summary>
         /// Optional environment specific object for implementations so Value is not polluted
         /// </summary>
-        AuxiliaryObject EnvironmentObject { get; set; }
+        IAuxiliaryObject EnvironmentObject { get; set; }
 
         /// <summary>
         /// Hittest is only successful if parent hittest is also successful

diff --git a/Notui/ElementPrototype.cs b/Notui/ElementPrototype.cs
@@ -107,7 +107,7 @@ public static ElementPrototype CreateFromInstance(NotuiElement element, bool new
         /// <inheritdoc cref="IElementCommon"/>
         public AttachedValues Value { get; set; }
         /// <inheritdoc cref="IElementCommon"/>
-        public AuxiliaryObject EnvironmentObject { get; set; }
+        public IAuxiliaryObject EnvironmentObject { get; set; }
         /// <inheritdoc cref="IElementCommon"/>
         public bool OnlyHitIfParentIsHit { get; set; }
 

diff --git a/Notui/InteractionBehavior.cs b/Notui/InteractionBehavior.cs
@@ -50,7 +50,7 @@ public abstract class InteractionBehavior
         /// <typeparam name="T">The type of the behavior state</typeparam>
         /// <param name="element"></param>
         /// <returns></returns>
-        public T GetState<T>(NotuiElement element) where T : AuxiliaryObject
+        public T GetState<T>(NotuiElement element) where T : IAuxiliaryObject
         {
             if (element.Value == null)
                 element.Value = new AttachedValues();
@@ -71,7 +71,7 @@ public T GetState<T>(NotuiElement element) where T : AuxiliaryObject
         /// <param name="element"></param>
         /// <param name="value">The state to be assigned</param>
         /// <returns></returns>
-        public void SetState(NotuiElement element, AuxiliaryObject value)
+        public void SetState(NotuiElement element, IAuxiliaryObject value)
         {
             if (element.Value == null)
                 element.Value = new AttachedValues();

diff --git a/Notui/NotuiElement.cs b/Notui/NotuiElement.cs
@@ -100,7 +100,7 @@ public abstract class NotuiElement : IElementCommon, ICloneable<NotuiElement>, I
         /// <inheritdoc />
         public AttachedValues Value { get; set; }
         /// <inheritdoc />
-        public AuxiliaryObject EnvironmentObject { get; set; }
+        public IAuxiliaryObject EnvironmentObject { get; set; }
         /// <inheritdoc />
         public bool OnlyHitIfParentIsHit { get; set; }