Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r6c058f12138b8a73a78eacd10357d9caa81ed67d -r92210258706d0f57e05552037b676bd941a6fe19
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 6c058f12138b8a73a78eacd10357d9caa81ed67d)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
@@ -52,22 +52,18 @@
/// Performs validation over the values on the given .
/// Error and status information is logged during the execution of the operation.
///
- /// The name of the calculation.
/// The file path of the hydraulic boundary database file which to validate.
- /// The object which is used to build log messages.
/// True if there were no validation errors; False otherwise.
- public static bool Validate(string name, string hydraulicBoundaryDatabaseFilePath, ICalculationMessageProvider messageProvider)
+ public static bool Validate(string hydraulicBoundaryDatabaseFilePath)
{
- string calculationName = messageProvider.GetCalculationName(name);
+ CalculationServiceHelper.LogValidationBegin();
- CalculationServiceHelper.LogValidationBegin(calculationName);
-
string[] validationProblems = ValidateInput(hydraulicBoundaryDatabaseFilePath);
CalculationServiceHelper.LogMessagesAsError(Resources.Hydraulic_boundary_database_connection_failed_0_,
validationProblems);
- CalculationServiceHelper.LogValidationEnd(calculationName);
+ CalculationServiceHelper.LogValidationEnd();
return !validationProblems.Any();
}
@@ -104,9 +100,8 @@
throw new ArgumentNullException(nameof(designWaterLevelCalculation));
}
string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
- string calculationName = messageProvider.GetCalculationName(designWaterLevelCalculation.GetName());
- CalculationServiceHelper.LogCalculationBegin(calculationName);
+ CalculationServiceHelper.LogCalculationBegin();
calculator = HydraRingCalculatorFactory.Instance.CreateDesignWaterLevelCalculator(hlcdDirectory);
@@ -165,7 +160,7 @@
}
log.InfoFormat(Resources.DesignWaterLevelCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0, calculator.OutputDirectory);
- CalculationServiceHelper.LogCalculationEnd(calculationName);
+ CalculationServiceHelper.LogCalculationEnd();
if (errorOccurred)
{