Core - Corrected disposable pattern usage

Core - Further nullable refactoring..

src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs

@@ -7,9 +7,9 @@ namespace Artemis.Core
     public class DataBinding<TLayerProperty, TProperty> : IDataBinding
     {
         private TProperty _currentValue = default!;
-        private TProperty _previousValue = default!;
         private bool _disposed;
         private TimeSpan _easingProgress;
+        private TProperty _previousValue = default!;
 
         internal DataBinding(DataBindingRegistration<TLayerProperty, TProperty> dataBindingRegistration)
         {
@@ -98,6 +98,24 @@ namespace Artemis.Core
             return Registration?.PropertyExpression.ReturnType;
         }
 
+        /// <summary>
+        ///     Updates the smoothing progress of the data binding
+        /// </summary>
+        /// <param name="delta">The delta to apply during update</param>
+        public void UpdateWithDelta(TimeSpan delta)
+        {
+            if (_disposed)
+                throw new ObjectDisposedException("DataBinding");
+
+            // Data bindings cannot go back in time like brushes
+            if (delta < TimeSpan.Zero)
+                delta = TimeSpan.Zero;
+
+            _easingProgress = _easingProgress.Add(delta);
+            if (_easingProgress > EasingTime)
+                _easingProgress = EasingTime;
+        }
+
         private void ResetEasing(TProperty value)
         {
             _previousValue = GetInterpolatedValue();
@@ -143,24 +161,6 @@ namespace Artemis.Core
             UpdateWithDelta(timeline.Delta);
         }
 
-        /// <summary>
-        ///     Updates the smoothing progress of the data binding
-        /// </summary>
-        /// <param name="delta">The delta to apply during update</param>
-        public void UpdateWithDelta(TimeSpan delta)
-        {
-            if (_disposed)
-                throw new ObjectDisposedException("DataBinding");
-
-            // Data bindings cannot go back in time like brushes
-            if (delta < TimeSpan.Zero)
-                delta = TimeSpan.Zero;
-
-            _easingProgress = _easingProgress.Add(delta);
-            if (_easingProgress > EasingTime)
-                _easingProgress = EasingTime;
-        }
-
         /// <inheritdoc />
         public void Apply()
         {
@@ -175,16 +175,36 @@ namespace Artemis.Core
             Converter.ApplyValue(value);
         }
 
+        #region IDisposable
+
+        /// <summary>
+        ///     Releases the unmanaged resources used by the object and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        ///     <see langword="true" /> to release both managed and unmanaged resources;
+        ///     <see langword="false" /> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _disposed = true;
+
+                if (Registration != null)
+                    Registration.DataBinding = null;
+                DataBindingMode?.Dispose();
+            }
+        }
+
         /// <inheritdoc />
         public void Dispose()
         {
-            _disposed = true;
-
-            if (Registration != null) 
-                Registration.DataBinding = null;
-            DataBindingMode?.Dispose();
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
+        #endregion
+
         #region Mode management
 
         /// <summary>
@@ -255,7 +275,7 @@ namespace Artemis.Core
                 LayerProperty.Entity.DataBindingEntities.Add(Entity);
 
             // Don't save an invalid state
-            if (Registration != null) 
+            if (Registration != null)
                 Entity.TargetExpression = Registration.PropertyExpression.ToString();
 
             Entity.EasingTime = EasingTime;

src/Artemis.Core/Models/Profile/DataBindings/Modes/Conditional/ConditionalDataBinding.cs

@@ -43,13 +43,29 @@ namespace Artemis.Core
 
         #region IDisposable
 
+        /// <summary>
+        ///     Releases the unmanaged resources used by the object and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        ///     <see langword="true" /> to release both managed and unmanaged resources;
+        ///     <see langword="false" /> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _disposed = true;
+
+                foreach (DataBindingCondition<TLayerProperty, TProperty> dataBindingCondition in Conditions)
+                    dataBindingCondition.Dispose();
+            }
+        }
+        
         /// <inheritdoc />
         public void Dispose()
         {
-            _disposed = true;
-
-            foreach (DataBindingCondition<TLayerProperty, TProperty> dataBindingCondition in Conditions)
-                dataBindingCondition.Dispose();
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         #endregion

src/Artemis.Core/Models/Profile/DataBindings/Modes/Conditional/DataBindingCondition.cs

@@ -92,12 +92,31 @@ namespace Artemis.Core
             Order = Entity.Order;
         }
 
+        #region IDisposable
+
+        /// <summary>
+        ///     Releases the unmanaged resources used by the object and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        ///     <see langword="true" /> to release both managed and unmanaged resources;
+        ///     <see langword="false" /> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _disposed = true;
+                ConditionalDataBinding.Dispose();
+            }
+        }
+
         /// <inheritdoc />
         public void Dispose()
         {
-            _disposed = true;
-
-            Condition.Dispose();
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
+
+        #endregion
     }
 }

src/Artemis.Core/Models/Profile/DataBindings/Modes/Direct/DataBindingModifier.cs

@@ -270,17 +270,37 @@ namespace Artemis.Core
             // Parameter is done during initialize
         }
 
+        #region IDisposable
+
+        /// <summary>
+        ///     Releases the unmanaged resources used by the object and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        ///     <see langword="true" /> to release both managed and unmanaged resources;
+        ///     <see langword="false" /> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _disposed = true;
+
+                DataBindingModifierTypeStore.DataBindingModifierAdded -= DataBindingModifierTypeStoreOnDataBindingModifierAdded;
+                DataBindingModifierTypeStore.DataBindingModifierRemoved -= DataBindingModifierTypeStoreOnDataBindingModifierRemoved;
+
+                ParameterPath?.Dispose();
+            }
+        }
+
         /// <inheritdoc />
         public void Dispose()
         {
-            _disposed = true;
-
-            DataBindingModifierTypeStore.DataBindingModifierAdded -= DataBindingModifierTypeStoreOnDataBindingModifierAdded;
-            DataBindingModifierTypeStore.DataBindingModifierRemoved -= DataBindingModifierTypeStoreOnDataBindingModifierRemoved;
-
-            ParameterPath?.Dispose();
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
+        #endregion
+
         #region Event handlers
 
         private void DataBindingModifierTypeStoreOnDataBindingModifierAdded(object? sender, DataBindingModifierTypeStoreEvent e)

src/Artemis.Core/Models/Profile/DataBindings/Modes/DirectDataBinding.cs

@@ -54,15 +54,31 @@ namespace Artemis.Core
 
         #region IDisposable
 
+        /// <summary>
+        ///     Releases the unmanaged resources used by the object and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        ///     <see langword="true" /> to release both managed and unmanaged resources;
+        ///     <see langword="false" /> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _disposed = true;
+
+                foreach (DataBindingModifier<TLayerProperty, TProperty> dataBindingModifier in Modifiers)
+                    dataBindingModifier.Dispose();
+
+                SourcePath?.Dispose();
+            }
+        }
+
         /// <inheritdoc />
         public void Dispose()
         {
-            _disposed = true;
-
-            foreach (DataBindingModifier<TLayerProperty, TProperty> dataBindingModifier in Modifiers)
-                dataBindingModifier.Dispose();
-
-            SourcePath?.Dispose();
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         #endregion