From 7e8dea351b1be36c1df2c3964f57af7dba079133 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Sun, 27 Sep 2020 23:01:08 +0200 Subject: [PATCH] Conditions - Fixed a null check during value retreival Test data model - Moved to right folder --- .../Shared/DataModelVisualizationViewModel.cs | 2 +- .../ResourceDictionaries/DataModelConditions.xaml | 10 +++++----- src/Artemis.sln | 2 +- ...Artemis.Plugins.DataModelExpansions.TestData.csproj | 2 +- .../DataModels/PluginDataModel.cs | 2 +- .../PluginDataModelExpansion.cs | 0 .../Properties/launchSettings.json | 0 .../plugin.json | 0 8 files changed, 9 insertions(+), 9 deletions(-) rename src/{ => Plugins}/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj (94%) rename src/{ => Plugins}/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs (96%) rename src/{ => Plugins}/Artemis.Plugins.DataModelExpansions.TestData/PluginDataModelExpansion.cs (100%) rename src/{ => Plugins}/Artemis.Plugins.DataModelExpansions.TestData/Properties/launchSettings.json (100%) rename src/{ => Plugins}/Artemis.Plugins.DataModelExpansions.TestData/plugin.json (100%) diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs index b799eed5e..8f668f33b 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs @@ -127,7 +127,7 @@ namespace Artemis.UI.Shared if (PropertyInfo.GetGetMethod() == null) return null; - return Parent == null ? null : PropertyInfo.GetValue(Parent.GetCurrentValue()); + return Parent?.GetCurrentValue() == null ? null : PropertyInfo.GetValue(Parent.GetCurrentValue()); } catch (Exception) { diff --git a/src/Artemis.UI.Shared/ResourceDictionaries/DataModelConditions.xaml b/src/Artemis.UI.Shared/ResourceDictionaries/DataModelConditions.xaml index 38feeee18..a203f4403 100644 --- a/src/Artemis.UI.Shared/ResourceDictionaries/DataModelConditions.xaml +++ b/src/Artemis.UI.Shared/ResourceDictionaries/DataModelConditions.xaml @@ -31,12 +31,12 @@ - + - + @@ -54,12 +54,12 @@ - + - + @@ -70,7 +70,7 @@ - + diff --git a/src/Artemis.sln b/src/Artemis.sln index 8ccde0555..746b58c30 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -82,7 +82,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Modules.Ove EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataModelExpansions", "DataModelExpansions", "{5A5B55D7-F631-467A-A16F-B880DE4E8909}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.DataModelExpansions.TestData", "Artemis.Plugins.DataModelExpansions.TestData\Artemis.Plugins.DataModelExpansions.TestData.csproj", "{5353C9A2-2D9A-4051-8599-AFE56D54B882}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.DataModelExpansions.TestData", "Plugins\Artemis.Plugins.DataModelExpansions.TestData\Artemis.Plugins.DataModelExpansions.TestData.csproj", "{5353C9A2-2D9A-4051-8599-AFE56D54B882}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj b/src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj similarity index 94% rename from src/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj rename to src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj index 91d9e96d8..a4c38a08d 100644 --- a/src/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj +++ b/src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs b/src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs similarity index 96% rename from src/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs rename to src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs index 0e24eac8b..48d021160 100644 --- a/src/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs +++ b/src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs @@ -8,7 +8,7 @@ namespace Artemis.Plugins.DataModelExpansions.TestData.DataModels { public PluginDataModel() { - PluginSubDataModel = new PluginSubDataModel(); + // PluginSubDataModel = new PluginSubDataModel(); ListItems = new List(); for (var i = 0; i < 20; i++) ListItems.Add(new SomeListItem {ItemName = $"Item {i + 1}", Number = i}); diff --git a/src/Artemis.Plugins.DataModelExpansions.TestData/PluginDataModelExpansion.cs b/src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/PluginDataModelExpansion.cs similarity index 100% rename from src/Artemis.Plugins.DataModelExpansions.TestData/PluginDataModelExpansion.cs rename to src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/PluginDataModelExpansion.cs diff --git a/src/Artemis.Plugins.DataModelExpansions.TestData/Properties/launchSettings.json b/src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/Properties/launchSettings.json similarity index 100% rename from src/Artemis.Plugins.DataModelExpansions.TestData/Properties/launchSettings.json rename to src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/Properties/launchSettings.json diff --git a/src/Artemis.Plugins.DataModelExpansions.TestData/plugin.json b/src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/plugin.json similarity index 100% rename from src/Artemis.Plugins.DataModelExpansions.TestData/plugin.json rename to src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/plugin.json