Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -r545b105a213ed85564861b4bcf6d2d6425dbde50 -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -30,7 +30,6 @@ using Ringtoets.ClosingStructures.Forms.PresentationObjects; using Ringtoets.ClosingStructures.Forms.Properties; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PropertyClasses; @@ -47,8 +46,7 @@ ClosingStructuresInput, StructuresCalculation, ClosingStructuresFailureMechanism>, - DistributionPropertiesBase.IChangeHandler, - DistributionPropertiesBase.IChangeHandler + IDistributionPropertyChangeHandler { private const int hydraulicBoundaryLocationPropertyIndex = 1; private const int stormDurationPropertyIndex = 2; @@ -175,16 +173,11 @@ return data.FailureMechanism.ClosingStructures; } - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() + void IDistributionPropertyChangeHandler.PropertyChanged() { // TODO WTI-973 } - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() - { - // TODO WTI-973 - } - protected override void AfterSettingStructure() { StructuresHelper.Update(data.FailureMechanism.SectionResults, data.Calculation); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs (.../DistributionPropertiesBase.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs (.../DistributionPropertiesBase.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -41,7 +41,7 @@ private readonly bool isMeanReadOnly; private readonly bool isStandardDeviationReadOnly; private readonly IObservable observable; - private readonly IChangeHandler changeHandler; + private readonly IDistributionPropertyChangeHandler changeHandler; /// /// Initializes a new instance of the class. @@ -50,13 +50,13 @@ /// marked as read-only. /// The object to be notified of changes to properties. /// Can be null if all properties are marked as read-only by . - /// The handler that is used to handle property changes. + /// Optional handler that is used to handle property changes. /// Thrown when /// is null and any number of properties in this class is editable. protected DistributionPropertiesBase( DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, - IChangeHandler handler) + IDistributionPropertyChangeHandler handler) { if (observable == null && !propertiesReadOnly.HasFlag(DistributionPropertiesReadOnly.All)) { @@ -150,17 +150,5 @@ } observable.NotifyObservers(); } - - /// - /// Interface defining the operations of handling a change of . - /// - public interface IChangeHandler - { - /// - /// Defines the action that is executed after a property of - /// has been changed. - /// - void PropertyChanged(); - } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IDistributionPropertyChangeHandler.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IDistributionPropertyChangeHandler.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IDistributionPropertyChangeHandler.cs (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -0,0 +1,14 @@ +namespace Ringtoets.Common.Forms.PropertyClasses +{ + /// + /// Interface defining the operations of handling a change of . + /// + public interface IDistributionPropertyChangeHandler + { + /// + /// Defines the action that is executed after a property of + /// has been changed. + /// + void PropertyChanged(); + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs (.../LogNormalDistributionProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs (.../LogNormalDistributionProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -47,13 +47,13 @@ /// marked as read-only. /// The object to be notified of changes to properties. /// Can be null if all properties are marked as read-only by . - /// The handler that is used to handle property changes. + /// Optional handler that is used to handle property changes. /// Thrown when /// is null and any number of properties in this class is editable. public LogNormalDistributionProperties( DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, - IChangeHandler handler) + IDistributionPropertyChangeHandler handler) : base(propertiesReadOnly, observable, handler) {} public override string DistributionType Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/NormalDistributionProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/NormalDistributionProperties.cs (.../NormalDistributionProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/NormalDistributionProperties.cs (.../NormalDistributionProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -47,13 +47,13 @@ /// marked as read-only. /// The object to be notified of changes to properties. /// Can be null if all properties are marked as read-only by . - /// The handler that is used to handle property changes. + /// Optional handler that is used to handle property changes. /// Thrown when /// is null and any number of properties in this class is editable. public NormalDistributionProperties( DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, - IChangeHandler handler) : + IDistributionPropertyChangeHandler handler) : base(propertiesReadOnly, observable, handler) {} public override string DistributionType Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -35,7 +35,6 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PresentationObjects; @@ -57,9 +56,7 @@ IHasStructureProperty, IHasForeshoreProfileProperty, UseBreakWaterProperties.IChangeHandler, - DistributionPropertiesBase.IChangeHandler, - DistributionPropertiesBase.IChangeHandler - where TStructure : StructureBase + IDistributionPropertyChangeHandler where TStructure : StructureBase where TStructureInput : StructuresInputBase where TCalculation : ICalculation where TFailureMechanism : IFailureMechanism @@ -547,14 +544,9 @@ // TODO WTI-969/WTI-970/WTI-971 } - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() + void IDistributionPropertyChangeHandler.PropertyChanged() { // TODO WTI-973 } - - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() - { - // TODO WTI-973 - } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs (.../TruncatedNormalDistributionProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs (.../TruncatedNormalDistributionProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -48,10 +48,10 @@ /// marked as read-only. /// The object to be notified of changes to properties. /// Can be null if all properties are marked as read-only by . - /// The handler that is used to handle property changes. + /// Optional handler that is used to handle property changes. /// Thrown when /// is null and any number of properties in this class is editable. - public TruncatedNormalDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, IChangeHandler handler) : + public TruncatedNormalDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, IDistributionPropertyChangeHandler handler) : base(propertiesReadOnly, observable, handler) {} public override string DistributionType Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs (.../UseBreakWaterProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs (.../UseBreakWaterProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -54,7 +54,7 @@ /// properties are editable. /// /// The data to use for the properties. - /// The handler that is used to handle property changes. + /// Optional handler that is used to handle property changes. /// Thrown when any input parameter is null. public UseBreakWaterProperties(IUseBreakWater useBreakWaterData, IChangeHandler handler) { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -r9a001397536d9dcca5d009c8518478cdfcddbeca -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 9a001397536d9dcca5d009c8518478cdfcddbeca) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -67,6 +67,7 @@ + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs (.../DistributionPropertiesBaseTest.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs (.../DistributionPropertiesBaseTest.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -189,10 +189,10 @@ var mockRepository = new MockRepository(); var observerableMock = mockRepository.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()); - DistributionPropertiesBase.IChangeHandler handler = null; + IDistributionPropertyChangeHandler handler = null; if (withHandler) { - handler = mockRepository.StrictMock.IChangeHandler>(); + handler = mockRepository.StrictMock(); handler.Expect(o => o.PropertyChanged()); } var distribution = mockRepository.Stub(); @@ -246,10 +246,10 @@ var mockRepository = new MockRepository(); var observerableMock = mockRepository.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()); - DistributionPropertiesBase.IChangeHandler handler = null; + IDistributionPropertyChangeHandler handler = null; if (withHandler) { - handler = mockRepository.StrictMock.IChangeHandler>(); + handler = mockRepository.StrictMock(); handler.Expect(o => o.PropertyChanged()); } var distribution = mockRepository.Stub(); @@ -271,7 +271,7 @@ private class SimpleDistributionProperties : DistributionPropertiesBase { - public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, IChangeHandler handler) + public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, IDistributionPropertyChangeHandler handler) : base(propertiesReadOnly, observable, handler) {} public override string DistributionType Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -30,7 +30,6 @@ using Core.Common.Utils; using Core.Common.Utils.Attributes; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.Forms.PropertyClasses; @@ -51,7 +50,7 @@ public class GrassCoverErosionInwardsInputContextProperties : ObjectProperties, IHasHydraulicBoundaryLocationProperty, UseBreakWaterProperties.IChangeHandler, - DistributionPropertiesBase.IChangeHandler + IDistributionPropertyChangeHandler { private const int dikeProfilePropertyIndex = 1; private const int worldReferencePointPropertyIndex = 2; @@ -255,7 +254,7 @@ data.AvailableHydraulicBoundaryLocations, calculationLocation); } - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() + void IDistributionPropertyChangeHandler.PropertyChanged() { ClearCalculationOutput(); } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -r545b105a213ed85564861b4bcf6d2d6425dbde50 -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -24,7 +24,6 @@ using Core.Common.Gui.Attributes; using Core.Common.Utils.Attributes; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Utils; @@ -42,7 +41,7 @@ HeightStructuresInput, StructuresCalculation, HeightStructuresFailureMechanism>, - DistributionPropertiesBase.IChangeHandler + IDistributionPropertyChangeHandler { private const int structurePropertyIndex = 1; private const int structureLocationPropertyIndex = 2; @@ -114,7 +113,7 @@ return data.FailureMechanism.HeightStructures; } - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() + void IDistributionPropertyChangeHandler.PropertyChanged() { // TODO WTI-972 } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs =================================================================== diff -u -r545b105a213ed85564861b4bcf6d2d6425dbde50 -rf808c0a7745d68543626578246691a6f1ec76aae --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision f808c0a7745d68543626578246691a6f1ec76aae) @@ -27,7 +27,6 @@ using Core.Common.Utils.Attributes; using Core.Common.Utils.Reflection; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PropertyClasses; @@ -47,8 +46,7 @@ StabilityPointStructuresInput, StructuresCalculation, StabilityPointStructuresFailureMechanism>, - DistributionPropertiesBase.IChangeHandler, - DistributionPropertiesBase.IChangeHandler + IDistributionPropertyChangeHandler { private const int hydraulicBoundaryLocationPropertyIndex = 1; private const int volumicWeightWaterPropertyIndex = 2; @@ -173,16 +171,11 @@ return data.FailureMechanism.StabilityPointStructures; } - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() + void IDistributionPropertyChangeHandler.PropertyChanged() { // TODO WTI-974 } - void DistributionPropertiesBase.IChangeHandler.PropertyChanged() - { - // TODO WTI-974 - } - protected override void AfterSettingStructure() { StructuresHelper.Update(data.FailureMechanism.SectionResults, data.Calculation);