Index: Ringtoets/Common/src/Ringtoets.Common.Forms/ChangeHandlers/FailureMechanismPropertyChangeHandler.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/Common/src/Ringtoets.Common.Forms/ChangeHandlers/FailureMechanismPropertyChangeHandler.cs (.../FailureMechanismPropertyChangeHandler.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/ChangeHandlers/FailureMechanismPropertyChangeHandler.cs (.../FailureMechanismPropertyChangeHandler.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -46,10 +46,12 @@ { throw new ArgumentNullException(nameof(failureMechanism)); } + if (value == null) { throw new ArgumentNullException(nameof(value)); } + if (setValue == null) { throw new ArgumentNullException(nameof(setValue)); @@ -76,17 +78,6 @@ } /// - /// Gets the message that is shown when conformation is inquired. - /// - protected virtual string ConfirmationMessage - { - get - { - return Resources.FailureMechanismPropertyChangeHandler_Confirm_change_composition_and_clear_dependent_data; - } - } - - /// /// Checks whether a call to would have any effect in the given /// . /// @@ -101,6 +92,7 @@ { throw new ArgumentNullException(nameof(failureMechanism)); } + return failureMechanism.Calculations.Any(c => c.HasOutput); } @@ -118,24 +110,27 @@ { throw new ArgumentNullException(nameof(failureMechanism)); } + var affected = new List(); foreach (ICalculation calculation in failureMechanism.Calculations.Where(c => c.HasOutput)) { affected.Add(calculation); calculation.ClearOutput(); } + return affected; } /// /// Checks to see if the change of the failure mechanism property should occur or not. /// /// true if the change should occur, false otherwise. - private bool ConfirmPropertyChange() + private static bool ConfirmPropertyChange() { - DialogResult result = MessageBox.Show(ConfirmationMessage, + DialogResult result = MessageBox.Show(Resources.FailureMechanismPropertyChangeHandler_Confirm_change_composition_and_clear_dependent_data, CoreCommonBaseResources.Confirm, MessageBoxButtons.OKCancel); + return result == DialogResult.OK; } } Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs =================================================================== diff -u -r4062ca930dec6759be8a7fe8cfc3dd9493da2e50 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs (.../DuneErosionFailureMechanismPropertyChangeHandler.cs) (revision 4062ca930dec6759be8a7fe8cfc3dd9493da2e50) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs (.../DuneErosionFailureMechanismPropertyChangeHandler.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -24,7 +24,6 @@ using Core.Common.Base; using Ringtoets.Common.Forms.ChangeHandlers; using Ringtoets.DuneErosion.Data; -using Ringtoets.DuneErosion.Forms.Properties; using Ringtoets.DuneErosion.Service; namespace Ringtoets.DuneErosion.Forms @@ -35,14 +34,6 @@ /// public class DuneErosionFailureMechanismPropertyChangeHandler : FailureMechanismPropertyChangeHandler { - protected override string ConfirmationMessage - { - get - { - return Resources.DuneErosionFailureMechanismPropertyChangeHandler_Confirm_change_and_clearing_dune_locations; - } - } - protected override bool RequiresConfirmation(DuneErosionFailureMechanism failureMechanism) { return base.RequiresConfirmation(failureMechanism) Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rd59ca522f9ee649512998572c7635bf27ed0d1c3 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d59ca522f9ee649512998572c7635bf27ed0d1c3) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -82,18 +82,6 @@ } /// - /// Looks up a localized string similar to Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties in dit toetsspoor verwijderd worden. - /// - ///Weet u zeker dat u wilt doorgaan?. - /// - internal static string DuneErosionFailureMechanismPropertyChangeHandler_Confirm_change_and_clearing_dune_locations { - get { - return ResourceManager.GetString("DuneErosionFailureMechanismPropertyChangeHandler_Confirm_change_and_clearing_dune" + - "_locations", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Nummer van het kustvak waar de locatie onderdeel van uitmaakt.. /// internal static string DuneLocation_CoastalAreaId_Description { Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.resx =================================================================== diff -u -rd59ca522f9ee649512998572c7635bf27ed0d1c3 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision d59ca522f9ee649512998572c7635bf27ed0d1c3) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -117,11 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties in dit toetsspoor verwijderd worden. - -Weet u zeker dat u wilt doorgaan? - Nummer van het kustvak waar de locatie onderdeel van uitmaakt. Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -r4f0327ca4210c79dda99c0b249782d03b1e176d3 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs (.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs) (revision 4f0327ca4210c79dda99c0b249782d03b1e176d3) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs (.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -120,7 +120,7 @@ if (dialogBoxWillBeShown) { Assert.AreEqual("Bevestigen", title); - string expectedMessage = "Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties in dit toetsspoor verwijderd worden." + Environment.NewLine + + string expectedMessage = "Als u deze parameter wijzigt, zal de uitvoer van alle berekeningen in dit toetsspoor verwijderd worden." + Environment.NewLine + Environment.NewLine + "Weet u zeker dat u wilt doorgaan?"; Assert.AreEqual(expectedMessage, message); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs =================================================================== diff -u -r5082e699ef14479e2941b92533fa2cf0696475b7 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs) (revision 5082e699ef14479e2941b92533fa2cf0696475b7) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -24,7 +24,6 @@ using Core.Common.Base; using Ringtoets.Common.Forms.ChangeHandlers; using Ringtoets.GrassCoverErosionOutwards.Data; -using Ringtoets.GrassCoverErosionOutwards.Forms.Properties; using Ringtoets.GrassCoverErosionOutwards.Service; namespace Ringtoets.GrassCoverErosionOutwards.Forms @@ -35,14 +34,6 @@ /// public class GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler : FailureMechanismPropertyChangeHandler { - protected override string ConfirmationMessage - { - get - { - return Resources.GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler_Confirm_change_composition_and_clear_dependent_data; - } - } - protected override bool RequiresConfirmation(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { return base.RequiresConfirmation(failureMechanism) Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rff9310dfe6748389a43127fc88ad137fc6b7fd03 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ff9310dfe6748389a43127fc88ad137fc6b7fd03) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -82,18 +82,6 @@ } /// - /// Looks up a localized string similar to Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties en berekeningen in dit toetsspoor verwijderd worden. - /// - ///Weet u zeker dat u wilt doorgaan?. - /// - public static string GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler_Confirm_change_composition_and_clear_dependent_data { - get { - return ResourceManager.GetString("GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler_Confirm_change_com" + - "position_and_clear_dependent_data", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Gras. /// public static string GrassCoverErosionOutwardsWaveConditionsInputContext_RevetmentType { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx =================================================================== diff -u -rff9310dfe6748389a43127fc88ad137fc6b7fd03 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision ff9310dfe6748389a43127fc88ad137fc6b7fd03) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -126,11 +126,6 @@ Gras - - Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties en berekeningen in dit toetsspoor verwijderd worden. - -Weet u zeker dat u wilt doorgaan? - h(Vv->VIv) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -127,7 +127,7 @@ if (dialogBoxWillBeShown) { Assert.AreEqual("Bevestigen", title); - string expectedMessage = "Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties en berekeningen in dit toetsspoor verwijderd worden." + Environment.NewLine + + string expectedMessage = "Als u deze parameter wijzigt, zal de uitvoer van alle berekeningen in dit toetsspoor verwijderd worden." + Environment.NewLine + Environment.NewLine + "Weet u zeker dat u wilt doorgaan?"; Assert.AreEqual(expectedMessage, message); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs =================================================================== diff -u -rff9310dfe6748389a43127fc88ad137fc6b7fd03 -rf0bc2d83fb676a240b7ec789dfe72306eb99952a --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision ff9310dfe6748389a43127fc88ad137fc6b7fd03) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision f0bc2d83fb676a240b7ec789dfe72306eb99952a) @@ -112,7 +112,7 @@ PropertyDescriptor itemsProperty = dynamicProperties[0]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(itemsProperty, "Resultaat", - "Hydraulische randvoorwaarden voor gras", + "Hydraulische belastingen voor gras", "Berekende hydraulische belastingen voor gras.", true); }