Data model - Improved encapsulation

Conditions - Renamed from DisplayConditions to DataModelConditions to better match their nature
Core - More documentation

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs

@@ -5,12 +5,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract
 {
     public abstract class DisplayConditionViewModel : Conductor<DisplayConditionViewModel>.Collection.AllActive
     {
-        protected DisplayConditionViewModel(DisplayConditionPart model)
+        protected DisplayConditionViewModel(DataModelConditionPart model)
         {
             Model = model;
         }
 
-        public DisplayConditionPart Model { get; }
+        public DataModelConditionPart Model { get; }
 
         public abstract void Update();
 

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

@@ -17,11 +17,11 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private bool _isInitialized;
         private bool _isRootGroup;
 
-        public DisplayConditionGroupViewModel(DisplayConditionGroup displayConditionGroup,
+        public DisplayConditionGroupViewModel(DataModelConditionGroup dataModelConditionGroup,
             bool isListGroup,
             IProfileEditorService profileEditorService,
             IDisplayConditionsVmFactory displayConditionsVmFactory)
-            : base(displayConditionGroup)
+            : base(dataModelConditionGroup)
         {
             IsListGroup = isListGroup;
             _profileEditorService = profileEditorService;
@@ -38,7 +38,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public bool IsListGroup { get; }
 
-        public DisplayConditionGroup DisplayConditionGroup => (DisplayConditionGroup) Model;
+        public DataModelConditionGroup DataModelConditionGroup => (DataModelConditionGroup) Model;
 
         public bool IsRootGroup
         {
@@ -53,12 +53,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         }
 
         public bool DisplayBooleanOperator => Items.Count > 1;
-        public string SelectedBooleanOperator => DisplayConditionGroup.BooleanOperator.Humanize();
+        public string SelectedBooleanOperator => DataModelConditionGroup.BooleanOperator.Humanize();
 
         public void SelectBooleanOperator(string type)
         {
             var enumValue = Enum.Parse<BooleanOperator>(type);
-            DisplayConditionGroup.BooleanOperator = enumValue;
+            DataModelConditionGroup.BooleanOperator = enumValue;
             NotifyOfPropertyChange(nameof(SelectedBooleanOperator));
 
             _profileEditorService.UpdateSelectedProfileElement();
@@ -69,19 +69,19 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             if (type == "Static")
             {
                 if (!IsListGroup)
-                    DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, ProfileRightSideType.Static));
+                    DataModelConditionGroup.AddChild(new DataModelConditionPredicate(DataModelConditionGroup, ProfileRightSideType.Static));
                 else
-                    DisplayConditionGroup.AddChild(new DisplayConditionListPredicate(DisplayConditionGroup, ProfileRightSideType.Static));
+                    DataModelConditionGroup.AddChild(new DataModelConditionListPredicate(DataModelConditionGroup, ProfileRightSideType.Static));
             }
             else if (type == "Dynamic")
             {
                 if (!IsListGroup)
-                    DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, ProfileRightSideType.Dynamic));
+                    DataModelConditionGroup.AddChild(new DataModelConditionPredicate(DataModelConditionGroup, ProfileRightSideType.Dynamic));
                 else
-                    DisplayConditionGroup.AddChild(new DisplayConditionListPredicate(DisplayConditionGroup, ProfileRightSideType.Dynamic));
+                    DataModelConditionGroup.AddChild(new DataModelConditionListPredicate(DataModelConditionGroup, ProfileRightSideType.Dynamic));
             }
             else if (type == "List" && !IsListGroup)
-                DisplayConditionGroup.AddChild(new DisplayConditionList(DisplayConditionGroup));
+                DataModelConditionGroup.AddChild(new DataModelConditionList(DataModelConditionGroup));
 
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
@@ -89,7 +89,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public void AddGroup()
         {
-            DisplayConditionGroup.AddChild(new DisplayConditionGroup(DisplayConditionGroup));
+            DataModelConditionGroup.AddChild(new DataModelConditionGroup(DataModelConditionGroup));
 
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
@@ -100,7 +100,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             NotifyOfPropertyChange(nameof(SelectedBooleanOperator));
 
             // Remove VMs of effects no longer applied on the layer
-            var toRemove = Items.Where(c => !DisplayConditionGroup.Children.Contains(c.Model)).ToList();
+            var toRemove = Items.Where(c => !DataModelConditionGroup.Children.Contains(c.Model)).ToList();
             // Using RemoveRange breaks our lovely animations
             foreach (var displayConditionViewModel in toRemove)
                 Items.Remove(displayConditionViewModel);
@@ -112,17 +112,17 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
                 switch (childModel)
                 {
-                    case DisplayConditionGroup displayConditionGroup:
+                    case DataModelConditionGroup displayConditionGroup:
                         Items.Add(_displayConditionsVmFactory.DisplayConditionGroupViewModel(displayConditionGroup, IsListGroup));
                         break;
-                    case DisplayConditionList displayConditionListPredicate:
+                    case DataModelConditionList displayConditionListPredicate:
                         Items.Add(_displayConditionsVmFactory.DisplayConditionListViewModel(displayConditionListPredicate));
                         break;
-                    case DisplayConditionPredicate displayConditionPredicate:
+                    case DataModelConditionPredicate displayConditionPredicate:
                         if (!IsListGroup)
                             Items.Add(_displayConditionsVmFactory.DisplayConditionPredicateViewModel(displayConditionPredicate));
                         break;
-                    case DisplayConditionListPredicate displayConditionListPredicate:
+                    case DataModelConditionListPredicate displayConditionListPredicate:
                         if (IsListGroup)
                             Items.Add(_displayConditionsVmFactory.DisplayConditionListPredicateViewModel(displayConditionListPredicate));
                         break;

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

@@ -38,12 +38,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private List<Type> _supportedInputTypes;
 
         public DisplayConditionListPredicateViewModel(
-            DisplayConditionListPredicate displayConditionListPredicate,
+            DataModelConditionListPredicate dataModelConditionListPredicate,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IConditionOperatorService conditionOperatorService,
             ISettingsService settingsService,
-            IEventAggregator eventAggregator) : base(displayConditionListPredicate)
+            IEventAggregator eventAggregator) : base(dataModelConditionListPredicate)
         {
             _profileEditorService = profileEditorService;
             _dataModelUIService = dataModelUIService;
@@ -63,8 +63,8 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             Task.Run(Initialize);
         }
 
-        public DisplayConditionListPredicate DisplayConditionListPredicate => (DisplayConditionListPredicate) Model;
-        public bool ShowRightSidePropertySelection => DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Dynamic;
+        public DataModelConditionListPredicate DataModelConditionListPredicate => (DataModelConditionListPredicate) Model;
+        public bool ShowRightSidePropertySelection => DataModelConditionListPredicate.PredicateType == ProfileRightSideType.Dynamic;
         public bool CanActivateRightSideInputViewModel => SelectedLeftSideProperty?.PropertyInfo != null;
         public PluginSetting<bool> ShowDataModelValues { get; }
 
@@ -193,45 +193,45 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             if (LeftSideDataModel == null || RightSideDataModel == null)
                 return;
 
-            var listDataModelGuid = DisplayConditionListPredicate.ListDataModel.PluginInfo.Guid;
+            var listDataModelGuid = DataModelConditionListPredicate.ListDataModel.PluginInfo.Guid;
 
             // If static, only allow selecting properties also supported by input
-            if (DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Static)
+            if (DataModelConditionListPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
 
             // Determine the left side property first
-            SelectedLeftSideProperty = LeftSideDataModel.GetChildByPath(listDataModelGuid, DisplayConditionListPredicate.LeftPropertyPath);
+            SelectedLeftSideProperty = LeftSideDataModel.GetChildByPath(listDataModelGuid, DataModelConditionListPredicate.LeftPropertyPath);
             var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
 
             // Get the supported operators
             Operators.Clear();
             Operators.AddRange(_conditionOperatorService.GetConditionOperatorsForType(leftSideType));
-            if (DisplayConditionListPredicate.Operator == null)
-                DisplayConditionListPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.SupportsType(leftSideType)));
-            SelectedOperator = DisplayConditionListPredicate.Operator;
+            if (DataModelConditionListPredicate.Operator == null)
+                DataModelConditionListPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.SupportsType(leftSideType)));
+            SelectedOperator = DataModelConditionListPredicate.Operator;
 
             // Determine the right side
