Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs =================================================================== diff -u -r299be933b87eea233f728ae92b0ec1bcb38087c4 -r2e6b0316ea2a67e7951bb477f39d8b6c93357afd --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision 299be933b87eea233f728ae92b0ec1bcb38087c4) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision 2e6b0316ea2a67e7951bb477f39d8b6c93357afd) @@ -35,10 +35,9 @@ { private const int namePropertyIndex = 1; private const int codePropertyIndex = 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; /// /// Creates a new instance of . @@ -60,8 +59,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); } @@ -114,19 +112,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; - } - } - #endregion } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailurePathPropertiesTest.cs =================================================================== diff -u -r299be933b87eea233f728ae92b0ec1bcb38087c4 -r2e6b0316ea2a67e7951bb477f39d8b6c93357afd --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailurePathPropertiesTest.cs (.../DuneErosionFailurePathPropertiesTest.cs) (revision 299be933b87eea233f728ae92b0ec1bcb38087c4) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailurePathPropertiesTest.cs (.../DuneErosionFailurePathPropertiesTest.cs) (revision 2e6b0316ea2a67e7951bb477f39d8b6c93357afd) @@ -38,10 +38,9 @@ { private const int namePropertyIndex = 0; private const int codePropertyIndex = 1; - private const int contributionPropertyIndex = 2; - private const int inAssemblyPropertyIndex = 3; - private const int nPropertyIndex = 4; - private const int applyLengthEffectInSectionPropertyIndex = 5; + private const int inAssemblyPropertyIndex = 2; + private const int nPropertyIndex = 3; + private const int applyLengthEffectInSectionPropertyIndex = 4; [Test] public void Constructor_ExpectedValues() @@ -61,7 +60,6 @@ Assert.AreSame(failureMechanism, properties.Data); Assert.AreEqual(failureMechanism.Name, properties.Name); Assert.AreEqual(failureMechanism.Code, properties.Code); - Assert.AreEqual(failureMechanism.Contribution, properties.Contribution); Assert.AreEqual(failureMechanism.InAssembly, properties.InAssembly); GeneralDuneErosionInput generalInput = failureMechanism.GeneralInput; @@ -80,7 +78,7 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(6, dynamicProperties.Count); + Assert.AreEqual(5, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string lengthEffectCategory = "Lengte-effect"; @@ -99,13 +97,6 @@ "Het label van het toetsspoor.", 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, @@ -159,7 +150,7 @@ "Het label van het toetsspoor.", true); - PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex - 1]; + PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(inAssemblyProperty, generalCategory, "In assemblage", @@ -237,7 +228,6 @@ Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.InAssembly))); - Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.Contribution))); Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.N))); Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.ApplyLengthEffectInSection)));