Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs =================================================================== diff -u -rb6d551bba6ee880ac9d8e271f87bea13a67962ce -r0ab978fb52863fc66483fbcd81ebe429b9eac955 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs (.../DuneErosionFailureMechanismProperties.cs) (revision b6d551bba6ee880ac9d8e271f87bea13a67962ce) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs (.../DuneErosionFailureMechanismProperties.cs) (revision 0ab978fb52863fc66483fbcd81ebe429b9eac955) @@ -67,9 +67,6 @@ }, { nameof(Group), constructionProperties.GroupPropertyIndex - }, - { - nameof(Contribution), constructionProperties.ContributionPropertyIndex } }; } @@ -104,11 +101,6 @@ /// public int GroupPropertyIndex { get; set; } - /// - /// Gets or sets the property index for . - /// - public int ContributionPropertyIndex { get; set; } - #endregion } @@ -150,18 +142,6 @@ } } - [DynamicPropertyOrder] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))] - public double Contribution - { - get - { - return data.Contribution; - } - } - #endregion } } \ No newline at end of file Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs =================================================================== diff -u -rd42064dbdf795d14a297aa79cb651540c2f11ec9 -r0ab978fb52863fc66483fbcd81ebe429b9eac955 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision d42064dbdf795d14a297aa79cb651540c2f11ec9) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision 0ab978fb52863fc66483fbcd81ebe429b9eac955) @@ -49,10 +49,25 @@ { NamePropertyIndex = namePropertyIndex, CodePropertyIndex = codePropertyIndex, - GroupPropertyIndex = groupPropertyIndex, - ContributionPropertyIndex = contributionPropertyIndex + GroupPropertyIndex = groupPropertyIndex }) {} + #region General + + [PropertyOrder(contributionPropertyIndex)] + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] + [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))] + [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))] + public double Contribution + { + get + { + return data.Contribution; + } + } + + #endregion + #region Length effect parameters [PropertyOrder(nPropertyIndex)] Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionHydraulicLoadsProperties.cs =================================================================== diff -u -rd42064dbdf795d14a297aa79cb651540c2f11ec9 -r0ab978fb52863fc66483fbcd81ebe429b9eac955 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionHydraulicLoadsProperties.cs (.../DuneErosionHydraulicLoadsProperties.cs) (revision d42064dbdf795d14a297aa79cb651540c2f11ec9) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionHydraulicLoadsProperties.cs (.../DuneErosionHydraulicLoadsProperties.cs) (revision 0ab978fb52863fc66483fbcd81ebe429b9eac955) @@ -32,7 +32,6 @@ private const int namePropertyIndex = 1; private const int codePropertyIndex = 2; private const int groupPropertyIndex = 3; - private const int contributionPropertyIndex = 4; /// /// Creates a new instance of . @@ -44,8 +43,7 @@ { NamePropertyIndex = namePropertyIndex, CodePropertyIndex = codePropertyIndex, - GroupPropertyIndex = groupPropertyIndex, - ContributionPropertyIndex = contributionPropertyIndex + GroupPropertyIndex = groupPropertyIndex }) {} } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs =================================================================== diff -u -rb6d551bba6ee880ac9d8e271f87bea13a67962ce -r0ab978fb52863fc66483fbcd81ebe429b9eac955 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs (.../DuneErosionFailureMechanismPropertiesTest.cs) (revision b6d551bba6ee880ac9d8e271f87bea13a67962ce) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs (.../DuneErosionFailureMechanismPropertiesTest.cs) (revision 0ab978fb52863fc66483fbcd81ebe429b9eac955) @@ -35,7 +35,6 @@ private const int namePropertyIndex = 0; private const int codePropertyIndex = 1; private const int groupPropertyIndex = 2; - private const int contributionPropertyIndex = 3; [Test] public void Constructor_DataNull_ThrowArgumentNullException() @@ -77,7 +76,6 @@ Assert.AreEqual(failureMechanism.Name, properties.Name); Assert.AreEqual(failureMechanism.Code, properties.Code); Assert.AreEqual(failureMechanism.Group, properties.Group); - Assert.AreEqual(failureMechanism.Contribution, properties.Contribution); } [Test] @@ -91,13 +89,12 @@ { NamePropertyIndex = namePropertyIndex, CodePropertyIndex = codePropertyIndex, - GroupPropertyIndex = groupPropertyIndex, - ContributionPropertyIndex = contributionPropertyIndex + GroupPropertyIndex = groupPropertyIndex }); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(4, dynamicProperties.Count); + Assert.AreEqual(3, dynamicProperties.Count); const string generalCategory = "Algemeen"; @@ -121,13 +118,6 @@ "Groep", "De groep waar het toetsspoor toe behoort.", true); - - PropertyDescriptor contributionProperty = dynamicProperties[contributionPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(contributionProperty, - generalCategory, - "Faalkansbijdrage [%]", - "Procentuele bijdrage van dit toetsspoor aan de totale overstromingskans van het traject.", - true); } } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionHydraulicLoadsPropertiesTest.cs =================================================================== diff -u -rb6d551bba6ee880ac9d8e271f87bea13a67962ce -r0ab978fb52863fc66483fbcd81ebe429b9eac955 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionHydraulicLoadsPropertiesTest.cs (.../DuneErosionHydraulicLoadsPropertiesTest.cs) (revision b6d551bba6ee880ac9d8e271f87bea13a67962ce) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionHydraulicLoadsPropertiesTest.cs (.../DuneErosionHydraulicLoadsPropertiesTest.cs) (revision 0ab978fb52863fc66483fbcd81ebe429b9eac955) @@ -33,7 +33,6 @@ private const int namePropertyIndex = 0; private const int codePropertyIndex = 1; private const int groupPropertyIndex = 2; - private const int contributionPropertyIndex = 3; [Test] public void Constructor_ExpectedValues() @@ -50,7 +49,6 @@ Assert.AreEqual(failureMechanism.Name, properties.Name); Assert.AreEqual(failureMechanism.Code, properties.Code); Assert.AreEqual(failureMechanism.Group, properties.Group); - Assert.AreEqual(failureMechanism.Contribution, properties.Contribution); } [Test] @@ -64,7 +62,7 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(4, dynamicProperties.Count); + Assert.AreEqual(3, dynamicProperties.Count); const string generalCategory = "Algemeen"; @@ -88,13 +86,6 @@ "Groep", "De groep waar het toetsspoor toe behoort.", true); - - PropertyDescriptor contributionProperty = dynamicProperties[contributionPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(contributionProperty, - generalCategory, - "Faalkansbijdrage [%]", - "Procentuele bijdrage van dit toetsspoor aan de totale overstromingskans van het traject.", - true); } } } \ No newline at end of file