Core - Fixed data model namespaces

Modules - Added IsPropertyInUse API
UI - Properly dispose data model paths wherever they are used

src/Artemis.UI.Shared/DataModelVisualization/DataModelDisplayViewModel.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Stylet;
 
 namespace Artemis.UI.Shared

src/Artemis.UI.Shared/DataModelVisualization/DataModelInputViewModel.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Stylet;
 
 namespace Artemis.UI.Shared

src/Artemis.UI.Shared/DataModelVisualization/Input/DataModelDynamicViewModel.cs

@@ -272,6 +272,7 @@ namespace Artemis.UI.Shared.Input
                 _updateTimer.Dispose();
                 _updateTimer.Elapsed -= OnUpdateTimerOnElapsed;
 
+                DataModelViewModel?.Dispose();
                 DataModelPath?.Dispose();
             }
         }

src/Artemis.UI.Shared/DataModelVisualization/Input/DataModelStaticViewModel.cs

@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Artemis.UI.Shared.Services;
 using MaterialDesignColors.ColorManipulation;
 using Stylet;

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelEventViewModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs

@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Windows.Documents;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Artemis.UI.Shared.Services;
 using Stylet;
 

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs

@@ -1,6 +1,6 @@
 using System;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertyViewModel.cs

@@ -1,6 +1,6 @@
 using System;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
+using Artemis.Core.Modules;
 using Artemis.UI.Shared.Services;
 using Stylet;
 
@@ -13,7 +14,7 @@ namespace Artemis.UI.Shared
     /// <summary>
     ///     Represents a base class for a view model that visualizes a part of the data model
     /// </summary>
-    public abstract class DataModelVisualizationViewModel : PropertyChangedBase
+    public abstract class DataModelVisualizationViewModel : PropertyChangedBase, IDisposable
     {
         private const int MaxDepth = 4;
         private BindableCollection<DataModelVisualizationViewModel> _children;
@@ -22,6 +23,7 @@ namespace Artemis.UI.Shared
         private bool _isVisualizationExpanded;
         private DataModelVisualizationViewModel? _parent;
         private DataModelPropertyAttribute? _propertyDescription;
+        private bool _populatedStaticChildren;
 
         internal DataModelVisualizationViewModel(DataModel? dataModel, DataModelVisualizationViewModel? parent, DataModelPath? dataModelPath)
         {
@@ -206,21 +208,26 @@ namespace Artemis.UI.Shared
             if (modelType == null)
                 throw new ArtemisSharedUIException("Failed to populate data model visualization properties, couldn't get a property type");
 
-            // Add missing static children
-            foreach (PropertyInfo propertyInfo in modelType.GetProperties(BindingFlags.Public | BindingFlags.Instance).OrderBy(t => t.MetadataToken))
+            // Add missing static children only once, they're static after all
+            if (!_populatedStaticChildren)
             {
-                string childPath = AppendToPath(propertyInfo.Name);
-                if (Children.Any(c => c.Path != null && c.Path.Equals(childPath)))
-                    continue;
-                if (propertyInfo.GetCustomAttribute<DataModelIgnoreAttribute>() != null)
-                    continue;
-                MethodInfo? getMethod = propertyInfo.GetGetMethod();
-                if (getMethod == null || getMethod.GetParameters().Any())
-                    continue;
+                foreach (PropertyInfo propertyInfo in modelType.GetProperties(BindingFlags.Public | BindingFlags.Instance).OrderBy(t => t.MetadataToken))
+                {
+                    string childPath = AppendToPath(propertyInfo.Name);
+                    if (Children.Any(c => c.Path != null && c.Path.Equals(childPath)))
+                        continue;
+                    if (propertyInfo.GetCustomAttribute<DataModelIgnoreAttribute>() != null)
+                        continue;
+                    MethodInfo? getMethod = propertyInfo.GetGetMethod();
+                    if (getMethod == null || getMethod.GetParameters().Any())
+                        continue;
 
-                DataModelVisualizationViewModel? child = CreateChild(dataModelUIService, childPath, GetChildDepth());
-                if (child != null)
-                    Children.Add(child);
+                    DataModelVisualizationViewModel? child = CreateChild(dataModelUIService, childPath, GetChildDepth());
+                    if (child != null)
+                        Children.Add(child);
+                }
+
+                _populatedStaticChildren = true;
             }
 
             // Remove static children that should be hidden
@@ -302,7 +309,14 @@ namespace Artemis.UI.Shared
 
         private string AppendToPath(string toAppend)
         {
-            return !string.IsNullOrEmpty(Path) ? $"{Path}.{toAppend}" : toAppend;
+            if (string.IsNullOrEmpty(Path))
+                return toAppend;
+
+            StringBuilder builder = new();
+            builder.Append(Path);
+            builder.Append(".");
+            builder.Append(toAppend);
+            return builder.ToString();
         }
 
         private void RequestUpdate()
@@ -327,5 +341,33 @@ namespace Artemis.UI.Shared
         }
 
         #endregion
+
+        #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)
+            {
+                DataModelPath?.Dispose();
+                foreach (DataModelVisualizationViewModel dataModelVisualizationViewModel in Children) 
+                    dataModelVisualizationViewModel.Dispose(true);
+            }
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        #endregion
     }
 }

src/Artemis.UI.Shared/Ninject/Factories/ISharedVMFactory.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Artemis.Core.DataModelExpansions;
 using Artemis.Core.Modules;
 using Artemis.UI.Shared.Input;
 

src/Artemis.UI.Shared/Services/DataModelUIService.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
 using Artemis.Core.Modules;
 using Artemis.Core.Services;
 using Artemis.UI.Shared.DefaultTypes.DataModel.Display;

src/Artemis.UI.Shared/Services/Interfaces/IDataModelUIService.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
 using Artemis.Core.Modules;
 using Artemis.UI.Shared.Input;