Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs =================================================================== diff -u -r26f427a7724ebe6e50c0d83fd87156df30f17e9c -rafeaf478e3ad4d4342bf96f999e228f53909cad5 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision afeaf478e3ad4d4342bf96f999e228f53909cad5) @@ -39,10 +39,9 @@ private const int namePropertyIndex = 1; private const int codePropertyIndex = 2; private const int groupPropertyIndex = 3; - private const int contributionPropertyIndex = 4; - private const int inAssemblyPropertyIndex = 5; - private const int nPropertyIndex = 6; - private const int applyLengthEffectInSectionPropertyIndex = 7; + private const int inAssemblyPropertyIndex = 4; + private const int nPropertyIndex = 5; + private const int applyLengthEffectInSectionPropertyIndex = 6; private readonly IFailureMechanismPropertyChangeHandler propertyChangeHandler; /// @@ -84,8 +83,7 @@ private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { - return nameof(Contribution).Equals(propertyName) - || nameof(N).Equals(propertyName) + return nameof(N).Equals(propertyName) || nameof(ApplyLengthEffectInSection).Equals(propertyName); } @@ -147,19 +145,6 @@ } } - [DynamicVisible] - [PropertyOrder(contributionPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Contribution_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Contribution_Description))] - public double Contribution - { - get - { - return data.Contribution; - } - } - [PropertyOrder(inAssemblyPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_DisplayName))] Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs =================================================================== diff -u -r7f75801aa93da365268f2ac28952d141931a83df -rafeaf478e3ad4d4342bf96f999e228f53909cad5 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs (.../GrassCoverErosionInwardsFailurePathPropertiesTest.cs) (revision 7f75801aa93da365268f2ac28952d141931a83df) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs (.../GrassCoverErosionInwardsFailurePathPropertiesTest.cs) (revision afeaf478e3ad4d4342bf96f999e228f53909cad5) @@ -41,10 +41,9 @@ private const int namePropertyIndex = 0; private const int codePropertyIndex = 1; private const int groupPropertyIndex = 2; - private const int contributionPropertyIndex = 3; - private const int inAssemblyPropertyIndex = 4; - private const int nPropertyIndex = 5; - private const int applyLengthEffectInSectionPropertyIndex = 6; + private const int inAssemblyPropertyIndex = 3; + private const int nPropertyIndex = 4; + private const int applyLengthEffectInSectionPropertyIndex = 5; [Test] public void Constructor_ChangeHandlerNull_ThrowsArgumentNullException() @@ -83,7 +82,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); Assert.AreEqual(failureMechanism.InAssembly, properties.InAssembly); GeneralGrassCoverErosionInwardsInput generalInput = failureMechanism.GeneralInput; @@ -114,7 +112,7 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(7, dynamicProperties.Count); + Assert.AreEqual(6, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string lengthEffectCategory = "Lengte-effect"; @@ -140,13 +138,6 @@ "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); - PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(inAssemblyProperty, generalCategory, @@ -212,7 +203,7 @@ "De groep waar het toetsspoor toe behoort.", true); - PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex - 1]; + PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(inAssemblyProperty, generalCategory, "In assemblage", @@ -340,7 +331,6 @@ Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.InAssembly))); Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.N))); - Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.Contribution))); Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.ApplyLengthEffectInSection))); mocks.VerifyAll();