Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresContextTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresContextTreeNodeInfoTest.cs (.../ClosingStructuresContextTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresContextTreeNodeInfoTest.cs (.../ClosingStructuresContextTreeNodeInfoTest.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -124,7 +124,7 @@ { // Setup var mocks = new MockRepository(); - var asssessmentSection = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); @@ -136,7 +136,7 @@ // Precondition CollectionAssert.IsNotEmpty(failureMechanism.ClosingStructures); - var closingStructuresContext = new ClosingStructuresContext(failureMechanism.ClosingStructures, failureMechanism, asssessmentSection); + var closingStructuresContext = new ClosingStructuresContext(failureMechanism.ClosingStructures, failureMechanism, assessmentSection); // Call Color color = info.ForeColor(closingStructuresContext); @@ -180,15 +180,15 @@ { // Setup var mocks = new MockRepository(); - var asssessmentSection = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); // Precondition CollectionAssert.IsEmpty(failureMechanism.ClosingStructures); - var closingStructuresContext = new ClosingStructuresContext(failureMechanism.ClosingStructures, failureMechanism, asssessmentSection); + var closingStructuresContext = new ClosingStructuresContext(failureMechanism.ClosingStructures, failureMechanism, assessmentSection); // Call Color color = info.ForeColor(closingStructuresContext); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -492,9 +492,9 @@ /// /// Looks up a localized string similar to Er is geen hydraulische belastingendatabase beschikbaar om de belastingenberekeningen te genereren.. /// - public static string CalculationGroup_No_HRD_To_Generate_ToolTip { + public static string CalculationGroup_No_HydraulicBoundaryDatabase_To_Generate_ToolTip { get { - return ResourceManager.GetString("CalculationGroup_No_HRD_To_Generate_ToolTip", resourceCulture); + return ResourceManager.GetString("CalculationGroup_No_HydraulicBoundaryDatabase_To_Generate_ToolTip", resourceCulture); } } @@ -2296,6 +2296,15 @@ } /// + /// Looks up a localized string similar to Alle hydraulische belastingen berekenen.. + /// + public static string HydraulicLoads_Calculate_All_ToolTip { + get { + return ResourceManager.GetString("HydraulicLoads_Calculate_All_ToolTip", resourceCulture); + } + } + + /// /// Looks up a localized string similar to ID. /// public static string Id_DisplayName { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -656,7 +656,7 @@ Genereer belastingenberekeningen. - + Er is geen hydraulische belastingendatabase beschikbaar om de belastingenberekeningen te genereren. @@ -1464,4 +1464,7 @@ Golfhoogten + + Alle hydraulische belastingen berekenen. + \ No newline at end of file Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -rd68597572782f79b39b7d74844040cec22584b6d -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision d68597572782f79b39b7d74844040cec22584b6d) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -395,7 +395,7 @@ { var calculateAllItem = new StrictContextMenuItem( RingtoetsCommonFormsResources.Calculate_All, - Resources.DuneErosionPlugin_DuneLocationCalculationsContextMenuStrip_Calculate_All_ToolTip, + RingtoetsCommonFormsResources.HydraulicLoads_Calculate_All_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon, (sender, args) => { @@ -436,7 +436,7 @@ { var calculateAllItem = new StrictContextMenuItem( RingtoetsCommonFormsResources.Calculate_All, - Resources.DuneErosionPlugin_DuneLocationCalculationsContextMenuStrip_Calculate_All_ToolTip, + RingtoetsCommonFormsResources.HydraulicLoads_Calculate_All_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon, (sender, args) => { Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r7399ac73ebef04f427eb1b0b6fce5acd212cba79 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7399ac73ebef04f427eb1b0b6fce5acd212cba79) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -91,15 +91,6 @@ } /// - /// Looks up a localized string similar to Alle hydraulische belastingen berekenen.. - /// - internal static string DuneErosionPlugin_DuneLocationCalculationsContextMenuStrip_Calculate_All_ToolTip { - get { - return ResourceManager.GetString("DuneErosionPlugin_DuneLocationCalculationsContextMenuStrip_Calculate_All_ToolTip", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Hydraulische belastingen duinen. /// internal static string DuneErosionPlugin_GetExportInfos_Boundary_conditions_file_filter_Description { Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Properties/Resources.resx =================================================================== diff -u -r7399ac73ebef04f427eb1b0b6fce5acd212cba79 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 7399ac73ebef04f427eb1b0b6fce5acd212cba79) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Alle hydraulische belastingen berekenen. - Hydraulische belastingen duinen Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.Designer.cs =================================================================== diff -u -raac77dabbe6b2ef98dcd61bd84fc5f3efd06bded -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision aac77dabbe6b2ef98dcd61bd84fc5f3efd06bded) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -82,7 +82,7 @@ } /// - /// Looks up a localized string similar to Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische belastingen voor toetsspoor duinen.. + /// Looks up a localized string similar to Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische belastingen voor het toetsspoor duinen.. /// internal static string DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_location_but_name_is_not_according_format { get { Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.resx =================================================================== diff -u -raac77dabbe6b2ef98dcd61bd84fc5f3efd06bded -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.resx (.../Resources.resx) (revision aac77dabbe6b2ef98dcd61bd84fc5f3efd06bded) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.resx (.../Resources.resx) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -131,7 +131,7 @@ Hydraulische belastingenberekening voor locatie '{0}' (Categorie {1}) is niet geconvergeerd. - Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische belastingen voor toetsspoor duinen. + Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische belastingen voor het toetsspoor duinen. Hydraulische belastingen berekenen voor locatie '{0}' (Categorie {1}) Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs =================================================================== diff -u -raac77dabbe6b2ef98dcd61bd84fc5f3efd06bded -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision aac77dabbe6b2ef98dcd61bd84fc5f3efd06bded) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -188,7 +188,7 @@ // Assert string expectedMessage = $"Locatie '{locationName}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. " + - "Deze locatie is niet toegevoegd aan de hydraulische belastingen voor toetsspoor duinen."; + "Deze locatie is niet toegevoegd aan de hydraulische belastingen voor het toetsspoor duinen."; TestHelper.AssertLogMessageIsGenerated(test, expectedMessage, 1); CollectionAssert.IsEmpty(failureMechanism.DuneLocations); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs =================================================================== diff -u -r8900f570b33f0de1a512fc5b2509771e1201672c -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs (.../DikeProfilesContextTreeNodeInfoTest.cs) (revision 8900f570b33f0de1a512fc5b2509771e1201672c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs (.../DikeProfilesContextTreeNodeInfoTest.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -105,15 +105,15 @@ { // Setup var mocks = new MockRepository(); - var asssessmentSection = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); // Precondition CollectionAssert.IsEmpty(failureMechanism.DikeProfiles); - var context = new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, asssessmentSection); + var context = new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, assessmentSection); // Call Color color = info.ForeColor(context); @@ -128,7 +128,7 @@ { // Setup var mocks = new MockRepository(); - var asssessmentSection = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -140,7 +140,7 @@ // Precondition CollectionAssert.IsNotEmpty(failureMechanism.DikeProfiles); - var context = new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, asssessmentSection); + var context = new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, assessmentSection); // Call Color color = info.ForeColor(context); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Ringtoets.GrassCoverErosionOutwards.Data.csproj =================================================================== diff -u -r9e2f7186181853ea7cce697f737eeca21f82551f -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Ringtoets.GrassCoverErosionOutwards.Data.csproj (.../Ringtoets.GrassCoverErosionOutwards.Data.csproj) (revision 9e2f7186181853ea7cce697f737eeca21f82551f) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Ringtoets.GrassCoverErosionOutwards.Data.csproj (.../Ringtoets.GrassCoverErosionOutwards.Data.csproj) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -36,11 +36,6 @@ Core.Common.Base False - - {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} - Core.Common.Util - False - {420ED9C3-0C33-47EA-B893-121A9C0DB4F1} Ringtoets.AssemblyTool.Data Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj =================================================================== diff -u -r4a568c24a6db2807c63646526c8cb5fa74b52ed2 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.csproj) (revision 4a568c24a6db2807c63646526c8cb5fa74b52ed2) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.csproj) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -111,11 +111,6 @@ Ringtoets.Common.Primitives False - - {d951d6da-fe83-4920-9fdb-63bf96480b54} - Ringtoets.Common.Service - False - {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Ringtoets.Revetment.Data Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rd68597572782f79b39b7d74844040cec22584b6d -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision d68597572782f79b39b7d74844040cec22584b6d) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -783,7 +783,7 @@ string grassCoverErosionOutwardsWaveConditionsCalculationGroupContextToolTip = locationsAvailable ? RingtoetsCommonFormsResources.CalculationGroup_CreateGenerateHydraulicBoundaryCalculationsItem_ToolTip - : RingtoetsCommonFormsResources.CalculationGroup_No_HRD_To_Generate_ToolTip; + : RingtoetsCommonFormsResources.CalculationGroup_No_HydraulicBoundaryDatabase_To_Generate_ToolTip; return new StrictContextMenuItem(RingtoetsCommonFormsResources.CalculationGroup_Generate_calculations, grassCoverErosionOutwardsWaveConditionsCalculationGroupContextToolTip, Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj =================================================================== diff -u -rb1bc655bc6d1d06206cd16b643352da39ae44e95 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj (.../Ringtoets.GrassCoverErosionOutwards.Plugin.csproj) (revision b1bc655bc6d1d06206cd16b643352da39ae44e95) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj (.../Ringtoets.GrassCoverErosionOutwards.Plugin.csproj) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -93,11 +93,6 @@ Ringtoets.Common.Service False - - {888d4097-8bc2-4703-9fb1-8744c94d525e} - Ringtoets.HydraRing.Calculation - False - {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Ringtoets.Revetment.Data Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresContextTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresContextTreeNodeInfoTest.cs (.../HeightStructuresContextTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresContextTreeNodeInfoTest.cs (.../HeightStructuresContextTreeNodeInfoTest.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -126,7 +126,7 @@ { // Setup var mocks = new MockRepository(); - var asssessmentSection = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new HeightStructuresFailureMechanism(); @@ -139,7 +139,7 @@ CollectionAssert.IsNotEmpty(failureMechanism.HeightStructures); var heightStructuresContext = new HeightStructuresContext(failureMechanism.HeightStructures, - failureMechanism, asssessmentSection); + failureMechanism, assessmentSection); // Call Color color = info.ForeColor(heightStructuresContext); @@ -180,7 +180,7 @@ { // Setup var mocks = new MockRepository(); - var asssessmentSection = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new HeightStructuresFailureMechanism(); @@ -189,7 +189,7 @@ CollectionAssert.IsEmpty(failureMechanism.HeightStructures); var heightStructuresContext = new HeightStructuresContext(failureMechanism.HeightStructures, - failureMechanism, asssessmentSection); + failureMechanism, assessmentSection); // Call Color color = info.ForeColor(heightStructuresContext); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r9158d109b1e121cd15cb10c9c20ca2074f667ece -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9158d109b1e121cd15cb10c9c20ca2074f667ece) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -303,15 +303,6 @@ } /// - /// Looks up a localized string similar to Alle hydraulische belastingen berekenen.. - /// - public static string HydraulicBoundaryDatabase_Calculate_All_ToolTip { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_Calculate_All_ToolTip", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Na het importeren van een aangepaste ligging van de referentielijn zullen alle geïmporteerde en berekende gegevens van alle toetssporen worden gewist. /// ///Wilt u doorgaan?. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r9158d109b1e121cd15cb10c9c20ca2074f667ece -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 9158d109b1e121cd15cb10c9c20ca2074f667ece) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -200,9 +200,6 @@ Samenvoegen van trajectinformatie is mislukt. - - Alle hydraulische belastingen berekenen. - Voer alle berekeningen binnen dit traject uit. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rd68597572782f79b39b7d74844040cec22584b6d -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision d68597572782f79b39b7d74844040cec22584b6d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -2070,7 +2070,7 @@ var calculateAllItem = new StrictContextMenuItem( RingtoetsCommonFormsResources.Calculate_All, - Resources.HydraulicBoundaryDatabase_Calculate_All_ToolTip, + RingtoetsCommonFormsResources.HydraulicLoads_Calculate_All_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon, (sender, args) => { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs =================================================================== diff -u -r34d58906c7bfaed488f401caf28a6dc0e9379560 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision 34d58906c7bfaed488f401caf28a6dc0e9379560) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -140,27 +140,6 @@ } [Test] - public void Constructor_HydraulicBoundaryDatabaseNotLinked_PropertiesHaveExpectedAttributesValues() - { - // Setup - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - - // Call - var properties = new HydraulicBoundaryDatabaseProperties(hydraulicBoundaryDatabase); - - // Assert - PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(1, dynamicProperties.Count); - - PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, - "Algemeen", - "Hydraulische belastingendatabase", - "Locatie van het hydraulische belastingendatabase bestand.", - true); - } - - [Test] public void UsePreprocessor_SetNewValue_ValueSetToHydraulicBoundaryDatabaseAndObserversNotified([Values(true, false)] bool usePreprocessor) { // Setup Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs =================================================================== diff -u -r7f03cf30ae8d2351d8ddede137406d2bc25ef2ab -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7f03cf30ae8d2351d8ddede137406d2bc25ef2ab) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -1,4 +1,25 @@ -//------------------------------------------------------------------------------ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs =================================================================== diff -u -r50eb1ade4aff042e4aaf3f8317bfb3ee780de996 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision 50eb1ade4aff042e4aaf3f8317bfb3ee780de996) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -31,7 +31,6 @@ using Ringtoets.Common.Forms.Factories; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Forms.Factories; -using Ringtoets.Revetment.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Revetment.Forms.Views Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs =================================================================== diff -u -rb5a3d47ccb897f261ce7d822f75aba4863cd5329 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs (.../WaveConditionsInputExtensionsTest.cs) (revision b5a3d47ccb897f261ce7d822f75aba4863cd5329) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs (.../WaveConditionsInputExtensionsTest.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -47,7 +47,7 @@ [TestCase(1.0, 10.0, double.NaN)] public void GetWaterLevels_InvalidWaveConditionsInput_ReturnsEmptyEnumerable(double lowerBoundaryRevetments, double upperBoundaryRevetments, - double assesmentLevel) + double assessmentLevel) { // Setup var waveConditionsInput = new TestWaveConditionsInput @@ -60,7 +60,7 @@ }; // Call - IEnumerable waterLevels = waveConditionsInput.GetWaterLevels((RoundedDouble) assesmentLevel); + IEnumerable waterLevels = waveConditionsInput.GetWaterLevels((RoundedDouble) assessmentLevel); // Assert CollectionAssert.IsEmpty(waterLevels); Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -rd68597572782f79b39b7d74844040cec22584b6d -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision d68597572782f79b39b7d74844040cec22584b6d) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -508,7 +508,7 @@ string stabilityStoneCoverWaveConditionsCalculationGroupContextToolTip = locationsAvailable ? RingtoetsCommonFormsResources.CalculationGroup_CreateGenerateHydraulicBoundaryCalculationsItem_ToolTip - : RingtoetsCommonFormsResources.CalculationGroup_No_HRD_To_Generate_ToolTip; + : RingtoetsCommonFormsResources.CalculationGroup_No_HydraulicBoundaryDatabase_To_Generate_ToolTip; return new StrictContextMenuItem(RingtoetsCommonFormsResources.CalculationGroup_Generate_calculations, stabilityStoneCoverWaveConditionsCalculationGroupContextToolTip, Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -rd441cb29a199e83eeba442f1d0e21610805eee30 -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision d441cb29a199e83eeba442f1d0e21610805eee30) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -514,9 +514,9 @@ Assert.AreEqual(5293.8, hydraulicBoundaryLocationWithIllustrationPoints.Location.Y); } - private static void AssertFailureMechanismSections(AssessmentSection asssessmentSection) + private static void AssertFailureMechanismSections(AssessmentSection assessmentSection) { - foreach (IFailureMechanism failureMechanism in asssessmentSection.GetFailureMechanisms()) + foreach (IFailureMechanism failureMechanism in assessmentSection.GetFailureMechanisms()) { Assert.IsNotEmpty(failureMechanism.FailureMechanismSectionSourcePath); Assert.IsNotEmpty(failureMechanism.Sections); Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -rd68597572782f79b39b7d74844040cec22584b6d -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision d68597572782f79b39b7d74844040cec22584b6d) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74) @@ -513,7 +513,7 @@ string waveImpactAsphaltCoverWaveConditionsCalculationGroupContextToolTip = locationsAvailable ? RingtoetsCommonFormsResources.CalculationGroup_CreateGenerateHydraulicBoundaryCalculationsItem_ToolTip - : RingtoetsCommonFormsResources.CalculationGroup_No_HRD_To_Generate_ToolTip; + : RingtoetsCommonFormsResources.CalculationGroup_No_HydraulicBoundaryDatabase_To_Generate_ToolTip; return new StrictContextMenuItem(RingtoetsCommonFormsResources.CalculationGroup_Generate_calculations, waveImpactAsphaltCoverWaveConditionsCalculationGroupContextToolTip,