Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs
===================================================================
diff -u -re93f3cb97066cae85be4a977098261d47ba6eb57 -r92210258706d0f57e05552037b676bd941a6fe19
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision e93f3cb97066cae85be4a977098261d47ba6eb57)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
@@ -53,22 +53,19 @@
/// Performs validation over the values on the given .
/// Error and status information is logged during the execution of the operation.
///
- /// The name of the dune location.
/// The file path of the hydraulic boundary
/// database file which to validate.
/// True if there were no validation errors; False otherwise.
- public static bool Validate(string duneLocationName, string hydraulicBoundaryDatabaseFilePath)
+ public static bool Validate(string hydraulicBoundaryDatabaseFilePath)
{
- string calculationName = GetCalculationName(duneLocationName);
+ CalculationServiceHelper.LogValidationBegin();
- CalculationServiceHelper.LogValidationBegin(calculationName);
-
string[] validationProblems = ValidateInput(hydraulicBoundaryDatabaseFilePath);
CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_,
validationProblems);
- CalculationServiceHelper.LogValidationEnd(calculationName);
+ CalculationServiceHelper.LogValidationEnd();
return !validationProblems.Any();
}
@@ -112,9 +109,8 @@
string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
string duneLocationName = duneLocation.Name;
- string calculationName = GetCalculationName(duneLocationName);
- CalculationServiceHelper.LogCalculationBegin(calculationName);
+ CalculationServiceHelper.LogCalculationBegin();
calculator = HydraRingCalculatorFactory.Instance.CreateDunesBoundaryConditionsCalculator(hlcdDirectory);
@@ -159,7 +155,7 @@
log.InfoFormat(Resources.DuneErosionBoundaryCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0,
calculator.OutputDirectory);
- CalculationServiceHelper.LogCalculationEnd(calculationName);
+ CalculationServiceHelper.LogCalculationEnd();
if (hasErrorOccurred)
{
@@ -177,11 +173,6 @@
canceled = true;
}
- private static string GetCalculationName(string duneLocationName)
- {
- return string.Format(Resources.CalculationName_of_DuneLocation_0, duneLocationName);
- }
-
///
/// Create the output of the calculation.
///