Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -r78d81c5277da2f3f016dcde8ef1de0cb39fd4248 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 78d81c5277da2f3f016dcde8ef1de0cb39fd4248) @@ -322,9 +322,7 @@ builder.AddSeparator() .AddValidateAllCalculationsInGroupItem(nodeData, - c => ValidateAll( - c.WrappedData.GetCalculations().OfType(), - c.AssessmentSection.HydraulicBoundaryDatabase), + ValidateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup) .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup) .AddClearAllCalculationOutputInGroupItem(group) @@ -344,6 +342,12 @@ .Build(); } + private static void ValidateAll(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context) + { + ValidateAll(context.WrappedData.GetCalculations().OfType(), + context.AssessmentSection.HydraulicBoundaryDatabase); + } + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); @@ -502,12 +506,7 @@ return builder.AddExportItem() .AddSeparator() .AddValidateCalculationItem(nodeData, - c => ValidateAll( - new[] - { - c.WrappedData - }, - c.AssessmentSection.HydraulicBoundaryDatabase), + ValidateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, nodeData, PerformCalculation, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) @@ -522,6 +521,16 @@ .Build(); } + private static void ValidateAll(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) + { + ValidateAll( + new[] + { + context.WrappedData + }, + context.AssessmentSection.HydraulicBoundaryDatabase); + } + private void PerformCalculation(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, WaveImpactAsphaltCoverWaveConditionsCalculationContext context) {