Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroup.cs =================================================================== diff -u -r59c1849ec9222afe9293f754132842699cb75b0d -r68d542c1a5a48be865e7dc91ac3f60b6fc942acb --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroup.cs (.../FailureMechanismSectionAssemblyGroup.cs) (revision 59c1849ec9222afe9293f754132842699cb75b0d) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroup.cs (.../FailureMechanismSectionAssemblyGroup.cs) (revision 68d542c1a5a48be865e7dc91ac3f60b6fc942acb) @@ -19,6 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Core.Common.Util.Attributes; +using Riskeer.AssemblyTool.Data.Properties; + namespace Riskeer.AssemblyTool.Data { /// @@ -29,51 +32,61 @@ /// /// Represents group Not Dominant. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_NotDominant_DisplayName))] NotDominant = 1, /// /// Represents group III. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_III_DisplayName))] III = 2, /// /// Represents group II. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_II_DisplayName))] II = 3, /// /// Represents group I. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_I_DisplayName))] I = 4, /// /// Represents group 0. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_Zero_DisplayName))] Zero = 5, /// /// Represents group I-. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_IMin_DisplayName))] IMin = 6, /// /// Represents group II-. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_IIMin_DisplayName))] IIMin = 7, /// /// Represents group III-. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_IIIMin_DisplayName))] IIIMin = 8, /// /// Represents group Dominant. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_Dominant_DisplayName))] Dominant = 9, /// /// Represents group GR. /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_Gr_DisplayName))] Gr = 10 } } \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r9a74e582accc7364423a32cc2c0135f303c7cc5b -r68d542c1a5a48be865e7dc91ac3f60b6fc942acb --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9a74e582accc7364423a32cc2c0135f303c7cc5b) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 68d542c1a5a48be865e7dc91ac3f60b6fc942acb) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. -// -// This file is part of Riskeer. -// -// Riskeer is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -233,5 +212,95 @@ return ResourceManager.GetString("FailureMechanismAssemblyCategoryGroup_Vt_DisplayName", resourceCulture); } } + + /// + /// Looks up a localized string similar to D. + /// + internal static string FailureMechanismSectionAssemblyGroup_Dominant_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_Dominant_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to . + /// + internal static string FailureMechanismSectionAssemblyGroup_Gr_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_Gr_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to +I. + /// + internal static string FailureMechanismSectionAssemblyGroup_I_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_I_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to +II. + /// + internal static string FailureMechanismSectionAssemblyGroup_II_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_II_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to +III. + /// + internal static string FailureMechanismSectionAssemblyGroup_III_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_III_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to -III. + /// + internal static string FailureMechanismSectionAssemblyGroup_IIIMin_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_IIIMin_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to -II. + /// + internal static string FailureMechanismSectionAssemblyGroup_IIMin_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_IIMin_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to -I. + /// + internal static string FailureMechanismSectionAssemblyGroup_IMin_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_IMin_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ND. + /// + internal static string FailureMechanismSectionAssemblyGroup_NotDominant_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_NotDominant_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 0. + /// + internal static string FailureMechanismSectionAssemblyGroup_Zero_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_Zero_DisplayName", resourceCulture); + } + } } } Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx =================================================================== diff -u -r9a74e582accc7364423a32cc2c0135f303c7cc5b -r68d542c1a5a48be865e7dc91ac3f60b6fc942acb --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision 9a74e582accc7364423a32cc2c0135f303c7cc5b) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision 68d542c1a5a48be865e7dc91ac3f60b6fc942acb) @@ -159,13 +159,43 @@ - - + VIIt - + VIt - + Vt + + ND + + + +III + + + +II + + + +I + + + 0 + + + -I + + + -II + + + -III + + + D + + + + \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r8de1c502af9933005b9ca8e9424784ada62e5acd -r68d542c1a5a48be865e7dc91ac3f60b6fc942acb --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8de1c502af9933005b9ca8e9424784ada62e5acd) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 68d542c1a5a48be865e7dc91ac3f60b6fc942acb) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. -// -// This file is part of Riskeer. -// -// Riskeer is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -80,95 +59,5 @@ resourceCulture = value; } } - - /// - /// Looks up a localized string similar to D. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_Dominant_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_Dominant_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to . - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_GR_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_GR_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to +I. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_I_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_I_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to +II. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_II_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_II_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to +III. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_III_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_III_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to -III. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_IIIMin_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_IIIMin_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to -II. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_IIMin_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_IIMin_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to -I. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_IMin_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_IMin_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ND. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_NotDominant_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_NotDominant_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 0. - /// - internal static string DisplayFailureMechanismSectionAssemblyGroup_Zero_DisplayName { - get { - return ResourceManager.GetString("DisplayFailureMechanismSectionAssemblyGroup_Zero_DisplayName", resourceCulture); - } - } } } Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Forms/Properties/Resources.resx =================================================================== diff -u -r8de1c502af9933005b9ca8e9424784ada62e5acd -r68d542c1a5a48be865e7dc91ac3f60b6fc942acb --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8de1c502af9933005b9ca8e9424784ada62e5acd) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Forms/Properties/Resources.resx (.../Resources.resx) (revision 68d542c1a5a48be865e7dc91ac3f60b6fc942acb) @@ -117,34 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ND - - - +III - - - +II - - - +I - - - 0 - - - -I - - - -II - - - -III - - - D - - - - \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupTest.cs =================================================================== diff -u -r1bc3dd32cc5797277c510af1f7c3c425339be456 -r68d542c1a5a48be865e7dc91ac3f60b6fc942acb --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupTest.cs (.../FailureMechanismSectionAssemblyGroupTest.cs) (revision 1bc3dd32cc5797277c510af1f7c3c425339be456) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupTest.cs (.../FailureMechanismSectionAssemblyGroupTest.cs) (revision 68d542c1a5a48be865e7dc91ac3f60b6fc942acb) @@ -26,7 +26,7 @@ namespace Riskeer.AssemblyTool.Data.Test { [TestFixture] - public class FailureMechanismSectionAssemblyGroupTest : EnumValuesTestFixture + public class FailureMechanismSectionAssemblyGroupTest : EnumWithResourcesDisplayNameTestFixture { protected override IDictionary ExpectedValueForEnumValues => new Dictionary @@ -62,5 +62,40 @@ FailureMechanismSectionAssemblyGroup.Gr, 10 } }; + + protected override IDictionary ExpectedDisplayNameForEnumValues => + new Dictionary + { + { + FailureMechanismSectionAssemblyGroup.NotDominant, "ND" + }, + { + FailureMechanismSectionAssemblyGroup.III, "+III" + }, + { + FailureMechanismSectionAssemblyGroup.II, "+II" + }, + { + FailureMechanismSectionAssemblyGroup.I, "+I" + }, + { + FailureMechanismSectionAssemblyGroup.Zero, "0" + }, + { + FailureMechanismSectionAssemblyGroup.IMin, "-I" + }, + { + FailureMechanismSectionAssemblyGroup.IIMin, "-II" + }, + { + FailureMechanismSectionAssemblyGroup.IIIMin, "-III" + }, + { + FailureMechanismSectionAssemblyGroup.Dominant, "D" + }, + { + FailureMechanismSectionAssemblyGroup.Gr, "" + } + }; } } \ No newline at end of file