Condition operators - Marked built-in operators as internal

Display conditions - Added docs to the service and profile types
Color gradient - Added docs
Storage - Moved profile entities to separate namespaces
Data bindings - Added entities to storage
Data bindings - Started implementing in the core

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
@@ -74,16 +75,16 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             if (type == "Static")
             {
                 if (!IsListGroup)
-                    DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, PredicateType.Static));
+                    DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, ProfileRightSideType.Static));
                 else
-                    DisplayConditionGroup.AddChild(new DisplayConditionListPredicate(DisplayConditionGroup, PredicateType.Static));
+                    DisplayConditionGroup.AddChild(new DisplayConditionListPredicate(DisplayConditionGroup, ProfileRightSideType.Static));
             }
             else if (type == "Dynamic")
             {
                 if (!IsListGroup)
-                    DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, PredicateType.Dynamic));
+                    DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, ProfileRightSideType.Dynamic));
                 else
-                    DisplayConditionGroup.AddChild(new DisplayConditionListPredicate(DisplayConditionGroup, PredicateType.Dynamic));
+                    DisplayConditionGroup.AddChild(new DisplayConditionListPredicate(DisplayConditionGroup, ProfileRightSideType.Dynamic));
             }
             else if (type == "List" && !IsListGroup)
                 DisplayConditionGroup.AddChild(new DisplayConditionList(DisplayConditionGroup));

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
 using System.Windows.Input;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
@@ -14,7 +15,6 @@ using Artemis.UI.Exceptions;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
 using Artemis.UI.Shared.DataModelVisualization;
 using Artemis.UI.Shared.DataModelVisualization.Shared;
-using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Utilities;
 using Stylet;
@@ -69,7 +69,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         }
 
         public DisplayConditionListPredicate DisplayConditionListPredicate => (DisplayConditionListPredicate) Model;
-        public bool ShowRightSidePropertySelection => DisplayConditionListPredicate.PredicateType == PredicateType.Dynamic;
+        public bool ShowRightSidePropertySelection => DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Dynamic;
         public bool CanActivateRightSideInputViewModel => SelectedLeftSideProperty?.PropertyInfo != null;
         public PluginSetting<bool> ShowDataModelValues { get; }
 
@@ -201,7 +201,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             var listDataModelGuid = DisplayConditionListPredicate.ListDataModel.PluginInfo.Guid;
 
             // If static, only allow selecting properties also supported by input
