Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rea4d6a73aebf632230ccad8866e2605b2d613f22 -r40c181373215ed10076631e4b7b3c63319bb5e31 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ea4d6a73aebf632230ccad8866e2605b2d613f22) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 40c181373215ed10076631e4b7b3c63319bb5e31) @@ -2491,6 +2491,15 @@ } /// + /// Looks up a localized string similar to Hydraulische belastingen. + /// + public static string HydraulicLoads_DisplayName { + get { + return ResourceManager.GetString("HydraulicLoads_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to ID. /// public static string Id_DisplayName { @@ -4388,15 +4397,6 @@ } /// - /// Looks up a localized string similar to Waterstanden en Golfhoogten. - /// - public static string WaterLevel_and_WaveHeight_DisplayName { - get { - return ResourceManager.GetString("WaterLevel_and_WaveHeight_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Waterstand [m+NAP]. /// public static string WaterLevel_DisplayName { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rea4d6a73aebf632230ccad8866e2605b2d613f22 -r40c181373215ed10076631e4b7b3c63319bb5e31 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision ea4d6a73aebf632230ccad8866e2605b2d613f22) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 40c181373215ed10076631e4b7b3c63319bb5e31) @@ -1518,8 +1518,8 @@ ..\Resources\table_warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Waterstanden en Golfhoogten + + Hydraulische belastingen Wis illustratiepunten... Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -re8faf56fec441bd97d5791a1a867c146c94ac85d -r40c181373215ed10076631e4b7b3c63319bb5e31 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision e8faf56fec441bd97d5791a1a867c146c94ac85d) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 40c181373215ed10076631e4b7b3c63319bb5e31) @@ -1036,7 +1036,7 @@ var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler( GetInquiryHelper(), - RiskeerCommonFormsResources.WaterLevel_and_WaveHeight_DisplayName, + RiskeerCommonFormsResources.HydraulicLoads_DisplayName, () => GrassCoverErosionOutwardsDataSynchronizationService.ClearIllustrationPointResultsForDesignWaterLevelAndWaveHeightCalculations( failureMechanism, assessmentSection)); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 -r40c181373215ed10076631e4b7b3c63319bb5e31 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 40c181373215ed10076631e4b7b3c63319bb5e31) @@ -29,13 +29,13 @@ using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Controls.TreeView; +using Core.Common.TestUtil; using Core.Gui; using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; -using Core.Gui.TestUtil.ContextMenu; -using Core.Common.TestUtil; using Core.Gui.TestUtil; +using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; @@ -629,7 +629,7 @@ contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick(); // Then - const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden en Golfhoogten' wilt wissen?"; + const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Hydraulische belastingen' wilt wissen?"; Assert.AreEqual(expectedMessage, messageBoxText); Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput)); @@ -698,7 +698,7 @@ contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick(); // Then - const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden en Golfhoogten' wilt wissen?"; + const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Hydraulische belastingen' wilt wissen?"; Assert.AreEqual(expectedMessage, messageBoxText); Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput)); Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r07b41fc96a44c333477afa1f13ee0a3c725a4fb5 -r40c181373215ed10076631e4b7b3c63319bb5e31 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 07b41fc96a44c333477afa1f13ee0a3c725a4fb5) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 40c181373215ed10076631e4b7b3c63319bb5e31) @@ -2231,7 +2231,7 @@ var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler( GetInquiryHelper(), - RiskeerCommonFormsResources.WaterLevel_and_WaveHeight_DisplayName, + RiskeerCommonFormsResources.HydraulicLoads_DisplayName, () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsForWaterLevelAndWaveHeightCalculations(nodeData.AssessmentSection)); AssessmentSection assessmentSection = nodeData.AssessmentSection; Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r0cff89e1f75d2c78d6a7067bd378dbebbcd38331 -r40c181373215ed10076631e4b7b3c63319bb5e31 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 0cff89e1f75d2c78d6a7067bd378dbebbcd38331) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 40c181373215ed10076631e4b7b3c63319bb5e31) @@ -721,7 +721,7 @@ contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick(); // Then - const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden en Golfhoogten' wilt wissen?"; + const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Hydraulische belastingen' wilt wissen?"; Assert.AreEqual(expectedMessage, messageBoxText); Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput)); @@ -788,7 +788,7 @@ contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick(); // Then - const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden en Golfhoogten' wilt wissen?"; + const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Hydraulische belastingen' wilt wissen?"; Assert.AreEqual(expectedMessage, messageBoxText); Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput)); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r24367a31b02423d23559619feed802c5d2de1866 -r40c181373215ed10076631e4b7b3c63319bb5e31 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 24367a31b02423d23559619feed802c5d2de1866) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 40c181373215ed10076631e4b7b3c63319bb5e31) @@ -1504,7 +1504,7 @@ private static IEnumerable GetWaterLevelCalculationsForUserDefinedTargetProbabilitiesWithOutput(IAssessmentSection assessmentSection) { return assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities - .SelectMany(whc => whc.HydraulicBoundaryLocationCalculations) + .SelectMany(wlc => wlc.HydraulicBoundaryLocationCalculations) .Where(calc => calc.HasOutput); }