Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r77158a296743c3b3457336706fdbea047daf4886 -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 77158a296743c3b3457336706fdbea047daf4886) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -142,6 +142,15 @@ } /// + /// Looks up a localized string similar to Berekeningen. + /// + public static string FailureMechanism_Calculations_DisplayName { + get { + return ResourceManager.GetString("FailureMechanism_Calculations_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Het label van het toetsspoor.. /// public static string FailureMechanism_Code_Description { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -r77158a296743c3b3457336706fdbea047daf4886 -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 77158a296743c3b3457336706fdbea047daf4886) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -195,4 +195,7 @@ Algemeen + + Berekeningen + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -24,6 +24,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.GrassCoverErosionInwards.Data.Properties; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.GrassCoverErosionInwards.Data { @@ -38,7 +39,7 @@ public GrassCoverErosionInwardsFailureMechanism() : base(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayName, Resources.GrassCoverErosionInwardsFailureMechanism_DisplayCode) { - CalculationsGroup = new CalculationGroup(Resources.GrassCoverErosionInwardsFailureMechanism_Calculations_DisplayName, false); + CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false); GeneralInput = new GeneralGrassCoverErosionInwardsInput(); NormProbabilityInput = new NormProbabilityGrassCoverErosionInwardsInput(); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -97,15 +97,6 @@ } /// - /// Looks up a localized string similar to Berekeningen. - /// - public static string GrassCoverErosionInwardsFailureMechanism_Calculations_DisplayName { - get { - return ResourceManager.GetString("GrassCoverErosionInwardsFailureMechanism_Calculations_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to GEKB. /// public static string GrassCoverErosionInwardsFailureMechanism_DisplayCode { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx =================================================================== diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -123,9 +123,6 @@ Nieuwe berekening - - Berekeningen - GEKB Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs =================================================================== diff -u -r213b20e92891887167ab4b031ca4a4b6250a4c2a -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -23,6 +23,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.HeightStructures.Data.Properties; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.HeightStructures.Data { @@ -36,7 +37,9 @@ /// public HeightStructuresFailureMechanism() : base(Resources.HeightStructureFailureMechanism_DisplayName, Resources.HeightStructureFailureMechanism_Code) - { } + { + CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false); + } public override IEnumerable Calculations { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs =================================================================== diff -u -r213b20e92891887167ab4b031ca4a4b6250a4c2a -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -41,6 +41,9 @@ Assert.AreEqual(Resources.HeightStructureFailureMechanism_DisplayName, failureMechanism.Name); Assert.AreEqual(Resources.HeightStructureFailureMechanism_Code, failureMechanism.Code); CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.Calculations); + Assert.AreEqual("Berekeningen", failureMechanism.CalculationsGroup.Name); + Assert.IsEmpty(failureMechanism.CalculationsGroup.Children); } [Test] Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -rf7191448000db1a5f3698a1439b441da9afb72bc -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision f7191448000db1a5f3698a1439b441da9afb72bc) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -44,7 +44,7 @@ GeneralInput = new GeneralPipingInput(); SurfaceLines = new List(); StochasticSoilModels = new ObservableList(); - CalculationsGroup = new CalculationGroup(PipingDataResources.PipingFailureMechanism_Calculations_DisplayName, false); + CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false); } public override IEnumerable Calculations Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -151,15 +151,6 @@ } /// - /// Looks up a localized string similar to Berekeningen. - /// - public static string PipingFailureMechanism_Calculations_DisplayName { - get { - return ResourceManager.GetString("PipingFailureMechanism_Calculations_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to STPH. /// public static string PipingFailureMechanism_DisplayCode { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rb4640ce4b065b497e4401092aaf77f4d1fa2b5f0 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision b4640ce4b065b497e4401092aaf77f4d1fa2b5f0) @@ -138,9 +138,6 @@ Berekeningsverslag - - Berekeningen - {0} L moet in het bereik van [{1}, {2}] liggen.