-            if (DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Dynamic)
+            if (DataModelConditionListPredicate.PredicateType == ProfileRightSideType.Dynamic)
             {
-                SelectedRightSideProperty = RightSideDataModel.GetChildByPath(listDataModelGuid, DisplayConditionListPredicate.RightPropertyPath);
+                SelectedRightSideProperty = RightSideDataModel.GetChildByPath(listDataModelGuid, DataModelConditionListPredicate.RightPropertyPath);
                 RightSideDataModel.ApplyTypeFilter(true, leftSideType);
             }
             else
-                RightStaticValue = DisplayConditionListPredicate.RightStaticValue;
+                RightStaticValue = DataModelConditionListPredicate.RightStaticValue;
         }
 
         public void ApplyLeftSide()
         {
-            DisplayConditionListPredicate.UpdateLeftSide(SelectedLeftSideProperty.PropertyPath);
+            DataModelConditionListPredicate.UpdateLeftSide(SelectedLeftSideProperty.PropertyPath);
             _profileEditorService.UpdateSelectedProfileElement();
 
-            SelectedOperator = DisplayConditionListPredicate.Operator;
+            SelectedOperator = DataModelConditionListPredicate.Operator;
             Update();
         }
 
         public void ApplyRightSideDynamic()
         {
-            DisplayConditionListPredicate.UpdateRightSideDynamic(SelectedRightSideProperty.PropertyPath);
+            DataModelConditionListPredicate.UpdateRightSideDynamic(SelectedRightSideProperty.PropertyPath);
             _profileEditorService.UpdateSelectedProfileElement();
 
             Update();
@@ -241,7 +241,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         {
             if (isSubmitted)
             {
-                DisplayConditionListPredicate.UpdateRightSideStatic(value);
+                DataModelConditionListPredicate.UpdateRightSideStatic(value);
                 _profileEditorService.UpdateSelectedProfileElement();
 
                 Update();
@@ -255,7 +255,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public void ApplyOperator()
         {
-            DisplayConditionListPredicate.UpdateOperator(SelectedOperator);
+            DataModelConditionListPredicate.UpdateOperator(SelectedOperator);
             _profileEditorService.UpdateSelectedProfileElement();
 
             Update();
@@ -270,7 +270,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             RightSideInputViewModel = _dataModelUIService.GetDataModelInputViewModel(
                 SelectedLeftSideProperty.PropertyInfo.PropertyType,
                 SelectedLeftSideProperty.PropertyDescription,
-                DisplayConditionListPredicate.RightStaticValue,
+                DataModelConditionListPredicate.RightStaticValue,
                 ApplyRightSideStatic
             );
             _eventAggregator.Subscribe(this);
@@ -286,12 +286,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         private void RightDataModelUpdateRequested(object sender, EventArgs e)
         {
-            var listDataModelGuid = DisplayConditionListPredicate.ListDataModel.PluginInfo.Guid;
+            var listDataModelGuid = DataModelConditionListPredicate.ListDataModel.PluginInfo.Guid;
             var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
 
             // If the right side property is missing it may be available now that the data model has been updated
-            if (SelectedRightSideProperty == null && DisplayConditionListPredicate.RightPropertyPath != null)
-                SelectedRightSideProperty = RightSideDataModel.GetChildByPath(listDataModelGuid, DisplayConditionListPredicate.RightPropertyPath);
+            if (SelectedRightSideProperty == null && DataModelConditionListPredicate.RightPropertyPath != null)
+                SelectedRightSideProperty = RightSideDataModel.GetChildByPath(listDataModelGuid, DataModelConditionListPredicate.RightPropertyPath);
 
             // With the data model updated, also reapply the filter
             RightSideDataModel.ApplyTypeFilter(true, leftSideType);
@@ -299,19 +299,19 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         private void LeftDataModelUpdateRequested(object sender, EventArgs e)
         {
-            if (DisplayConditionListPredicate.PredicateType == ProfileRightSideType.Static)
+            if (DataModelConditionListPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
         }
 
         private DataModelVisualizationViewModel GetListDataModel()
         {
-            if (DisplayConditionListPredicate.ListDataModel == null || DisplayConditionListPredicate.ListPropertyPath == null)
+            if (DataModelConditionListPredicate.ListDataModel == null || DataModelConditionListPredicate.ListPropertyPath == null)
                 throw new ArtemisUIException("Cannot create a list predicate without first selecting a target list");
 
             var dataModel = _dataModelUIService.GetPluginDataModelVisualization(_profileEditorService.GetCurrentModule(), true);
             var listDataModel = (DataModelListViewModel) dataModel.GetChildByPath(
-                DisplayConditionListPredicate.ListDataModel.PluginInfo.Guid,
-                DisplayConditionListPredicate.ListPropertyPath
+                DataModelConditionListPredicate.ListDataModel.PluginInfo.Guid,
+                DataModelConditionListPredicate.ListPropertyPath
             );
 
             return listDataModel.GetListTypeViewModel(_dataModelUIService);

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

@@ -25,12 +25,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private DataModelPropertiesViewModel _targetDataModel;
 
         public DisplayConditionListViewModel(
-            DisplayConditionList displayConditionList,
+            DataModelConditionList dataModelConditionList,
             DisplayConditionViewModel parent,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IDisplayConditionsVmFactory displayConditionsVmFactory,
-            ISettingsService settingsService) : base(displayConditionList)
+            ISettingsService settingsService) : base(dataModelConditionList)
         {
             _profileEditorService = profileEditorService;
             _dataModelUIService = dataModelUIService;
@@ -48,7 +48,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         public DelegateCommand SelectListPropertyCommand { get; }
         public PluginSetting<bool> ShowDataModelValues { get; }
 
-        public DisplayConditionList DisplayConditionList => (DisplayConditionList) Model;
+        public DataModelConditionList DataModelConditionList => (DataModelConditionList) Model;
 
         public bool IsInitialized
         {
@@ -70,12 +70,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _selectedListProperty, value);
         }
 
-        public string SelectedListOperator => DisplayConditionList.ListOperator.Humanize();
+        public string SelectedListOperator => DataModelConditionList.ListOperator.Humanize();
 
         public void SelectListOperator(string type)
         {
             var enumValue = Enum.Parse<ListOperator>(type);
-            DisplayConditionList.ListOperator = enumValue;
+            DataModelConditionList.ListOperator = enumValue;
             NotifyOfPropertyChange(nameof(SelectedListOperator));
 
             _profileEditorService.UpdateSelectedProfileElement();
@@ -84,9 +84,9 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         public void AddCondition(string type)
         {
             if (type == "Static")
-                DisplayConditionList.AddChild(new DisplayConditionPredicate(DisplayConditionList, ProfileRightSideType.Static));
+                DataModelConditionList.AddChild(new DataModelConditionPredicate(DataModelConditionList, ProfileRightSideType.Static));
             else if (type == "Dynamic")
-                DisplayConditionList.AddChild(new DisplayConditionPredicate(DisplayConditionList, ProfileRightSideType.Dynamic));
+                DataModelConditionList.AddChild(new DataModelConditionPredicate(DataModelConditionList, ProfileRightSideType.Dynamic));
 
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
@@ -94,7 +94,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public void AddGroup()
         {
-            DisplayConditionList.AddChild(new DisplayConditionGroup(DisplayConditionList));
+            DataModelConditionList.AddChild(new DataModelConditionGroup(DataModelConditionList));
 
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
@@ -122,7 +122,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public void ApplyList()
         {
-            DisplayConditionList.UpdateList(SelectedListProperty.DataModel, SelectedListProperty.PropertyPath);
+            DataModelConditionList.UpdateList(SelectedListProperty.DataModel, SelectedListProperty.PropertyPath);
             _profileEditorService.UpdateSelectedProfileElement();
 
             Update();
@@ -136,11 +136,11 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             NotifyOfPropertyChange(nameof(SelectedListOperator));
 
             // Update the selected list property
-            if (DisplayConditionList.ListDataModel != null && DisplayConditionList.ListPropertyPath != null)
+            if (DataModelConditionList.ListDataModel != null && DataModelConditionList.ListPropertyPath != null)
             {
                 var child = TargetDataModel.GetChildByPath(
-                    DisplayConditionList.ListDataModel.PluginInfo.Guid,
-                    DisplayConditionList.ListPropertyPath
+                    DataModelConditionList.ListDataModel.PluginInfo.Guid,
+                    DataModelConditionList.ListPropertyPath
                 );
                 SelectedListProperty = child as DataModelListViewModel;
             }
@@ -149,7 +149,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             TargetDataModel.ApplyTypeFilter(true, typeof(IList));
 
             // Remove VMs of effects no longer applied on the layer
-            var toRemove = Items.Where(c => !DisplayConditionList.Children.Contains(c.Model)).ToList();
+            var toRemove = Items.Where(c => !DataModelConditionList.Children.Contains(c.Model)).ToList();
             // Using RemoveRange breaks our lovely animations
             foreach (var displayConditionViewModel in toRemove)
                 Items.Remove(displayConditionViewModel);
@@ -158,7 +158,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             {
                 if (Items.Any(c => c.Model == childModel))
                     continue;
-                if (!(childModel is DisplayConditionGroup displayConditionGroup))
+                if (!(childModel is DataModelConditionGroup displayConditionGroup))
                     continue;
 
                 var viewModel = _displayConditionsVmFactory.DisplayConditionGroupViewModel(displayConditionGroup, true);

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

@@ -37,12 +37,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private List<Type> _supportedInputTypes;
 
         public DisplayConditionPredicateViewModel(
-            DisplayConditionPredicate displayConditionPredicate,
+            DataModelConditionPredicate dataModelConditionPredicate,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
             IConditionOperatorService conditionOperatorService,
             ISettingsService settingsService,
-            IEventAggregator eventAggregator) : base(displayConditionPredicate)
+            IEventAggregator eventAggregator) : base(dataModelConditionPredicate)
         {
             _profileEditorService = profileEditorService;
             _dataModelUIService = dataModelUIService;
@@ -61,8 +61,8 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             Initialize();
         }
 
-        public DisplayConditionPredicate DisplayConditionPredicate => (DisplayConditionPredicate) Model;
-        public bool ShowRightSidePropertySelection => DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic;
+        public DataModelConditionPredicate DataModelConditionPredicate => (DataModelConditionPredicate) Model;
+        public bool ShowRightSidePropertySelection => DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic;
         public bool CanActivateRightSideInputViewModel => SelectedLeftSideProperty?.PropertyInfo != null;
         public PluginSetting<bool> ShowDataModelValues { get; }
 
@@ -188,46 +188,46 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public override void Update()
         {
-            if (LeftSideDataModel == null || DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic && RightSideDataModel == null)
+            if (LeftSideDataModel == null || DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic && RightSideDataModel == null)
                 return;
 
             // If static, only allow selecting properties also supported by input
-            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Static)
+            if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
 
             // Determine the left side property first
-            SelectedLeftSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Left);
+            SelectedLeftSideProperty = LeftSideDataModel.GetChildForCondition(DataModelConditionPredicate, DisplayConditionSide.Left);
             var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
 
             // Get the supported operators
             Operators.Clear();
             Operators.AddRange(_conditionOperatorService.GetConditionOperatorsForType(leftSideType));
-            if (DisplayConditionPredicate.Operator == null)
-                DisplayConditionPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.SupportsType(leftSideType)));
-            SelectedOperator = DisplayConditionPredicate.Operator;
+            if (DataModelConditionPredicate.Operator == null)
+                DataModelConditionPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.SupportsType(leftSideType)));
+            SelectedOperator = DataModelConditionPredicate.Operator;
 
             // Determine the right side
-            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
+            if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
             {
-                SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Right);
+                SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DataModelConditionPredicate, DisplayConditionSide.Right);
                 RightSideDataModel.ApplyTypeFilter(true, leftSideType);
             }
             else
-                RightStaticValue = DisplayConditionPredicate.RightStaticValue;
+                RightStaticValue = DataModelConditionPredicate.RightStaticValue;
         }
 
         public void ApplyLeftSide()
         {
-            DisplayConditionPredicate.UpdateLeftSide(SelectedLeftSideProperty.DataModel, SelectedLeftSideProperty.PropertyPath);
+            DataModelConditionPredicate.UpdateLeftSide(SelectedLeftSideProperty.DataModel, SelectedLeftSideProperty.PropertyPath);
             _profileEditorService.UpdateSelectedProfileElement();
 
-            SelectedOperator = DisplayConditionPredicate.Operator;
+            SelectedOperator = DataModelConditionPredicate.Operator;
             Update();
         }
 
         public void ApplyRightSideDynamic()
         {
-            DisplayConditionPredicate.UpdateRightSide(SelectedRightSideProperty.DataModel, SelectedRightSideProperty.PropertyPath);
+            DataModelConditionPredicate.UpdateRightSide(SelectedRightSideProperty.DataModel, SelectedRightSideProperty.PropertyPath);
             _profileEditorService.UpdateSelectedProfileElement();
 
             Update();
@@ -237,7 +237,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         {
             if (isSubmitted)
             {
-                DisplayConditionPredicate.UpdateRightSide(value);
+                DataModelConditionPredicate.UpdateRightSide(value);
                 _profileEditorService.UpdateSelectedProfileElement();
 
                 Update();
@@ -251,7 +251,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         public void ApplyOperator()
         {
-            DisplayConditionPredicate.UpdateOperator(SelectedOperator);
+            DataModelConditionPredicate.UpdateOperator(SelectedOperator);
             _profileEditorService.UpdateSelectedProfileElement();
 
             Update();
@@ -266,7 +266,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             RightSideInputViewModel = _dataModelUIService.GetDataModelInputViewModel(
                 SelectedLeftSideProperty.PropertyInfo.PropertyType,
                 SelectedLeftSideProperty.PropertyDescription,
-                DisplayConditionPredicate.RightStaticValue,
+                DataModelConditionPredicate.RightStaticValue,
                 ApplyRightSideStatic
             );
             _eventAggregator.Subscribe(this);
@@ -283,8 +283,8 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private void RightDataModelUpdateRequested(object sender, EventArgs e)
         {
             var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
-            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
-                SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Right);
+            if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
+                SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DataModelConditionPredicate, DisplayConditionSide.Right);
 
             // With the data model updated, also reapply the filter
             RightSideDataModel.ApplyTypeFilter(true, leftSideType);
@@ -292,7 +292,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         private void LeftDataModelUpdateRequested(object sender, EventArgs e)
         {
-            if (DisplayConditionPredicate.PredicateType == ProfileRightSideType.Static)
+            if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
         }
 

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

@@ -82,10 +82,10 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             }
 
             // Ensure the layer has a root display condition group
-            if (e.RenderProfileElement.DisplayConditionGroup == null)
-                e.RenderProfileElement.DisplayConditionGroup = new DisplayConditionGroup(null);
+            if (e.RenderProfileElement.DataModelConditionGroup == null)
+                e.RenderProfileElement.DataModelConditionGroup = new DataModelConditionGroup(null);
 
-            ActiveItem = _displayConditionsVmFactory.DisplayConditionGroupViewModel(e.RenderProfileElement.DisplayConditionGroup, false);
+            ActiveItem = _displayConditionsVmFactory.DisplayConditionGroupViewModel(e.RenderProfileElement.DataModelConditionGroup, false);
             ActiveItem.IsRootGroup = true;
             ActiveItem.Update();