Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -rcfc663ba43f203e8e268f5527c4fa298aa3b6cde -rfd12ada286ef8af1248a9d6100410dfeb15e9669 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision cfc663ba43f203e8e268f5527c4fa298aa3b6cde) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision fd12ada286ef8af1248a9d6100410dfeb15e9669) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2018. All rights reserved. +// Copyright (C) Stichting Deltares 2018. All rights reserved. // // This file is part of Ringtoets. // @@ -58,14 +58,18 @@ protected override void LogImportCanceledMessage() { - throw new System.NotImplementedException(); + Log.Info(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Import_canceled_No_data_changed); } protected override bool OnImport() { ReadResult readResult = ReadHydraulicBoundaryDatabase(); + if (readResult.CriticalErrorOccurred || Canceled) + { + return false; + } - return !readResult.CriticalErrorOccurred; + return true; } private ReadResult ReadHydraulicBoundaryDatabase() Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rcfc663ba43f203e8e268f5527c4fa298aa3b6cde -rfd12ada286ef8af1248a9d6100410dfeb15e9669 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cfc663ba43f203e8e268f5527c4fa298aa3b6cde) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fd12ada286ef8af1248a9d6100410dfeb15e9669) @@ -122,6 +122,15 @@ } /// + /// Looks up a localized string similar to Hydraulische belastingen database koppelen afgebroken. Geen gegevens gewijzigd.. + /// + internal static string HydraulicBoundaryDatabaseImporter_ProgressText_Import_canceled_No_data_changed { + get { + return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ProgressText_Import_canceled_No_data_changed", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Inlezen van het hydraulische belastingen bestand.. /// internal static string HydraulicBoundaryDatabaseImporter_ReadHydraulicBoundaryDatabase_Read_HRD_file { Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx =================================================================== diff -u -rcfc663ba43f203e8e268f5527c4fa298aa3b6cde -rfd12ada286ef8af1248a9d6100410dfeb15e9669 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision cfc663ba43f203e8e268f5527c4fa298aa3b6cde) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision fd12ada286ef8af1248a9d6100410dfeb15e9669) @@ -1,4 +1,4 @@ - +