Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -r79aed8fd611da58e93e3fed53c2cc1172e7fb98a -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 79aed8fd611da58e93e3fed53c2cc1172e7fb98a) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -833,21 +833,18 @@ private static void UpdateStructureDerivedCalculationInput(StructuresCalculation calculation) { - if (!calculation.InputParameters.IsStructureInputSynchronized) + calculation.InputParameters.SynchronizeStructureInput(); + + var affectedObjects = new List { - calculation.InputParameters.SynchronizeStructureInput(); + calculation.InputParameters + }; - var affectedObjects = new List - { - calculation.InputParameters - }; + affectedObjects.AddRange(RingtoetsCommonDataSynchronizationService.ClearCalculationOutput(calculation)); - affectedObjects.AddRange(RingtoetsCommonDataSynchronizationService.ClearCalculationOutput(calculation)); - - foreach (IObservable affectedObject in affectedObjects) - { - affectedObject.NotifyObservers(); - } + foreach (IObservable affectedObject in affectedObjects) + { + affectedObject.NotifyObservers(); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r79aed8fd611da58e93e3fed53c2cc1172e7fb98a -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 79aed8fd611da58e93e3fed53c2cc1172e7fb98a) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -2606,18 +2606,6 @@ } /// - /// Looks up a localized string similar to Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, zal het resultaat van deze berekening worden verwijderd. - /// - ///Weet u zeker dat u wilt doorgaan?. - /// - public static string UpdateForeshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updating_ForeshoreProfile_dependent_data { - get { - return ResourceManager.GetString("UpdateForeshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updat" + - "ing_ForeshoreProfile_dependent_data", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap UpdateItemIcon { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r79aed8fd611da58e93e3fed53c2cc1172e7fb98a -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 79aed8fd611da58e93e3fed53c2cc1172e7fb98a) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -984,11 +984,6 @@ 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... Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs =================================================================== diff -u -r79aed8fd611da58e93e3fed53c2cc1172e7fb98a -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision 79aed8fd611da58e93e3fed53c2cc1172e7fb98a) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -398,8 +398,6 @@ toolTipMessage = Resources.CalculationItem_No_changes_to_update_ToolTip; } - string confirmOutputMessage = Resources.UpdateForeshoreProfileOfCalculation_Confirm_calculation_output_cleared_when_updating_ForeshoreProfile_dependent_data; - var menuItem = new StrictContextMenuItem( Resources.CreateUpdateForeshoreProfileOfCalculationItem_Update_ForeshoreProfile_data, toolTipMessage, @@ -411,7 +409,7 @@ calculation }, inquiryHelper, - confirmOutputMessage, + Resources.VerifyUpdate_Confirm_calculation_output_cleared, updateAction); }) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs =================================================================== diff -u -r57462d55e3c28e1a33178a9df0ab581321514455 -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs (.../RingtoetsContextMenuItemFactoryTest.cs) (revision 57462d55e3c28e1a33178a9df0ab581321514455) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs (.../RingtoetsContextMenuItemFactoryTest.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -101,7 +101,7 @@ var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanismMock); // Call - StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateAddCalculationItem(calculationGroupContext, context => {}); + StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateAddCalculationItem(calculationGroupContext, context => { }); // Assert Assert.AreEqual("Berekening &toevoegen", toolStripItem.Text); @@ -611,7 +611,7 @@ // Call StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculation, - inquiryHelper, c => {}); + inquiryHelper, c => { }); // Assert Assert.AreEqual("&Bijwerken voorlandprofiel...", toolStripItem.Text); @@ -637,7 +637,7 @@ // Call StrictContextMenuItem toolStripItem = RingtoetsContextMenuItemFactory.CreateUpdateForeshoreProfileOfCalculationItem( calculation, - inquiryHelper, c => {}); + inquiryHelper, c => { }); // Assert Assert.AreEqual("&Bijwerken voorlandprofiel...", toolStripItem.Text); @@ -679,10 +679,8 @@ public void CreateUpdateForeshoreProfileOfCalculationItem_WithCalculationOutputPerformClickNoContinuation_DoesNotPerformAction() { // Setup - string inquireContinuationMessage = "Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, " + - "zal het resultaat van deze berekening worden verwijderd." + - $"{Environment.NewLine}{Environment.NewLine}" + - "Weet u zeker dat u wilt doorgaan?"; + string inquireContinuationMessage = "Als u kiest voor bijwerken, dan wordt het resultaat van deze berekening " + + $"verwijderd.{Environment.NewLine}{Environment.NewLine}Weet u zeker dat u wilt doorgaan?"; var mocks = new MockRepository(); var calculation = mocks.StrictMock>(); @@ -713,10 +711,8 @@ public void CreateUpdateForeshoreProfileOfCalculationItem_WithCalculationOutputPerformClickWithContinuation_PerformsAction() { // Setup - string inquireContinuationMessage = "Wanneer het voorlandprofiel wijzigt als gevolg van het bijwerken, " + - "zal het resultaat van deze berekening worden verwijderd." + - $"{Environment.NewLine}{Environment.NewLine}" + - "Weet u zeker dat u wilt doorgaan?"; + string inquireContinuationMessage = "Als u kiest voor bijwerken, dan wordt het resultaat van deze berekening " + + $"verwijderd.{Environment.NewLine}{Environment.NewLine}Weet u zeker dat u wilt doorgaan?"; var mocks = new MockRepository(); var calculation = mocks.StrictMock>(); @@ -778,7 +774,7 @@ { calculation }, - inquiryHelper, c => {}); + inquiryHelper, c => { }); // Assert Assert.AreEqual("&Bijwerken voorlandprofielen...", toolStripItem.Text); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r79aed8fd611da58e93e3fed53c2cc1172e7fb98a -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 79aed8fd611da58e93e3fed53c2cc1172e7fb98a) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -844,21 +844,18 @@ private static void UpdateStructureDerivedCalculationInput(StructuresCalculation calculation) { - if (!calculation.InputParameters.IsStructureInputSynchronized) + calculation.InputParameters.SynchronizeStructureInput(); + + var affectedObjects = new List { - calculation.InputParameters.SynchronizeStructureInput(); + calculation.InputParameters + }; - var affectedObjects = new List - { - calculation.InputParameters - }; + affectedObjects.AddRange(RingtoetsCommonDataSynchronizationService.ClearCalculationOutput(calculation)); - affectedObjects.AddRange(RingtoetsCommonDataSynchronizationService.ClearCalculationOutput(calculation)); - - foreach (IObservable affectedObject in affectedObjects) - { - affectedObject.NotifyObservers(); - } + foreach (IObservable affectedObject in affectedObjects) + { + affectedObject.NotifyObservers(); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r3f9fb75bb98fcc5a336f6df2870b611c41239b89 -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3f9fb75bb98fcc5a336f6df2870b611c41239b89) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -130,18 +130,6 @@ } /// - /// Looks up a localized string similar to Wanneer de intrede- of uittredepunten wijzigen als gevolg van het bijwerken, zullen de resultaten van berekeningen die deze profielschematisaties gebruiken, worden verwijderd. - /// - ///Weet u zeker dat u wilt doorgaan?. - /// - public static string PipingPlugin_VerifyEntryAndExitPointUpdates_Confirm_calculation_outputs_cleared_when_updating_entry_and_exit_points_definitions { - get { - return ResourceManager.GetString("PipingPlugin_VerifyEntryAndExitPointUpdates_Confirm_calculation_outputs_cleared_w" + - "hen_updating_entry_and_exit_points_definitions", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Als u profielschematisaties importeert, dan worden alle rekenresultaten van dit toetsspoor verwijderd. /// ///Weet u zeker dat u wilt doorgaan?. Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx =================================================================== diff -u -r3f9fb75bb98fcc5a336f6df2870b611c41239b89 -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 3f9fb75bb98fcc5a336f6df2870b611c41239b89) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -217,11 +217,6 @@ &Bijwerken intrede- en uittredepunten... - - Wanneer de intrede- of uittredepunten wijzigen als gevolg van het bijwerken, zullen de resultaten van berekeningen die deze profielschematisaties gebruiken, worden verwijderd. - -Weet u zeker dat u wilt doorgaan? - Als u profielschematisaties importeert, dan worden alle rekenresultaten van dit toetsspoor verwijderd. Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r09e5d13894b0b5e27add4e8d9d1e26686e4894b8 -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 09e5d13894b0b5e27add4e8d9d1e26686e4894b8) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -197,7 +197,7 @@ #region StabilityStoneCoverFailureMechanismView ViewInfo - private bool CloseStabilityStoneCoverFailureMechanismViewForData(StabilityStoneCoverFailureMechanismView view, object o) + private static bool CloseStabilityStoneCoverFailureMechanismViewForData(StabilityStoneCoverFailureMechanismView view, object o) { var assessmentSection = o as IAssessmentSection; var failureMechanism = o as StabilityStoneCoverFailureMechanism; Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -rf8e4a303232fcbc2aa277622ffd883599f5b1f4d -rd93d1c16b0543964ba4202f9faa7a74a6cd4a467 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision f8e4a303232fcbc2aa277622ffd883599f5b1f4d) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision d93d1c16b0543964ba4202f9faa7a74a6cd4a467) @@ -199,7 +199,7 @@ #region WaveImpactAsphaltCoverFailureMechanismView ViewInfo - private bool CloseWaveImpactAsphaltCoverFailureMechanismViewForData(WaveImpactAsphaltCoverFailureMechanismView view, object o) + private static bool CloseWaveImpactAsphaltCoverFailureMechanismViewForData(WaveImpactAsphaltCoverFailureMechanismView view, object o) { var assessmentSection = o as IAssessmentSection; var failureMechanism = o as WaveImpactAsphaltCoverFailureMechanism;