Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs =================================================================== diff -u -r71187bb65412758f6030c1ed195341c99f9c2a15 -r5c80316f5def38d409d5a13a05ae84859510fcbb --- Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision 71187bb65412758f6030c1ed195341c99f9c2a15) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision 5c80316f5def38d409d5a13a05ae84859510fcbb) @@ -60,10 +60,6 @@ private readonly Observer heightStructuresObserver; private readonly Observer macroStabilityInwardsObserver; private readonly Observer pipingObserver; - - private readonly RecursiveObserver, - PipingScenarioConfigurationPerFailureMechanismSection> pipingScenarioConfigurationsPerSectionObserver; - private readonly Observer stabilityPointStructuresObserver; private readonly Observer stabilityStoneCoverObserver; private readonly Observer waveImpactAsphaltCoverObserver; @@ -76,6 +72,9 @@ private readonly Observer specificFailureMechanismsObserver; private readonly List specificFailureMechanismObservers; + private readonly RecursiveObserver, + PipingScenarioConfigurationPerFailureMechanismSection> pipingScenarioConfigurationsPerSectionObserver; + /// /// Creates a new instance of . /// @@ -104,18 +103,6 @@ Observable = assessmentSection.ReferenceLine }; - specificFailureMechanismsObserver = new Observer(() => - { - ClearFailureMechanismObservers(); - CreateSpecificFailureMechanismObservers(); - NotifyObservers(); - }) - { - Observable = assessmentSection.SpecificFailureMechanisms - }; - specificFailureMechanismObservers = new List(); - CreateSpecificFailureMechanismObservers(); - closingStructuresObserver = CreateCalculatableFailureMechanismObserver>(assessmentSection.ClosingStructures); @@ -136,8 +123,6 @@ pipingObserver = CreateCalculatableFailureMechanismObserver(assessmentSection.Piping); - pipingScenarioConfigurationsPerSectionObserver = CreatePipingScenarioConfigurationsPerSectionObserver(assessmentSection.Piping); - stabilityPointStructuresObserver = CreateCalculatableFailureMechanismObserver>(assessmentSection.StabilityPointStructures); @@ -161,6 +146,20 @@ waterPressureAsphaltCoverObserver = CreateFailureMechanismObserver(assessmentSection.WaterPressureAsphaltCover); + + specificFailureMechanismsObserver = new Observer(() => + { + ClearFailureMechanismObservers(); + CreateSpecificFailureMechanismObservers(); + NotifyObservers(); + }) + { + Observable = assessmentSection.SpecificFailureMechanisms + }; + specificFailureMechanismObservers = new List(); + CreateSpecificFailureMechanismObservers(); + + pipingScenarioConfigurationsPerSectionObserver = CreatePipingScenarioConfigurationsPerSectionObserver(assessmentSection.Piping); } public void Dispose() @@ -185,7 +184,6 @@ heightStructuresObserver.Dispose(); macroStabilityInwardsObserver.Dispose(); pipingObserver.Dispose(); - pipingScenarioConfigurationsPerSectionObserver.Dispose(); stabilityPointStructuresObserver.Dispose(); stabilityStoneCoverObserver.Dispose(); waveImpactAsphaltCoverObserver.Dispose(); @@ -197,6 +195,8 @@ specificFailureMechanismsObserver.Dispose(); ClearFailureMechanismObservers(); + + pipingScenarioConfigurationsPerSectionObserver.Dispose(); } private void ResubscribeFailureMechanismObservers(AssessmentSection assessmentSection)