Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs =================================================================== diff -u -r20415b2886919a103cb4677f56a8f61abbb7aa8a -r6377a7a3521a804190c503f9ae1f1fe9050d6546 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 20415b2886919a103cb4677f56a8f61abbb7aa8a) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 6377a7a3521a804190c503f9ae1f1fe9050d6546) @@ -139,6 +139,14 @@ assessmentSection)).ToArray()); } + private void ValidateAll(IEnumerable heightStructuresCalculations, IAssessmentSection assessmentSection) + { + foreach (var calculation in heightStructuresCalculations) + { + HeightStructuresCalculationService.Validate(calculation, assessmentSection); + } + } + private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection, HeightStructuresFailureMechanism failureMechanism) { if (!failureMechanism.Sections.Any()) @@ -244,9 +252,9 @@ .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) .AddSeparator() .AddValidateAllCalculationsInFailureMechanismItem( - context, - c => ValidateAll(c.WrappedData.Calculations.OfType(), c.Parent), - ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism) + context, + c => ValidateAll(c.WrappedData.Calculations.OfType(), c.Parent), + ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism) .AddPerformAllCalculationsInFailureMechanismItem(context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism) .AddClearAllCalculationOutputInFailureMechanismItem(context.WrappedData) .AddSeparator() @@ -336,8 +344,8 @@ .AddCreateCalculationItem(context, AddCalculation) .AddSeparator() .AddValidateAllCalculationsInGroupItem( - context, - c => ValidateAll(c.WrappedData.GetCalculations().OfType(), c.AssessmentSection), + context, + c => ValidateAll(c.WrappedData.GetCalculations().OfType(), c.AssessmentSection), ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup) .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup) .AddClearAllCalculationOutputInGroupItem(group) @@ -360,14 +368,6 @@ .Build(); } - private void ValidateAll(IEnumerable heightStructuresCalculations, IAssessmentSection assessmentSection) - { - foreach (var calculation in heightStructuresCalculations) - { - HeightStructuresCalculationService.Validate(calculation, assessmentSection); - } - } - private static void CalculationGroupContextOnNodeRemoved(HeightStructuresCalculationGroupContext context, object parentNodeData) { var parentGroupContext = (HeightStructuresCalculationGroupContext) parentNodeData; @@ -430,9 +430,9 @@ HeightStructuresCalculation calculation = context.WrappedData; return builder.AddValidateCalculationItem( - context, - c => HeightStructuresCalculationService.Validate(c.WrappedData, c.AssessmentSection), - ValidateAllDataAvailableAndGetErrorMessageForCalculation) + context, + c => HeightStructuresCalculationService.Validate(c.WrappedData, c.AssessmentSection), + ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) .AddSeparator()