Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Observers/AssessmentSectionResultObserver.cs =================================================================== diff -u -rc6eacff29704b39991bcf59b97f4270337954c20 -r49328c4f97fb254a2939f998ea8249219a3cf2c8 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision c6eacff29704b39991bcf59b97f4270337954c20) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision 49328c4f97fb254a2939f998ea8249219a3cf2c8) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using Core.Common.Base; using Ringtoets.ClosingStructures.Data; using Ringtoets.Common.Data.Calculation; @@ -88,7 +87,7 @@ { Observable = assessmentSection }; - + closingStructuresObserver = CreateCalculatableFailureMechanismObserver>(assessmentSection.ClosingStructures); @@ -144,28 +143,6 @@ WaterPressureAsphaltCoverFailureMechanismSectionResult>(assessmentSection.WaterPressureAsphaltCover); } - private void ResubscribeFailureMechanismObservers(AssessmentSection assessmentSection) - { - closingStructuresObserver.Observable = assessmentSection.ClosingStructures; - duneErosionObserver.Observable = assessmentSection.DuneErosion; - grassCoverErosionInwardsObserver.Observable = assessmentSection.GrassCoverErosionInwards; - grassCoverErosionOutwardsObserver.Observable = assessmentSection.GrassCoverErosionOutwards; - heightStructuresObserver.Observable = assessmentSection.HeightStructures; - macroStabilityInwardsObserver.Observable = assessmentSection.MacroStabilityInwards; - pipingObserver.Observable = assessmentSection.Piping; - stabilityPointStructuresObserver.Observable = assessmentSection.StabilityPointStructures; - stabilityStoneCoverObserver.Observable = assessmentSection.StabilityStoneCover; - waveImpactAsphaltCoverObserver.Observable = assessmentSection.WaveImpactAsphaltCover; - grassCoverSlipOffInwardsObserver.Observable = assessmentSection.GrassCoverSlipOffInwards; - grassCoverSlipOffOutwardsObserver.Observable = assessmentSection.GrassCoverSlipOffOutwards; - macroStabilityOutwardsObserver.Observable = assessmentSection.MacroStabilityOutwards; - microstabilityObserver.Observable = assessmentSection.Microstability; - pipingStructureObserver.Observable = assessmentSection.PipingStructure; - strengthStabilityLengthwiseConstructionObserver.Observable = assessmentSection.StrengthStabilityLengthwiseConstruction; - technicalInnovationObserver.Observable = assessmentSection.TechnicalInnovation; - waterPressureAsphaltCoverObserver.Observable = assessmentSection.WaterPressureAsphaltCover; - } - public void Dispose() { assessmentSectionObserver.Dispose(); @@ -189,6 +166,28 @@ waterPressureAsphaltCoverObserver.Dispose(); } + private void ResubscribeFailureMechanismObservers(AssessmentSection assessmentSection) + { + closingStructuresObserver.Observable = assessmentSection.ClosingStructures; + duneErosionObserver.Observable = assessmentSection.DuneErosion; + grassCoverErosionInwardsObserver.Observable = assessmentSection.GrassCoverErosionInwards; + grassCoverErosionOutwardsObserver.Observable = assessmentSection.GrassCoverErosionOutwards; + heightStructuresObserver.Observable = assessmentSection.HeightStructures; + macroStabilityInwardsObserver.Observable = assessmentSection.MacroStabilityInwards; + pipingObserver.Observable = assessmentSection.Piping; + stabilityPointStructuresObserver.Observable = assessmentSection.StabilityPointStructures; + stabilityStoneCoverObserver.Observable = assessmentSection.StabilityStoneCover; + waveImpactAsphaltCoverObserver.Observable = assessmentSection.WaveImpactAsphaltCover; + grassCoverSlipOffInwardsObserver.Observable = assessmentSection.GrassCoverSlipOffInwards; + grassCoverSlipOffOutwardsObserver.Observable = assessmentSection.GrassCoverSlipOffOutwards; + macroStabilityOutwardsObserver.Observable = assessmentSection.MacroStabilityOutwards; + microstabilityObserver.Observable = assessmentSection.Microstability; + pipingStructureObserver.Observable = assessmentSection.PipingStructure; + strengthStabilityLengthwiseConstructionObserver.Observable = assessmentSection.StrengthStabilityLengthwiseConstruction; + technicalInnovationObserver.Observable = assessmentSection.TechnicalInnovation; + waterPressureAsphaltCoverObserver.Observable = assessmentSection.WaterPressureAsphaltCover; + } + private Observer CreateCalculatableFailureMechanismObserver(TFailureMechanism failureMechanism) where TFailureMechanism : IFailureMechanism, IHasSectionResults, ICalculatableFailureMechanism where TSectionResult : FailureMechanismSectionResult