Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -rac0f74af45101f8f5c081ed81f4a65c75a2f259e
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision b6f4e414fc874653cc6ad84b80f330b28e69b823)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision ac0f74af45101f8f5c081ed81f4a65c75a2f259e)
@@ -86,7 +86,7 @@
                 CalculationGroupContextOnNodeRemoved);
 
             yield return RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo<ClosingStructuresCalculationContext>(
-                CalculationContextChildNodeObjects, 
+                CalculationContextChildNodeObjects,
                 CalculationContextContextMenuStrip,
                 CalculationContextOnNodeRemoved);
 
@@ -183,6 +183,33 @@
 
         #endregion
 
+        private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection, ClosingStructuresFailureMechanism failureMechanism)
+        {
+            if (!failureMechanism.Sections.Any())
+            {
+                return RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported;
+            }
+
+            if (assessmentSection.HydraulicBoundaryDatabase == null)
+            {
+                return RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported;
+            }
+
+            var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
+            if (!string.IsNullOrEmpty(validationProblem))
+            {
+                return string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
+                                     validationProblem);
+            }
+
+            return null;
+        }
+
+        private static void CalculateAll(ClosingStructuresFailureMechanism failureMechanism, IEnumerable<ClosingStructuresCalculation> calculations)
+        {
+            //Add calculate logic, part of WTI-554
+        }
+
         #region TreeNodeInfo
 
         #region ClosingStructuresFailureMechanismContext TreeNodeInfo
@@ -385,8 +412,8 @@
             {
                 new CommentContext<ICommentable>(context.WrappedData),
                 new ClosingStructuresInputContext(context.WrappedData.InputParameters,
-                                                 context.FailureMechanism,
-                                                 context.AssessmentSection)
+                                                  context.FailureMechanism,
+                                                  context.AssessmentSection)
             };
 
             if (context.WrappedData.HasOutput)
@@ -407,8 +434,8 @@
 
             ClosingStructuresCalculation calculation = context.WrappedData;
 
-            return builder.AddValidateCalculationItem(context, null, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
-                          .AddPerformCalculationItem(calculation, context, null, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+            return builder.AddValidateCalculationItem(context, ValidateAction, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+                          .AddPerformCalculationItem(calculation, context, CalculateAction, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddClearCalculationOutputItem(calculation)
                           .AddSeparator()
                           .AddRenameItem()
@@ -421,6 +448,10 @@
                           .Build();
         }
 
+        private void CalculateAction(ClosingStructuresCalculation closingStructuresCalculation, ClosingStructuresCalculationContext closingStructuresCalculationContext) {}
+
+        private void ValidateAction(ClosingStructuresCalculationContext closingStructuresCalculationContext) {}
+
         private string ValidateAllDataAvailableAndGetErrorMessageForCalculation(ClosingStructuresCalculationContext context)
         {
             return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism);
@@ -439,32 +470,5 @@
         #endregion
 
         #endregion
-
-        private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection, ClosingStructuresFailureMechanism failureMechanism)
-        {
-            if (!failureMechanism.Sections.Any())
-            {
-                return RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported;
-            }
-
-            if (assessmentSection.HydraulicBoundaryDatabase == null)
-            {
-                return RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported;
-            }
-
-            var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
-            if (!string.IsNullOrEmpty(validationProblem))
-            {
-                return string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
-                                     validationProblem);
-            }
-
-            return null;
-        }
-
-        private static void CalculateAll(ClosingStructuresFailureMechanism failureMechanism, IEnumerable<ClosingStructuresCalculation> calculations)
-        {
-            //Add calculate logic, part of WTI-554
-        }
     }
 }
\ No newline at end of file