Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r6e51cdff470daae9a0161994956fc5d554b0b051 -r82b6560971f0bdf31d76403dceb70110ef7df365
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 6e51cdff470daae9a0161994956fc5d554b0b051)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 82b6560971f0bdf31d76403dceb70110ef7df365)
@@ -269,11 +269,6 @@
                 GetInquiryHelper());
         }
 
-        private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection)
-        {
-            return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
-        }
-
         #region ViewInfo
 
         #region ClosingStructuresFailureMechanismView ViewInfo
@@ -407,12 +402,12 @@
                           .AddSeparator()
                           .AddValidateAllCalculationsInFailureMechanismItem(
                               closingStructuresFailureMechanismContext,
-                              ValidateAll,
-                              ValidateAllDataAvailableAndGetErrorMessage)
+                              ValidateAllInFailureMechanism,
+                              EnableValidateAndCalculateMenuItemForFailureMechanism)
                           .AddPerformAllCalculationsInFailureMechanismItem(
                               closingStructuresFailureMechanismContext,
-                              CalculateAll,
-                              ValidateAllDataAvailableAndGetErrorMessage)
+                              CalculateAllInFailureMechanism,
+                              EnableValidateAndCalculateMenuItemForFailureMechanism)
                           .AddSeparator()
                           .AddClearAllCalculationOutputInFailureMechanismItem(closingStructuresFailureMechanismContext.WrappedData)
                           .AddClearIllustrationPointsOfCalculationsInFailureMechanismItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations),
@@ -447,26 +442,18 @@
                           .Build();
         }
 
-        private static void ValidateAll(IEnumerable<StructuresCalculation<ClosingStructuresInput>> closingStructuresCalculations, IAssessmentSection assessmentSection)
+        private static void ValidateAllInFailureMechanism(ClosingStructuresFailureMechanismContext context)
         {
-            foreach (StructuresCalculation<ClosingStructuresInput> calculation in closingStructuresCalculations)
-            {
-                ClosingStructuresCalculationService.Validate(calculation, assessmentSection);
-            }
-        }
-
-        private static void ValidateAll(ClosingStructuresFailureMechanismContext context)
-        {
             ValidateAll(context.WrappedData.Calculations.OfType<StructuresCalculation<ClosingStructuresInput>>(),
                         context.Parent);
         }
 
-        private static string ValidateAllDataAvailableAndGetErrorMessage(ClosingStructuresFailureMechanismContext context)
+        private static string EnableValidateAndCalculateMenuItemForFailureMechanism(ClosingStructuresFailureMechanismContext context)
         {
-            return ValidateAllDataAvailableAndGetErrorMessage(context.Parent);
+            return EnableValidateAndCalculateMenuItem(context.Parent);
         }
 
-        private void CalculateAll(ClosingStructuresFailureMechanismContext context)
+        private void CalculateAllInFailureMechanism(ClosingStructuresFailureMechanismContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
                                              ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.Parent));
@@ -551,13 +538,13 @@
                    .AddSeparator()
                    .AddValidateAllCalculationsInGroupItem(
                        context,
-                       ValidateAll,
-                       ValidateAllDataAvailableAndGetErrorMessage)
+                       ValidateAllInCalculationGroup,
+                       EnableValidateAndCalculateMenuItemForCalculationGroup)
                    .AddPerformAllCalculationsInGroupItem(
                        group,
                        context,
-                       CalculateAll,
-                       ValidateAllDataAvailableAndGetErrorMessage)
+                       CalculateAllInCalculationGroup,
+                       EnableValidateAndCalculateMenuItemForCalculationGroup)
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group)
                    .AddClearIllustrationPointsOfCalculationsInGroupItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations),
@@ -670,17 +657,17 @@
             ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism);
         }
 
-        private static void ValidateAll(ClosingStructuresCalculationGroupContext context)
+        private static void ValidateAllInCalculationGroup(ClosingStructuresCalculationGroupContext context)
         {
             ValidateAll(context.WrappedData.GetCalculations().OfType<StructuresCalculation<ClosingStructuresInput>>(), context.AssessmentSection);
         }
 
-        private static string ValidateAllDataAvailableAndGetErrorMessage(ClosingStructuresCalculationGroupContext context)
+        private static string EnableValidateAndCalculateMenuItemForCalculationGroup(ClosingStructuresCalculationGroupContext context)
         {
-            return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection);
+            return EnableValidateAndCalculateMenuItem(context.AssessmentSection);
         }
 
-        private void CalculateAll(CalculationGroup group, ClosingStructuresCalculationGroupContext context)
+        private void CalculateAllInCalculationGroup(CalculationGroup group, ClosingStructuresCalculationGroupContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
                                              ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(group,
@@ -749,13 +736,13 @@
                           .AddSeparator()
                           .AddValidateCalculationItem(
                               context,
-                              ValidateAll,
-                              ValidateAllDataAvailableAndGetErrorMessage)
+                              Validate,
+                              EnableValidateAndCalculateMenuItemForCalculation)
                           .AddPerformCalculationItem(
                               calculation,
                               context,
                               Calculate,
-                              ValidateAllDataAvailableAndGetErrorMessage)
+                              EnableValidateAndCalculateMenuItemForCalculation)
                           .AddSeparator()
                           .AddClearCalculationOutputItem(calculation)
                           .AddClearIllustrationPointsOfCalculationItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculation), changeHandler)
@@ -776,14 +763,14 @@
                                                                                                                    context.AssessmentSection));
         }
 
-        private static void ValidateAll(ClosingStructuresCalculationContext context)
+        private static void Validate(ClosingStructuresCalculationContext context)
         {
             ClosingStructuresCalculationService.Validate(context.WrappedData, context.AssessmentSection);
         }
 
-        private static string ValidateAllDataAvailableAndGetErrorMessage(ClosingStructuresCalculationContext context)
+        private static string EnableValidateAndCalculateMenuItemForCalculation(ClosingStructuresCalculationContext context)
         {
-            return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection);
+            return EnableValidateAndCalculateMenuItem(context.AssessmentSection);
         }
 
         private static void CalculationContextOnNodeRemoved(ClosingStructuresCalculationContext context, object parentData)
@@ -859,16 +846,25 @@
 
         #endregion
 
-        #region Helpers
-
         private ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler CreateChangeHandler(
             IInquiryHelper inquiryHelper, IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations)
         {
             return new ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler(inquiryHelper, calculations);
         }
 
-        #endregion
+        private static void ValidateAll(IEnumerable<StructuresCalculation<ClosingStructuresInput>> closingStructuresCalculations, IAssessmentSection assessmentSection)
+        {
+            foreach (StructuresCalculation<ClosingStructuresInput> calculation in closingStructuresCalculations)
+            {
+                ClosingStructuresCalculationService.Validate(calculation, assessmentSection);
+            }
+        }
 
+        private static string EnableValidateAndCalculateMenuItem(IAssessmentSection assessmentSection)
+        {
+            return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
+        }
+
         #endregion
 
         #region Importers