Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rff68006e7e8f9abbb1e13617d0c99318ec07c400 -r42577bf0540d5d058e483721f0a7b7c967d5bd28 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ff68006e7e8f9abbb1e13617d0c99318ec07c400) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 42577bf0540d5d058e483721f0a7b7c967d5bd28) @@ -739,58 +739,58 @@ /// /// Looks up a localized string similar to Er moet een voorlandprofiel geselecteerd zijn.. /// - public static string CreateUpdateForshoreProfileOfCalculationItem_Update_calculation_no_ForeshoreProfile_ToolTip { + public static string CreateUpdateForeshoreProfileOfCalculationItem_Update_calculation_no_ForeshoreProfile_ToolTip { get { - return ResourceManager.GetString("CreateUpdateForshoreProfileOfCalculationItem_Update_calculation_no_ForeshoreProfi" + - "le_ToolTip", resourceCulture); + return ResourceManager.GetString("CreateUpdateForeshoreProfileOfCalculationItem_Update_calculation_no_ForeshoreProf" + + "ile_ToolTip", resourceCulture); } } /// /// Looks up a localized string similar to Berekening bijwerken met het voorlandprofiel.. /// - public static string CreateUpdateForshoreProfileOfCalculationItem_Update_calculation_with_ForeshoreProfile_ToolTip { + public static string CreateUpdateForeshoreProfileOfCalculationItem_Update_calculation_with_ForeshoreProfile_ToolTip { get { - return ResourceManager.GetString("CreateUpdateForshoreProfileOfCalculationItem_Update_calculation_with_ForeshorePro" + - "file_ToolTip", resourceCulture); + return ResourceManager.GetString("CreateUpdateForeshoreProfileOfCalculationItem_Update_calculation_with_ForeshorePr" + + "ofile_ToolTip", resourceCulture); } } /// /// Looks up a localized string similar to &Bijwerken voorlandprofiel.... /// - public static string CreateUpdateForshoreProfileOfCalculationItem_Update_ForeshoreProfile_data { + public static string CreateUpdateForeshoreProfileOfCalculationItem_Update_ForeshoreProfile_data { get { - return ResourceManager.GetString("CreateUpdateForshoreProfileOfCalculationItem_Update_ForeshoreProfile_data", resourceCulture); + return ResourceManager.GetString("CreateUpdateForeshoreProfileOfCalculationItem_Update_ForeshoreProfile_data", resourceCulture); } } /// /// Looks up a localized string similar to De geselecteerde voorlandprofielen hebben geen wijzigingen om bij te werken.. /// - public static string CreateUpdateForshoreProfileOfCalculationsItem_Update_calculations_no_ForeshoreProfile_changes_ToolTip { + public static string CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_no_ForeshoreProfile_changes_ToolTip { get { - return ResourceManager.GetString("CreateUpdateForshoreProfileOfCalculationsItem_Update_calculations_no_ForeshorePro" + - "file_changes_ToolTip", resourceCulture); + return ResourceManager.GetString("CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_no_ForeshorePr" + + "ofile_changes_ToolTip", resourceCulture); } } /// /// Looks up a localized string similar to Berekeningen bijwerken waar een voorlandprofiel geselecteerd is.. /// - public static string CreateUpdateForshoreProfileOfCalculationsItem_Update_calculations_with_ForeshoreProfile_ToolTip { + public static string CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_with_ForeshoreProfile_ToolTip { get { - return ResourceManager.GetString("CreateUpdateForshoreProfileOfCalculationsItem_Update_calculations_with_ForeshoreP" + - "rofile_ToolTip", resourceCulture); + return ResourceManager.GetString("CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_with_Foreshore" + + "Profile_ToolTip", resourceCulture); } } /// /// Looks up a localized string similar to &Bijwerken voorlandprofielen.... /// - public static string CreateUpdateForshoreProfileOfCalculationsItem_Update_ForeshoreProfile_data { + public static string CreateUpdateForeshoreProfileOfCalculationsItem_Update_ForeshoreProfile_data { get { - return ResourceManager.GetString("CreateUpdateForshoreProfileOfCalculationsItem_Update_ForeshoreProfile_data", resourceCulture); + return ResourceManager.GetString("CreateUpdateForeshoreProfileOfCalculationsItem_Update_ForeshoreProfile_data", resourceCulture); } } @@ -2655,10 +2655,10 @@ /// ///Weet u zeker dat u wilt doorgaan?. /// - public static string UpdateForshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updating_ForeshoreProfile_dependent_data { + public static string UpdateForeshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updating_ForeshoreProfile_dependent_data { get { - return ResourceManager.GetString("UpdateForshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updati" + - "ng_ForeshoreProfile_dependent_data", resourceCulture); + return ResourceManager.GetString("UpdateForeshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updat" + + "ing_ForeshoreProfile_dependent_data", resourceCulture); } } @@ -2667,10 +2667,10 @@ /// ///Weet u zeker dat u wilt doorgaan?. /// - public static string UpdateForshoreProfileOfCalculations_Confirm_calculation_outputs_cleared_when_updating_ForeshoreProfile_dependent_data { + public static string UpdateForeshoreProfileOfCalculations_Confirm_calculation_outputs_cleared_when_updating_ForeshoreProfile_dependent_data { get { - return ResourceManager.GetString("UpdateForshoreProfileOfCalculations_Confirm_calculation_outputs_cleared_when_upda" + - "ting_ForeshoreProfile_dependent_data", resourceCulture); + return ResourceManager.GetString("UpdateForeshoreProfileOfCalculations_Confirm_calculation_outputs_cleared_when_upd" + + "ating_ForeshoreProfile_dependent_data", resourceCulture); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rff68006e7e8f9abbb1e13617d0c99318ec07c400 -r42577bf0540d5d058e483721f0a7b7c967d5bd28 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision ff68006e7e8f9abbb1e13617d0c99318ec07c400) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 42577bf0540d5d058e483721f0a7b7c967d5bd28) @@ -978,33 +978,33 @@ Er zijn geen berekeningen met een kunstwerk. - + Berekening bijwerken met het voorlandprofiel. - + Er moet een voorlandprofiel geselecteerd zijn. Er zijn geen wijzigingen om bij te werken. - + Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, zal het resultaat van deze berekening worden verwijderd. Weet u zeker dat u wilt doorgaan? - + &Bijwerken voorlandprofiel... - + &Bijwerken voorlandprofielen... - + Berekeningen bijwerken waar een voorlandprofiel geselecteerd is. - + De geselecteerde voorlandprofielen hebben geen wijzigingen om bij te werken. - + Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, zal het resultaat van de berekeningen worden verwijderd. Weet u zeker dat u wilt doorgaan? Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs =================================================================== diff -u -ra15e6824491a708be9c960aaa119b79a2ee3274d -r42577bf0540d5d058e483721f0a7b7c967d5bd28 --- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs (.../RingtoetsContextMenuBuilder.cs) (revision a15e6824491a708be9c960aaa119b79a2ee3274d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs (.../RingtoetsContextMenuBuilder.cs) (revision 42577bf0540d5d058e483721f0a7b7c967d5bd28) @@ -266,7 +266,7 @@ Action> updateAction) where TCalculationInput : ICalculationInput, IHasForeshoreProfile { - contextMenuBuilder.AddCustomItem(RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationItem( + contextMenuBuilder.AddCustomItem(RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculation, inquiryHelper, updateAction)); @@ -289,7 +289,7 @@ Action> updateAction) where TCalculationInput : ICalculationInput, IHasForeshoreProfile { - contextMenuBuilder.AddCustomItem(RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationsItem( + contextMenuBuilder.AddCustomItem(RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationsItem( calculations, inquiryHelper, updateAction)); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs =================================================================== diff -u -rff68006e7e8f9abbb1e13617d0c99318ec07c400 -r42577bf0540d5d058e483721f0a7b7c967d5bd28 --- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision ff68006e7e8f9abbb1e13617d0c99318ec07c400) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision 42577bf0540d5d058e483721f0a7b7c967d5bd28) @@ -379,7 +379,7 @@ /// Object responsible for inquiring the required data. /// The action to perform when the foreshore profile is updated. /// The created . - public static StrictContextMenuItem CreateUpdateForshoreProfileOfCalculationItem( + public static StrictContextMenuItem CreateUpdateForeshoreProfileOfCalculationItem( ICalculation calculation, IInquiryHelper inquiryHelper, Action> updateAction) @@ -388,22 +388,22 @@ TCalculationInput input = calculation.InputParameters; var isEnabled = true; - string toolTipMessage = Resources.CreateUpdateForshoreProfileOfCalculationItem_Update_calculation_with_ForeshoreProfile_ToolTip; + string toolTipMessage = Resources.CreateUpdateForeshoreProfileOfCalculationItem_Update_calculation_with_ForeshoreProfile_ToolTip; if (input.ForeshoreProfile == null) { isEnabled = false; - toolTipMessage = Resources.CreateUpdateForshoreProfileOfCalculationItem_Update_calculation_no_ForeshoreProfile_ToolTip; + toolTipMessage = Resources.CreateUpdateForeshoreProfileOfCalculationItem_Update_calculation_no_ForeshoreProfile_ToolTip; } else if (input.IsForeshoreProfileInputSynchronized) { isEnabled = false; toolTipMessage = Resources.CalculationItem_Update_no_changes_ToolTip; } - string confirmOutputMessage = Resources.UpdateForshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updating_ForeshoreProfile_dependent_data; + string confirmOutputMessage = Resources.UpdateForeshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updating_ForeshoreProfile_dependent_data; var menuItem = new StrictContextMenuItem( - Resources.CreateUpdateForshoreProfileOfCalculationItem_Update_ForeshoreProfile_data, + Resources.CreateUpdateForeshoreProfileOfCalculationItem_Update_ForeshoreProfile_data, toolTipMessage, Resources.UpdateItemIcon, (o, args) => @@ -432,7 +432,7 @@ /// Object responsible for inquiring the required data. /// The action to perform when the foreshore profile is updated. /// The created . - public static StrictContextMenuItem CreateUpdateForshoreProfileOfCalculationsItem( + public static StrictContextMenuItem CreateUpdateForeshoreProfileOfCalculationsItem( IEnumerable> calculations, IInquiryHelper inquiryHelper, Action> updateAction) @@ -445,13 +445,13 @@ bool hasForeshoreProfileChanges = calculationsWithForeshoreProfileChanges.Any(); string toolTipMessage = hasForeshoreProfileChanges - ? Resources.CreateUpdateForshoreProfileOfCalculationsItem_Update_calculations_with_ForeshoreProfile_ToolTip - : Resources.CreateUpdateForshoreProfileOfCalculationsItem_Update_calculations_no_ForeshoreProfile_changes_ToolTip; + ? Resources.CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_with_ForeshoreProfile_ToolTip + : Resources.CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_no_ForeshoreProfile_changes_ToolTip; - string confirmOutputMessage = Resources.UpdateForshoreProfileOfCalculations_Confirm_calculation_outputs_cleared_when_updating_ForeshoreProfile_dependent_data; + string confirmOutputMessage = Resources.UpdateForeshoreProfileOfCalculations_Confirm_calculation_outputs_cleared_when_updating_ForeshoreProfile_dependent_data; var menuItem = new StrictContextMenuItem( - Resources.CreateUpdateForshoreProfileOfCalculationsItem_Update_ForeshoreProfile_data, + Resources.CreateUpdateForeshoreProfileOfCalculationsItem_Update_ForeshoreProfile_data, toolTipMessage, Resources.UpdateItemIcon, (o, args) => Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs =================================================================== diff -u -rff68006e7e8f9abbb1e13617d0c99318ec07c400 -r42577bf0540d5d058e483721f0a7b7c967d5bd28 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs (.../RingtoetsContextMenuItemFactoryTest.cs) (revision ff68006e7e8f9abbb1e13617d0c99318ec07c400) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs (.../RingtoetsContextMenuItemFactoryTest.cs) (revision 42577bf0540d5d058e483721f0a7b7c967d5bd28) @@ -596,10 +596,10 @@ mocks.VerifyAll(); } - #region CreateUpdateForshoreProfileOfCalculationItem + #region CreateUpdateForeshoreProfileOfCalculationItem [Test] - public void CreateUpdateForshoreProfileOfCalculationItem_WithoutForeshoreProfile_CreatesDisabledItem() + public void CreateUpdateForeshoreProfileOfCalculationItem_WithoutForeshoreProfile_CreatesDisabledItem() { // Setup var mocks = new MockRepository(); @@ -609,7 +609,7 @@ mocks.ReplayAll(); // Call - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculationMock, inquiryHelperMock, c => {}); @@ -622,7 +622,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationItem_WithForeshoreProfile_CreatesEnabledItem() + public void CreateUpdateForeshoreProfileOfCalculationItem_WithForeshoreProfile_CreatesEnabledItem() { // Setup var mocks = new MockRepository(); @@ -635,7 +635,7 @@ mocks.ReplayAll(); // Call - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculationMock, inquiryHelperMock, c => {}); @@ -648,7 +648,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationItem_WithoutCalculationOutputPerformClick_PerformsAction() + public void CreateUpdateForeshoreProfileOfCalculationItem_WithoutCalculationOutputPerformClick_PerformsAction() { // Setup var mocks = new MockRepository(); @@ -662,7 +662,7 @@ mocks.ReplayAll(); ICalculation actionCalculation = null; - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculationMock, inquiryHelperMock, c => { actionCalculation = c; }); @@ -676,7 +676,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationItem_WithCalculationOutputPerformClickNoContinuation_DoesNotPerformAction() + public void CreateUpdateForeshoreProfileOfCalculationItem_WithCalculationOutputPerformClickNoContinuation_DoesNotPerformAction() { // Setup string inquireContinuationMessage = "Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, " + @@ -696,7 +696,7 @@ mocks.ReplayAll(); var actionPerformed = false; - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculationMock, inquiryHelperMock, c => { actionPerformed = true; }); @@ -710,7 +710,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationItem_WithCalculationOutputPerformClickWithContinuation_PerformsAction() + public void CreateUpdateForeshoreProfileOfCalculationItem_WithCalculationOutputPerformClickWithContinuation_PerformsAction() { // Setup string inquireContinuationMessage = "Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, " + @@ -730,7 +730,7 @@ mocks.ReplayAll(); var actionPerformed = false; - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculationMock, inquiryHelperMock, c => { actionPerformed = true; }); @@ -745,10 +745,10 @@ #endregion - #region CreateUpdateForshoreProfileOfCalculationsItem + #region CreateUpdateForeshoreProfileOfCalculationsItem [Test] - public void CreateUpdateForshoreProfileOfCalculationsItem_WithoutForeshoreProfile_CreatesDisabledItem() + public void CreateUpdateForeshoreProfileOfCalculationsItem_WithoutForeshoreProfile_CreatesDisabledItem() { // Setup var mocks = new MockRepository(); @@ -759,7 +759,7 @@ mocks.ReplayAll(); // Call - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationsItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationsItem( new[] { calculationMock @@ -775,7 +775,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationsItem_WithForeshoreProfileSynchronized_CreatesDisabledItem() + public void CreateUpdateForeshoreProfileOfCalculationsItem_WithForeshoreProfileSynchronized_CreatesDisabledItem() { // Setup var mocks = new MockRepository(); @@ -789,7 +789,7 @@ mocks.ReplayAll(); // Call - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationsItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationsItem( new[] { calculationMock @@ -805,7 +805,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationsItem_WithForeshoreProfile_CreatesEnabledItem() + public void CreateUpdateForeshoreProfileOfCalculationsItem_WithForeshoreProfile_CreatesEnabledItem() { // Setup var mocks = new MockRepository(); @@ -825,7 +825,7 @@ mocks.ReplayAll(); // Call - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationsItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationsItem( new[] { calculationMock, @@ -842,7 +842,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationsItem_WithoutCalculationOutputPerformClick_PerformsAction() + public void CreateUpdateForeshoreProfileOfCalculationsItem_WithoutCalculationOutputPerformClick_PerformsAction() { // Setup var mocks = new MockRepository(); @@ -863,7 +863,7 @@ mocks.ReplayAll(); ICalculation actionCalculation = null; - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationsItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationsItem( new[] { calculationMock, @@ -881,7 +881,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationsItem_WithCalculationOutputPerformClickNoContinuation_DoesNotPerformAction() + public void CreateUpdateForeshoreProfileOfCalculationsItem_WithCalculationOutputPerformClickNoContinuation_DoesNotPerformAction() { // Setup string inquireContinuationMessage = "Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, " + @@ -908,7 +908,7 @@ mocks.ReplayAll(); var actionPerformed = false; - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationsItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationsItem( new[] { calculationMock, @@ -926,7 +926,7 @@ } [Test] - public void CreateUpdateForshoreProfileOfCalculationsItem_WithCalculationOutputPerformClickWithContinuation_PerformsAction() + public void CreateUpdateForeshoreProfileOfCalculationsItem_WithCalculationOutputPerformClickWithContinuation_PerformsAction() { // Setup string inquireContinuationMessage = "Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, " + @@ -953,7 +953,7 @@ mocks.ReplayAll(); var actionPerformed = false; - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForshoreProfileOfCalculationsItem( + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationsItem( new[] { calculationMock,