Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -r32ca5355a56fe0862064a50c1b94bf02b3bf1ebd -r28141adef35144c8d3abc6d6088524022536cff7 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 32ca5355a56fe0862064a50c1b94bf02b3bf1ebd) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 28141adef35144c8d3abc6d6088524022536cff7) @@ -96,7 +96,6 @@ ForeshoreProfilePropertyIndex = foreshoreProfilePropertyIndex, UseBreakWaterPropertyIndex = useBreakWaterPropertyIndex, UseForeshorePropertyIndex = useForeshorePropertyIndex, - ModelFactorSuperCriticalFlowPropertyIndex = modelFactorSuperCriticalFlowPropertyIndex, HydraulicBoundaryLocationPropertyIndex = hydraulicBoundaryLocationPropertyIndex, StormDurationPropertyIndex = stormDurationPropertyIndex }, propertyChangeHandler) {} @@ -210,7 +209,7 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ModelFactorSuperCriticalFlow_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ModelFactorSuperCriticalFlow_Description))] - public virtual NormalDistributionProperties ModelFactorSuperCriticalFlow + public NormalDistributionProperties ModelFactorSuperCriticalFlow { get { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs =================================================================== diff -u -r32ca5355a56fe0862064a50c1b94bf02b3bf1ebd -r28141adef35144c8d3abc6d6088524022536cff7 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision 32ca5355a56fe0862064a50c1b94bf02b3bf1ebd) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision 28141adef35144c8d3abc6d6088524022536cff7) @@ -77,10 +77,12 @@ { throw new ArgumentNullException(nameof(data)); } + if (constructionProperties == null) { throw new ArgumentNullException(nameof(constructionProperties)); } + if (propertyChangeHandler == null) { throw new ArgumentNullException(nameof(propertyChangeHandler)); @@ -91,9 +93,6 @@ propertyIndexLookup = new Dictionary { { - nameof(ModelFactorSuperCriticalFlow), constructionProperties.ModelFactorSuperCriticalFlowPropertyIndex - }, - { nameof(Structure), constructionProperties.StructurePropertyIndex }, { @@ -220,15 +219,6 @@ /// public class ConstructionProperties { - #region Model factors - - /// - /// Gets or sets the property index for . - /// - public int ModelFactorSuperCriticalFlowPropertyIndex { get; set; } - - #endregion - #region Schematization /// Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -r32ca5355a56fe0862064a50c1b94bf02b3bf1ebd -r28141adef35144c8d3abc6d6088524022536cff7 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 32ca5355a56fe0862064a50c1b94bf02b3bf1ebd) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 28141adef35144c8d3abc6d6088524022536cff7) @@ -81,7 +81,6 @@ ForeshoreProfilePropertyIndex = foreshoreProfilePropertyIndex, UseBreakWaterPropertyIndex = useBreakWaterPropertyIndex, UseForeshorePropertyIndex = useForeshorePropertyIndex, - ModelFactorSuperCriticalFlowPropertyIndex = modelFactorSuperCriticalFlowPropertyIndex, HydraulicBoundaryLocationPropertyIndex = hydraulicBoundaryLocationPropertyIndex, StormDurationPropertyIndex = stormDurationPropertyIndex }, propertyChangeHandler) {} @@ -94,7 +93,7 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ModelFactorSuperCriticalFlow_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ModelFactorSuperCriticalFlow_Description))] - public virtual NormalDistributionProperties ModelFactorSuperCriticalFlow + public NormalDistributionProperties ModelFactorSuperCriticalFlow { get {