Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -532,24 +532,6 @@ } /// - /// Looks up a localized string similar to ID van het stochastische ondergrondmodel in de database.. - /// - public static string StochasticSoilModel_Id_Description { - get { - return ResourceManager.GetString("StochasticSoilModel_Id_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ID. - /// - public static string StochasticSoilModel_Id_DisplayName { - get { - return ResourceManager.GetString("StochasticSoilModel_Id_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Naam van het stochastische ondergrondmodel.. /// public static string StochasticSoilModel_Name_Description { @@ -568,24 +550,6 @@ } /// - /// Looks up a localized string similar to Naam van het stochastische ondergrondmodel segment.. - /// - public static string StochasticSoilModel_SegmentName_Description { - get { - return ResourceManager.GetString("StochasticSoilModel_SegmentName_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Segment naam. - /// - public static string StochasticSoilModel_SegmentName_DisplayName { - get { - return ResourceManager.GetString("StochasticSoilModel_SegmentName_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Ondergrondschematisaties uit de database.. /// public static string StochasticSoilModel_StochasticSoilProfiles_Description { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -253,24 +253,12 @@ Geometrie - - ID van het stochastische ondergrondmodel in de database. - - - ID - Naam van het stochastische ondergrondmodel. Naam - - Naam van het stochastische ondergrondmodel segment. - - - Segment naam - Ondergrondschematisaties uit de database. Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelProperties.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -39,18 +39,6 @@ { [PropertyOrder(1)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_Id_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilModel_Id_Description))] - public long Id - { - get - { - return data.Id; - } - } - - [PropertyOrder(2)] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_Name_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilModel_Name_Description))] public string Name @@ -61,19 +49,7 @@ } } - [PropertyOrder(3)] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_SegmentName_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilModel_SegmentName_Description))] - public string SegmentName - { - get - { - return data.SegmentName; - } - } - - [PropertyOrder(4)] + [PropertyOrder(2)] [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_Geometry_DisplayName))] @@ -86,7 +62,7 @@ } } - [PropertyOrder(5)] + [PropertyOrder(3)] [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_StochasticSoilProfiles_DisplayName))] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -34,11 +34,9 @@ [TestFixture] public class StochasticSoilModelPropertiesTest { - private const int stochasticSoilModelIdPropertyIndex = 0; - private const int stochasticSoilModelNamePropertyIndex = 1; - private const int stochasticSoilModelSegmentNamePropertyIndex = 2; - private const int stochasticSoilModelGeometryPropertyIndex = 3; - private const int stochasticSoilModelStochasticSoilProfilesPropertyIndex = 4; + private const int stochasticSoilModelNamePropertyIndex = 0; + private const int stochasticSoilModelGeometryPropertyIndex = 1; + private const int stochasticSoilModelStochasticSoilProfilesPropertyIndex = 2; [Test] public void DefaultConstructor_ExpectedValues() @@ -75,8 +73,6 @@ // Assert Assert.AreEqual(stochasticSoilModel.Name, properties.Name); - Assert.AreEqual(stochasticSoilModel.SegmentName, properties.SegmentName); - Assert.AreEqual(stochasticSoilModel.Id, properties.Id); Assert.AreEqual(stochasticSoilModel.Geometry[0], properties.Geometry[0]); Assert.IsInstanceOf(properties.StochasticSoilProfiles); @@ -107,29 +103,15 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(5, dynamicProperties.Count); + Assert.AreEqual(3, dynamicProperties.Count); - PropertyDescriptor stochasticSoilModelIdProperty = dynamicProperties[stochasticSoilModelIdPropertyIndex]; - Assert.IsNotNull(stochasticSoilModelIdProperty); - Assert.IsTrue(stochasticSoilModelIdProperty.IsReadOnly); - Assert.AreEqual("Algemeen", stochasticSoilModelIdProperty.Category); - Assert.AreEqual("ID", stochasticSoilModelIdProperty.DisplayName); - Assert.AreEqual("ID van het stochastische ondergrondmodel in de database.", stochasticSoilModelIdProperty.Description); - PropertyDescriptor stochasticSoilModelNameProperty = dynamicProperties[stochasticSoilModelNamePropertyIndex]; Assert.IsNotNull(stochasticSoilModelNameProperty); Assert.IsTrue(stochasticSoilModelNameProperty.IsReadOnly); Assert.AreEqual("Algemeen", stochasticSoilModelNameProperty.Category); Assert.AreEqual("Naam", stochasticSoilModelNameProperty.DisplayName); Assert.AreEqual("Naam van het stochastische ondergrondmodel.", stochasticSoilModelNameProperty.Description); - PropertyDescriptor stochasticSoilModelSegmentNameProperty = dynamicProperties[stochasticSoilModelSegmentNamePropertyIndex]; - Assert.IsNotNull(stochasticSoilModelSegmentNameProperty); - Assert.IsTrue(stochasticSoilModelSegmentNameProperty.IsReadOnly); - Assert.AreEqual("Algemeen", stochasticSoilModelSegmentNameProperty.Category); - Assert.AreEqual("Segment naam", stochasticSoilModelSegmentNameProperty.DisplayName); - Assert.AreEqual("Naam van het stochastische ondergrondmodel segment.", stochasticSoilModelSegmentNameProperty.Description); - PropertyDescriptor stochasticSoilModelGeometryProperty = dynamicProperties[stochasticSoilModelGeometryPropertyIndex]; Assert.IsNotNull(stochasticSoilModelGeometryProperty); Assert.IsTrue(stochasticSoilModelGeometryProperty.IsReadOnly); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -1411,24 +1411,6 @@ } /// - /// Looks up a localized string similar to ID van het stochastische ondergrondmodel in de database.. - /// - public static string StochasticSoilModel_Id_Description { - get { - return ResourceManager.GetString("StochasticSoilModel_Id_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ID. - /// - public static string StochasticSoilModel_Id_DisplayName { - get { - return ResourceManager.GetString("StochasticSoilModel_Id_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Naam van het stochastische ondergrondmodel.. /// public static string StochasticSoilModel_Name_Description { @@ -1447,24 +1429,6 @@ } /// - /// Looks up a localized string similar to Naam van het stochastische ondergrondmodel segment.. - /// - public static string StochasticSoilModel_SegmentName_Description { - get { - return ResourceManager.GetString("StochasticSoilModel_SegmentName_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Segment naam. - /// - public static string StochasticSoilModel_SegmentName_DisplayName { - get { - return ResourceManager.GetString("StochasticSoilModel_SegmentName_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Ondergrondschematisaties uit de database.. /// public static string StochasticSoilModel_StochasticSoilProfiles_Description { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r2fbb7b54b29f25f69c4c53cdb40f3704dccf5620 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2fbb7b54b29f25f69c4c53cdb40f3704dccf5620) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -478,24 +478,12 @@ Geometrie - - ID van het stochastische ondergrondmodel in de database. - - - ID - Naam van het stochastische ondergrondmodel. Naam - - Naam van het stochastische ondergrondmodel segment. - - - Segment naam - Ondergrondschematisaties uit de database. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -39,18 +39,6 @@ { [PropertyOrder(1)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_Id_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilModel_Id_Description))] - public long Id - { - get - { - return data.Id; - } - } - - [PropertyOrder(2)] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_Name_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilModel_Name_Description))] public string Name @@ -61,19 +49,7 @@ } } - [PropertyOrder(3)] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_SegmentName_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilModel_SegmentName_Description))] - public string SegmentName - { - get - { - return data.SegmentName; - } - } - - [PropertyOrder(4)] + [PropertyOrder(2)] [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_Geometry_DisplayName))] @@ -86,7 +62,7 @@ } } - [PropertyOrder(5)] + [PropertyOrder(3)] [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilModel_StochasticSoilProfiles_DisplayName))] Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r6a241363ac2d257e8012cb6336d66a8e9e350b8d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) @@ -34,11 +34,9 @@ [TestFixture] public class StochasticSoilModelPropertiesTest { - private const int stochasticSoilModelIdPropertyIndex = 0; - private const int stochasticSoilModelNamePropertyIndex = 1; - private const int stochasticSoilModelSegmentNamePropertyIndex = 2; - private const int stochasticSoilModelGeometryPropertyIndex = 3; - private const int stochasticSoilModelStochasticSoilProfilesPropertyIndex = 4; + private const int stochasticSoilModelNamePropertyIndex = 0; + private const int stochasticSoilModelGeometryPropertyIndex = 1; + private const int stochasticSoilModelStochasticSoilProfilesPropertyIndex = 2; [Test] public void DefaultConstructor_ExpectedValues() @@ -75,8 +73,6 @@ // Assert Assert.AreEqual(stochasticSoilModel.Name, properties.Name); - Assert.AreEqual(stochasticSoilModel.SegmentName, properties.SegmentName); - Assert.AreEqual(stochasticSoilModel.Id, properties.Id); Assert.AreEqual(stochasticSoilModel.Geometry[0], properties.Geometry[0]); Assert.IsInstanceOf(properties.StochasticSoilProfiles); @@ -107,29 +103,15 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(5, dynamicProperties.Count); + Assert.AreEqual(3, dynamicProperties.Count); - PropertyDescriptor stochasticSoilModelIdProperty = dynamicProperties[stochasticSoilModelIdPropertyIndex]; - Assert.IsNotNull(stochasticSoilModelIdProperty); - Assert.IsTrue(stochasticSoilModelIdProperty.IsReadOnly); - Assert.AreEqual("Algemeen", stochasticSoilModelIdProperty.Category); - Assert.AreEqual("ID", stochasticSoilModelIdProperty.DisplayName); - Assert.AreEqual("ID van het stochastische ondergrondmodel in de database.", stochasticSoilModelIdProperty.Description); - PropertyDescriptor stochasticSoilModelNameProperty = dynamicProperties[stochasticSoilModelNamePropertyIndex]; Assert.IsNotNull(stochasticSoilModelNameProperty); Assert.IsTrue(stochasticSoilModelNameProperty.IsReadOnly); Assert.AreEqual("Algemeen", stochasticSoilModelNameProperty.Category); Assert.AreEqual("Naam", stochasticSoilModelNameProperty.DisplayName); Assert.AreEqual("Naam van het stochastische ondergrondmodel.", stochasticSoilModelNameProperty.Description); - PropertyDescriptor stochasticSoilModelSegmentNameProperty = dynamicProperties[stochasticSoilModelSegmentNamePropertyIndex]; - Assert.IsNotNull(stochasticSoilModelSegmentNameProperty); - Assert.IsTrue(stochasticSoilModelSegmentNameProperty.IsReadOnly); - Assert.AreEqual("Algemeen", stochasticSoilModelSegmentNameProperty.Category); - Assert.AreEqual("Segment naam", stochasticSoilModelSegmentNameProperty.DisplayName); - Assert.AreEqual("Naam van het stochastische ondergrondmodel segment.", stochasticSoilModelSegmentNameProperty.Description); - PropertyDescriptor stochasticSoilModelGeometryProperty = dynamicProperties[stochasticSoilModelGeometryPropertyIndex]; Assert.IsNotNull(stochasticSoilModelGeometryProperty); Assert.IsTrue(stochasticSoilModelGeometryProperty.IsReadOnly);