Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs =================================================================== diff -u -r0a51f20ac93373a43f79bb4c6327bce1d46545c6 -r5e6eacaf76f765ba77febee673e9e94895e46feb --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 0a51f20ac93373a43f79bb4c6327bce1d46545c6) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb) @@ -136,10 +136,10 @@ calculations.Select(calc => new HeightStructuresCalculationActivity(calc, Path.GetDirectoryName(assessmentSection.HydraulicBoundaryDatabase.FilePath), failureMechanism, - assessmentSection)).ToList()); + assessmentSection)).ToArray()); } - private static string AllDataAvailable(IAssessmentSection assessmentSection, HeightStructuresFailureMechanism failureMechanism) + private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection, HeightStructuresFailureMechanism failureMechanism) { if (!failureMechanism.Sections.Any()) { @@ -243,7 +243,7 @@ .AddSeparator() .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) .AddSeparator() - .AddPerformAllCalculationsInFailureMechanismItem(context, CalculateAll, EnablePerformAllCalculationsInFailureMechanism) + .AddPerformAllCalculationsInFailureMechanismItem(context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism) .AddClearAllCalculationOutputInFailureMechanismItem(context.WrappedData) .AddSeparator() .AddImportItem() @@ -272,9 +272,9 @@ .Build(); } - private static string EnablePerformAllCalculationsInFailureMechanism(HeightStructuresFailureMechanismContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism(HeightStructuresFailureMechanismContext context) { - return AllDataAvailable(context.Parent, context.WrappedData); + return ValidateAllDataAvailableAndGetErrorMessage(context.Parent, context.WrappedData); } private void CalculateAll(HeightStructuresFailureMechanismContext context) @@ -331,7 +331,7 @@ builder.AddCreateCalculationGroupItem(group) .AddCreateCalculationItem(context, AddCalculation) .AddSeparator() - .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, EnablePerformAllCalculationsInGroup) + .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup) .AddClearAllCalculationOutputInGroupItem(group) .AddSeparator(); @@ -370,9 +370,9 @@ context.WrappedData.NotifyObservers(); } - private static string EnablePerformAllCalculationsInGroup(HeightStructuresCalculationGroupContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup(HeightStructuresCalculationGroupContext context) { - return AllDataAvailable(context.AssessmentSection, context.FailureMechanism); + return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); } private void CalculateAll(CalculationGroup group, HeightStructuresCalculationGroupContext context) @@ -413,7 +413,7 @@ HeightStructuresCalculation calculation = context.WrappedData; - return builder.AddPerformCalculationItem(calculation, context, Calculate, EnablePerformCalculation) + return builder.AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) .AddSeparator() .AddRenameItem() @@ -429,9 +429,9 @@ .Build(); } - private static string EnablePerformCalculation(HeightStructuresCalculationContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculation(HeightStructuresCalculationContext context) { - return AllDataAvailable(context.AssessmentSection, context.FailureMechanism); + return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); } private void Calculate(HeightStructuresCalculation calculation, HeightStructuresCalculationContext context)