Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r3cc23c40d1904a58a7d4ded98d4785c70a3d6d40 -r57a5b5b06a46a58bb9da6b55363b93d25d8f5f67
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 3cc23c40d1904a58a7d4ded98d4785c70a3d6d40)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 57a5b5b06a46a58bb9da6b55363b93d25d8f5f67)
@@ -245,41 +245,6 @@
                                            RiskeerCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description);
         }
 
-        private void CalculateAll(WaveImpactAsphaltCoverFailureMechanismContext context)
-        {
-            ActivityProgressDialogRunner.Run(
-                Gui.MainWindow,
-                WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData,
-                                                                                                           context.Parent));
-        }
-
-        private void CalculateAll(CalculationGroup group, WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context)
-        {
-            ActivityProgressDialogRunner.Run(
-                Gui.MainWindow,
-                WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(group,
-                                                                                                           context.FailureMechanism,
-                                                                                                           context.AssessmentSection));
-        }
-
-        private static void ValidateAll(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context)
-        {
-            ValidateAll(context.WrappedData.GetCalculations().OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>(),
-                        context.AssessmentSection);
-        }
-
-        private static void ValidateAll(IEnumerable<WaveImpactAsphaltCoverWaveConditionsCalculation> calculations, IAssessmentSection assessmentSection)
-        {
-            foreach (WaveImpactAsphaltCoverWaveConditionsCalculation calculation in calculations)
-            {
-                WaveConditionsCalculationServiceBase.Validate(calculation.InputParameters,
-                                                              assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
-                                                                                                   calculation.InputParameters.CategoryType),
-                                                              assessmentSection.HydraulicBoundaryDatabase,
-                                                              assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
-            }
-        }
-
         #region ViewInfos
 
         #region WaveImpactAsphaltCoverFailureMechanismView ViewInfo
@@ -394,6 +359,14 @@
                           .Build();
         }
 
+        private void CalculateAll(WaveImpactAsphaltCoverFailureMechanismContext context)
+        {
+            ActivityProgressDialogRunner.Run(
+                Gui.MainWindow,
+                WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData,
+                                                                                                           context.Parent));
+        }
+
         private void RemoveAllViewsForItem(WaveImpactAsphaltCoverFailureMechanismContext failureMechanismContext)
         {
             Gui.ViewCommands.RemoveAllViewsForItem(failureMechanismContext);
@@ -518,6 +491,12 @@
                           .Build();
         }
 
+        private static void ValidateAll(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context)
+        {
+            ValidateAll(context.WrappedData.GetCalculations().OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>(),
+                        context.AssessmentSection);
+        }
+
         private static string ValidateAllDataAvailableAndGetErrorMessageForFailureMechanism(WaveImpactAsphaltCoverFailureMechanismContext context)
         {
             return ValidateAllDataAvailableAndGetErrorMessage(context.Parent);
@@ -595,6 +574,27 @@
             nodeData.WrappedData.NotifyObservers();
         }
 
+        private static void ValidateAll(IEnumerable<WaveImpactAsphaltCoverWaveConditionsCalculation> calculations, IAssessmentSection assessmentSection)
+        {
+            foreach (WaveImpactAsphaltCoverWaveConditionsCalculation calculation in calculations)
+            {
+                WaveConditionsCalculationServiceBase.Validate(calculation.InputParameters,
+                                                              assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
+                                                                                                   calculation.InputParameters.CategoryType),
+                                                              assessmentSection.HydraulicBoundaryDatabase,
+                                                              assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
+            }
+        }
+
+        private void CalculateAll(CalculationGroup group, WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context)
+        {
+            ActivityProgressDialogRunner.Run(
+                Gui.MainWindow,
+                WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(group,
+                                                                                                           context.FailureMechanism,
+                                                                                                           context.AssessmentSection));
+        }
+
         private static void WaveConditionsCalculationGroupContextOnNodeRemoved(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData, object parentNodeData)
         {
             var parentGroupContext = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) parentNodeData;