Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r567010ec26005f9215844b88c139774de74c2daa -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 567010ec26005f9215844b88c139774de74c2daa) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -117,7 +117,7 @@ private static void AddEntityForHydraulicDatabase(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, AssessmentSectionEntity entity, PersistenceRegistry registry) { - if (hydraulicBoundaryDatabase.IsCoupled()) + if (hydraulicBoundaryDatabase.IsLinked()) { entity.HydraulicDatabaseLocation = hydraulicBoundaryDatabase.FilePath.DeepClone(); entity.HydraulicDatabaseVersion = hydraulicBoundaryDatabase.Version.DeepClone(); Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryDatabaseExtensions.cs =================================================================== diff -u -r0c7f559da0144b5ecf707274a21db465e0ee9b36 -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryDatabaseExtensions.cs (.../HydraulicBoundaryDatabaseExtensions.cs) (revision 0c7f559da0144b5ecf707274a21db465e0ee9b36) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryDatabaseExtensions.cs (.../HydraulicBoundaryDatabaseExtensions.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -29,15 +29,15 @@ public static class HydraulicBoundaryDatabaseExtensions { /// - /// Checks whether the hydraulic boundary database is coupled to a database file. + /// Checks whether the hydraulic boundary database is linked to a database file. /// /// The hydraulic boundary database to check - /// for being coupled. - /// true if the hydraulic boundary database is coupled; + /// for being linked. + /// true if the hydraulic boundary database is linked; /// false otherwise. /// Thrown when /// is null. - public static bool IsCoupled(this HydraulicBoundaryDatabase hydraulicBoundaryDatabase) + public static bool IsLinked(this HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { if (hydraulicBoundaryDatabase == null) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs =================================================================== diff -u -r015c697559a59fc7acaf9bfbfeaa3d60b3c94c8e -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision 015c697559a59fc7acaf9bfbfeaa3d60b3c94c8e) +++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -44,7 +44,7 @@ throw new ArgumentNullException(nameof(hydraulicBoundaryDatabase)); } - if (!hydraulicBoundaryDatabase.IsCoupled()) + if (!hydraulicBoundaryDatabase.IsLinked()) { return Resources.HydraulicBoundaryDatabaseConnectionValidator_No_hydraulic_boundary_database_imported; } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryDatabaseExtensionsTest.cs =================================================================== diff -u -r0c7f559da0144b5ecf707274a21db465e0ee9b36 -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryDatabaseExtensionsTest.cs (.../HydraulicBoundaryDatabaseExtensionsTest.cs) (revision 0c7f559da0144b5ecf707274a21db465e0ee9b36) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryDatabaseExtensionsTest.cs (.../HydraulicBoundaryDatabaseExtensionsTest.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -29,10 +29,10 @@ public class HydraulicBoundaryDatabaseExtensionsTest { [Test] - public void IsCoupled_HydraulicBoundaryDatabaseNull_ThrowsArgumentNullException() + public void IsLinked_HydraulicBoundaryDatabaseNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => HydraulicBoundaryDatabaseExtensions.IsCoupled(null); + TestDelegate test = () => HydraulicBoundaryDatabaseExtensions.IsLinked(null); // Assert string paramName = Assert.Throws(test).ParamName; @@ -66,7 +66,7 @@ [TestCase(null, false)] [TestCase("", false)] [TestCase("Test", true)] - public void IsCoupled_SpecificFilePath_ReturnsExpectedValue(string filePath, bool expectedValue) + public void IsLinked_SpecificFilePath_ReturnsExpectedValue(string filePath, bool expectedValue) { // Setup var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -75,7 +75,7 @@ }; // Call - bool isCoupled = hydraulicBoundaryDatabase.IsCoupled(); + bool isCoupled = hydraulicBoundaryDatabase.IsLinked(); // Assert Assert.AreEqual(expectedValue, isCoupled); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r46653f17a2e39e1e69705b75d05436ac74d84aa1 -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 46653f17a2e39e1e69705b75d05436ac74d84aa1) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -361,7 +361,7 @@ Assert.AreEqual(loggedException.Message, expectedLog.Item1); }); Assert.IsFalse(importResult); - Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsCoupled(), "No HydraulicBoundaryDatabase object should be created when import from corrupt database."); + Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsLinked(), "No HydraulicBoundaryDatabase object should be created when import from corrupt database."); mocks.VerifyAll(); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r6b3ad06df3252c2b4af8b9c755c832a723d8e18f -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 6b3ad06df3252c2b4af8b9c755c832a723d8e18f) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -204,7 +204,7 @@ .AddCollapseAllItem() .AddExpandAllItem() .Build(), - ForeColor = context => context.AssessmentSection.HydraulicBoundaryDatabase.IsCoupled() + ForeColor = context => context.AssessmentSection.HydraulicBoundaryDatabase.IsLinked() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText) }; @@ -482,7 +482,7 @@ private static object[] GetHydraulicBoundariesGroupContextChildNodeObjects(HydraulicBoundariesGroupContext hydraulicBoundariesGroupContext) { IAssessmentSection assessmentSection = hydraulicBoundariesGroupContext.AssessmentSection; - if (!assessmentSection.HydraulicBoundaryDatabase.IsCoupled()) + if (!assessmentSection.HydraulicBoundaryDatabase.IsLinked()) { return new object[0]; } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs =================================================================== diff -u -r66c2f121366073bd6f2944ee0d9c5ec664a4cd09 -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs (.../HydraulicBoundaryDatabaseProperties.cs) (revision 66c2f121366073bd6f2944ee0d9c5ec664a4cd09) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs (.../HydraulicBoundaryDatabaseProperties.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -62,7 +62,7 @@ { get { - return data.WrappedData.HydraulicBoundaryDatabase.IsCoupled() ? data.WrappedData.HydraulicBoundaryDatabase.FilePath : string.Empty; + return data.WrappedData.HydraulicBoundaryDatabase.IsLinked() ? data.WrappedData.HydraulicBoundaryDatabase.FilePath : string.Empty; } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rdd403402744c68406685f2838f6f41e23eada5f2 -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision dd403402744c68406685f2838f6f41e23eada5f2) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -516,7 +516,7 @@ CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter( context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath, RingtoetsIntegrationPluginResources.DesignWaterLevel_Description, RingtoetsIntegrationPluginResources.WaveHeight_Description), - IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase.IsCoupled(), + IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase.IsLinked(), FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description) }; @@ -654,7 +654,7 @@ { Text = hydraulicBoundaryDatabase => RingtoetsFormsResources.HydraulicBoundaryDatabase_DisplayName, Image = hydraulicBoundaryDatabase => RingtoetsCommonFormsResources.GenericInputOutputIcon, - ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase.IsCoupled() + ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase.IsLinked() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText), ChildNodeObjects = HydraulicBoundaryDatabaseChildNodeObjects, @@ -835,8 +835,8 @@ { return; } - IEnumerable sectionsWithHydraulicBoundaryDatabaseCoupled = ringtoetsProject.AssessmentSections.Where(i => i.HydraulicBoundaryDatabase.IsCoupled()); - foreach (AssessmentSection section in sectionsWithHydraulicBoundaryDatabaseCoupled) + IEnumerable sectionsWithHydraulicBoundaryDatabaseLinked = ringtoetsProject.AssessmentSections.Where(i => i.HydraulicBoundaryDatabase.IsLinked()); + foreach (AssessmentSection section in sectionsWithHydraulicBoundaryDatabaseLinked) { string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(section.HydraulicBoundaryDatabase.FilePath, section.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); @@ -1376,7 +1376,7 @@ private static object[] HydraulicBoundaryDatabaseChildNodeObjects(HydraulicBoundaryDatabaseContext nodeData) { - if (nodeData.WrappedData.HydraulicBoundaryDatabase.IsCoupled()) + if (nodeData.WrappedData.HydraulicBoundaryDatabase.IsLinked()) { return new object[] { @@ -1515,7 +1515,7 @@ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; bool haveEqualVersion = HydraulicBoundaryDatabaseHelper.HaveEqualVersion(hydraulicBoundaryDatabase, databaseFile); - bool isClearConfirmationRequired = hydraulicBoundaryDatabase.IsCoupled() && !haveEqualVersion; + bool isClearConfirmationRequired = hydraulicBoundaryDatabase.IsLinked() && !haveEqualVersion; if (isClearConfirmationRequired && !IsClearCalculationConfirmationGiven()) { return; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rc1e4cfd0fea0d560528c8d60935ce50a7243cf25 -r0d495f2706215f1b75da521c905eb6105f2f8a34 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision c1e4cfd0fea0d560528c8d60935ce50a7243cf25) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 0d495f2706215f1b75da521c905eb6105f2f8a34) @@ -317,7 +317,7 @@ Assert.AreEqual($"Database op pad '{testFile}' gekoppeld.", msgs[1]); }); - Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.IsCoupled()); + Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.IsLinked()); Assert.AreEqual(testFile, assessmentSection.HydraulicBoundaryDatabase.FilePath); Assert.AreEqual("Dutch coast South19-11-2015 12:0013", assessmentSection.HydraulicBoundaryDatabase.Version); CollectionAssert.IsNotEmpty(assessmentSection.HydraulicBoundaryDatabase.Locations); @@ -373,7 +373,7 @@ string expectedMessage = $"Fout bij het lezen van bestand '{testFile}': kon geen locaties verkrijgen van de database."; TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsCoupled()); + Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsLinked()); } } mocks.VerifyAll(); @@ -426,7 +426,7 @@ $"Fout bij het lezen van bestand '{testFile}': het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand."; TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsCoupled()); + Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsLinked()); } } mocks.VerifyAll(); @@ -467,7 +467,7 @@ assessmentSection.GrassCoverErosionOutwards.SetGrassCoverErosionOutwardsHydraulicBoundaryLocations(assessmentSection.HydraulicBoundaryDatabase.Locations); // Precondition - Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.IsCoupled()); + Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.IsLinked()); CollectionAssert.IsNotEmpty(assessmentSection.HydraulicBoundaryDatabase.Locations); string currentFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; @@ -506,7 +506,7 @@ string expectedMessage = $"Database op pad '{validFilePath}' gekoppeld."; TestHelper.AssertLogMessageIsGenerated(action, expectedMessage); - Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.IsCoupled()); + Assert.IsTrue(assessmentSection.HydraulicBoundaryDatabase.IsLinked()); Assert.AreEqual(currentFilePath, assessmentSection.HydraulicBoundaryDatabase.FilePath); Assert.AreEqual(currentVersion, assessmentSection.HydraulicBoundaryDatabase.Version); CollectionAssert.AreEqual(currentLocations, assessmentSection.HydraulicBoundaryDatabase.Locations);