Index: Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicBoundaryDataUpdateHandler.cs
===================================================================
diff -u -r7d9a6f8471cb719a1f6a22f35c5e0ab5c5d4521d -r904828e9ff05079392f92097fbaf35b7baf3f7ca
--- Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicBoundaryDataUpdateHandler.cs (.../IHydraulicBoundaryDataUpdateHandler.cs) (revision 7d9a6f8471cb719a1f6a22f35c5e0ab5c5d4521d)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicBoundaryDataUpdateHandler.cs (.../IHydraulicBoundaryDataUpdateHandler.cs) (revision 904828e9ff05079392f92097fbaf35b7baf3f7ca)
@@ -29,26 +29,12 @@
namespace Riskeer.Integration.IO.Handlers
{
///
- /// Interface for an object that can properly update .
+ /// Interface for an object that can properly update the hydraulic boundary databases within a
+ /// instance.
///
public interface IHydraulicBoundaryDataUpdateHandler
{
///
- /// Checks whether confirmation is required before updating the .
- ///
- /// The hydraulic boundary data.
- /// The read hydraulic boundary database.
- /// true when confirmation is required; false otherwise.
- /// Thrown when any parameter is null.
- bool IsConfirmationRequired(HydraulicBoundaryData hydraulicBoundaryData, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase);
-
- ///
- /// Gets confirmation for updating the .
- ///
- /// true when confirmation is given; false otherwise.
- bool InquireConfirmation();
-
- ///
/// Updates the and its dependent data with the
/// and the .
///
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -r3a3631387cdee66bfc9110aeae5cd282bf2e80c6 -r904828e9ff05079392f92097fbaf35b7baf3f7ca
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 3a3631387cdee66bfc9110aeae5cd282bf2e80c6)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 904828e9ff05079392f92097fbaf35b7baf3f7ca)
@@ -88,8 +88,6 @@
ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = readHydraulicBoundaryDatabaseResult.Items.Single();
- InquireConfirmation(readHydraulicBoundaryDatabase);
-
if (Canceled)
{
return false;
@@ -151,15 +149,6 @@
}
}
- private void InquireConfirmation(ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase)
- {
- if (updateHandler.IsConfirmationRequired(ImportTarget, readHydraulicBoundaryDatabase)
- && !updateHandler.InquireConfirmation())
- {
- Cancel();
- }
- }
-
private ReadResult ReadHydraulicBoundaryDatabase()
{
NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_Hrd_file, 1, numberOfSteps);
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs
===================================================================
diff -u -rd2c1b3a295c8f9364958b3b5efb24aa7158dc8c8 -r904828e9ff05079392f92097fbaf35b7baf3f7ca
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs (.../HydraulicBoundaryDataUpdateHandler.cs) (revision d2c1b3a295c8f9364958b3b5efb24aa7158dc8c8)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs (.../HydraulicBoundaryDataUpdateHandler.cs) (revision 904828e9ff05079392f92097fbaf35b7baf3f7ca)
@@ -38,7 +38,7 @@
namespace Riskeer.Integration.Plugin.Handlers
{
///
- /// Class that can properly update .
+ /// Class that can properly update the hydraulic boundary databases within a instance.
///
public class HydraulicBoundaryDataUpdateHandler : IHydraulicBoundaryDataUpdateHandler
{
@@ -69,29 +69,6 @@
this.duneLocationsReplacementHandler = duneLocationsReplacementHandler;
}
- public bool IsConfirmationRequired(HydraulicBoundaryData hydraulicBoundaryData, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase)
- {
- if (hydraulicBoundaryData == null)
- {
- throw new ArgumentNullException(nameof(hydraulicBoundaryData));
- }
-
- if (readHydraulicBoundaryDatabase == null)
- {
- throw new ArgumentNullException(nameof(readHydraulicBoundaryDatabase));
- }
-
- return hydraulicBoundaryData.IsLinked() && hydraulicBoundaryData.Version != readHydraulicBoundaryDatabase.Version;
- }
-
- public bool InquireConfirmation()
- {
- DialogResult result = MessageBox.Show(Resources.HydraulicBoundaryDataUpdateHandler_Confirm_clear_hydraulicBoundaryDatabase_dependent_data,
- CoreCommonBaseResources.Confirm,
- MessageBoxButtons.OKCancel);
- return result == DialogResult.OK;
- }
-
public IEnumerable Update(HydraulicBoundaryData hydraulicBoundaryData, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase,
ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase,
IEnumerable excludedLocationIds, string hrdFilePath, string hlcdFilePath)
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r860eed203cc3c5066a637a614445b4c842cdd93d -r904828e9ff05079392f92097fbaf35b7baf3f7ca
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 860eed203cc3c5066a637a614445b4c842cdd93d)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 904828e9ff05079392f92097fbaf35b7baf3f7ca)
@@ -438,18 +438,6 @@
}
///
- /// Looks up a localized string similar to U heeft een ander hydraulische belastingendatabase bestand geselecteerd. Als gevolg hiervan moet de uitvoer van alle ervan afhankelijke berekeningen verwijderd worden.
- ///
- ///Wilt u doorgaan?.
- ///
- public static string HydraulicBoundaryDataUpdateHandler_Confirm_clear_hydraulicBoundaryDatabase_dependent_data {
- get {
- return ResourceManager.GetString("HydraulicBoundaryDataUpdateHandler_Confirm_clear_hydraulicBoundaryDatabase_depend" +
- "ent_data", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to sqlite.
///
public static string HydraulicDatabase_FilePath_Extension {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r860eed203cc3c5066a637a614445b4c842cdd93d -r904828e9ff05079392f92097fbaf35b7baf3f7ca
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 860eed203cc3c5066a637a614445b4c842cdd93d)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 904828e9ff05079392f92097fbaf35b7baf3f7ca)
@@ -224,12 +224,6 @@
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- U heeft een ander hydraulische belastingendatabase bestand geselecteerd. Als gevolg hiervan moet de uitvoer van alle ervan afhankelijke berekeningen verwijderd worden.
-
-Wilt u doorgaan?
-
sqlite