-            if (DisplayConditionListPredicate.PredicateType == PredicateType.Static)
+            if (DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
 
             // Determine the left side property first
@@ -216,7 +216,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             SelectedOperator = DisplayConditionListPredicate.Operator;
 
             // Determine the right side
-            if (DisplayConditionListPredicate.PredicateType == PredicateType.Dynamic)
+            if (DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Dynamic)
             {
                 SelectedRightSideProperty = RightSideDataModel.GetChildByPath(listDataModelGuid, DisplayConditionListPredicate.RightPropertyPath);
                 RightSideDataModel.ApplyTypeFilter(true, leftSideType);
@@ -310,7 +310,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         private void LeftDataModelUpdateRequested(object sender, EventArgs e)
         {
-            if (DisplayConditionListPredicate.PredicateType == PredicateType.Static)
+            if (DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
         }
 

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs

@@ -3,13 +3,13 @@ using System.Collections;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Timers;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
 using Artemis.UI.Shared.DataModelVisualization.Shared;
-using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Utilities;
 using Humanizer;
@@ -18,13 +18,13 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
     public class DisplayConditionListViewModel : DisplayConditionViewModel
     {
-        private readonly IProfileEditorService _profileEditorService;
         private readonly IDataModelUIService _dataModelUIService;
         private readonly IDisplayConditionsVmFactory _displayConditionsVmFactory;
+        private readonly IProfileEditorService _profileEditorService;
+        private readonly Timer _updateTimer;
         private bool _isInitialized;
         private DataModelListViewModel _selectedListProperty;
         private DataModelPropertiesViewModel _targetDataModel;
-        private readonly Timer _updateTimer;
 
         public DisplayConditionListViewModel(
             DisplayConditionList displayConditionList,
@@ -73,7 +73,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         }
 
         public string SelectedListOperator => DisplayConditionList.ListOperator.Humanize();
-        
+
         public void SelectListOperator(string type)
         {
             var enumValue = Enum.Parse<ListOperator>(type);
@@ -86,9 +86,9 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         public void AddCondition(string type)
         {
             if (type == "Static")
-                DisplayConditionList.AddChild(new DisplayConditionPredicate(DisplayConditionList, PredicateType.Static));
+                DisplayConditionList.AddChild(new DisplayConditionPredicate(DisplayConditionList, ProfileRightSideType.Static));
             else if (type == "Dynamic")
-                DisplayConditionList.AddChild(new DisplayConditionPredicate(DisplayConditionList, PredicateType.Dynamic));
+                DisplayConditionList.AddChild(new DisplayConditionPredicate(DisplayConditionList, ProfileRightSideType.Dynamic));
 
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
@@ -125,26 +125,6 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             IsInitialized = true;
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            _updateTimer.Stop();
-            _updateTimer.Elapsed -= OnUpdateTimerOnElapsed;
-        }
-
-        private void OnUpdateTimerOnElapsed(object sender, ElapsedEventArgs e)
-        {
-            if (TargetDataModelOpen)
-            {
-                TargetDataModel?.Update(_dataModelUIService);
-                SelectedListProperty?.Update(_dataModelUIService);
-            }
-        }
-
-        private void TargetDataModelUpdateRequested(object sender, EventArgs e)
-        {
-            TargetDataModel.ApplyTypeFilter(true, typeof(IList));
-        }
-
         public void ApplyList()
         {
             DisplayConditionList.UpdateList(SelectedListProperty.DataModel, SelectedListProperty.PropertyPath);
@@ -198,6 +178,26 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
                 childViewModel.Update();
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            _updateTimer.Stop();
+            _updateTimer.Elapsed -= OnUpdateTimerOnElapsed;
+        }
+
+        private void OnUpdateTimerOnElapsed(object sender, ElapsedEventArgs e)
+        {
+            if (TargetDataModelOpen)
+            {
+                TargetDataModel?.Update(_dataModelUIService);
+                SelectedListProperty?.Update(_dataModelUIService);
+            }
+        }
+
+        private void TargetDataModelUpdateRequested(object sender, EventArgs e)
+        {
+            TargetDataModel.ApplyTypeFilter(true, typeof(IList));
+        }
+
 
         private void ExecuteSelectListProperty(object context)
         {

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
 using System.Windows.Input;
+using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
@@ -13,7 +14,6 @@ using Artemis.UI.Events;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
 using Artemis.UI.Shared.DataModelVisualization;
 using Artemis.UI.Shared.DataModelVisualization.Shared;
-using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Utilities;
 using Stylet;
@@ -26,6 +26,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private readonly IDataModelUIService _dataModelUIService;
         private readonly IEventAggregator _eventAggregator;
         private readonly IProfileEditorService _profileEditorService;
+        private readonly Timer _updateTimer;
         private bool _isInitialized;
         private DataModelPropertiesViewModel _leftSideDataModel;
         private BindableCollection<DisplayConditionOperator> _operators;
@@ -38,7 +39,6 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private DataModelVisualizationViewModel _selectedRightSideProperty;
 
         private List<Type> _supportedInputTypes;
-        private readonly Timer _updateTimer;
 
         public DisplayConditionPredicateViewModel(
             DisplayConditionPredicate displayConditionPredicate,
@@ -68,7 +68,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         }
 
         public DisplayConditionPredicate DisplayConditionPredicate => (DisplayConditionPredicate) Model;
-        public bool ShowRightSidePropertySelection => DisplayConditionPredicate.PredicateType == PredicateType.Dynamic;
+        public bool ShowRightSidePropertySelection => DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic;
         public bool CanActivateRightSideInputViewModel => SelectedLeftSideProperty?.PropertyInfo != null;
         public PluginSetting<bool> ShowDataModelValues { get; }
 
@@ -199,11 +199,11 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public override void Update()
         {
-            if (LeftSideDataModel == null || DisplayConditionPredicate.PredicateType == PredicateType.Dynamic && RightSideDataModel == null)
+            if (LeftSideDataModel == null || DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic && RightSideDataModel == null)
                 return;
 
             // If static, only allow selecting properties also supported by input
-            if (DisplayConditionPredicate.PredicateType == PredicateType.Static)
+            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
 
             // Determine the left side property first
@@ -218,7 +218,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             SelectedOperator = DisplayConditionPredicate.Operator;
 
             // Determine the right side
-            if (DisplayConditionPredicate.PredicateType == PredicateType.Dynamic)
+            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
             {
                 SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Right);
                 RightSideDataModel.ApplyTypeFilter(true, leftSideType);
@@ -300,7 +300,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private void RightDataModelUpdateRequested(object sender, EventArgs e)
         {
             var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
-            if (DisplayConditionPredicate.PredicateType == PredicateType.Dynamic)
+            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
                 SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Right);
 
             // With the data model updated, also reapply the filter
@@ -309,7 +309,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         private void LeftDataModelUpdateRequested(object sender, EventArgs e)
         {
-            if (DisplayConditionPredicate.PredicateType == PredicateType.Static)
+            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
         }