Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyMethod.cs =================================================================== diff -u -r8a817e4f882227425511d9e51a6a734542971a29 -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyMethod.cs (.../AssemblyMethod.cs) (revision 8a817e4f882227425511d9e51a6a734542971a29) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyMethod.cs (.../AssemblyMethod.cs) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -74,21 +74,6 @@ /// /// Represents the assembly method BOI-2B-1. /// - BOI2B1 = 10, - - /// - /// Represents the assembly method BOI-3A-1. - /// - BOI3A1 = 11, - - /// - /// Represents the assembly method BOI-3B-1. - /// - BOI3B1 = 12, - - /// - /// Represents the assembly method BOI-3C-1. - /// - BOI3C1 = 13 + BOI2B1 = 10 } } \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/ExportableAssemblyMethod.cs =================================================================== diff -u -rff174a04131ee16b6435ba4c5545e873a817d172 -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/ExportableAssemblyMethod.cs (.../ExportableAssemblyMethod.cs) (revision ff174a04131ee16b6435ba4c5545e873a817d172) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/ExportableAssemblyMethod.cs (.../ExportableAssemblyMethod.cs) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -87,24 +87,6 @@ /// Represents the assembly method BOI-2B-1. /// [ResourcesDisplayName(typeof(Resources), nameof(Resources.ExportableAssemblyMethod_BOI2B1_DisplayName))] - BOI2B1 = 10, - - /// - /// Represents the assembly method BOI-3A-1. - /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.ExportableAssemblyMethod_BOI3A1_DisplayName))] - BOI3A1 = 11, - - /// - /// Represents the assembly method BOI-3B-1. - /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.ExportableAssemblyMethod_BOI3B1_DisplayName))] - BOI3B1 = 12, - - /// - /// Represents the assembly method BOI-3C-1. - /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.ExportableAssemblyMethod_BOI3C1_DisplayName))] - BOI3C1 = 13 + BOI2B1 = 10 } } \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rddf4a8eaed5f420b3feaa52460aa9def8af69c4f -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ddf4a8eaed5f420b3feaa52460aa9def8af69c4f) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -180,33 +180,6 @@ } /// - /// Looks up a localized string similar to BOI-3A-1. - /// - internal static string ExportableAssemblyMethod_BOI3A1_DisplayName { - get { - return ResourceManager.GetString("ExportableAssemblyMethod_BOI3A1_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to BOI-3B-1. - /// - internal static string ExportableAssemblyMethod_BOI3B1_DisplayName { - get { - return ResourceManager.GetString("ExportableAssemblyMethod_BOI3B1_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to BOI-3C-1. - /// - internal static string ExportableAssemblyMethod_BOI3C1_DisplayName { - get { - return ResourceManager.GetString("ExportableAssemblyMethod_BOI3C1_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to HANDMATIG. /// internal static string ExportableAssemblyMethod_Manual_DisplayName { Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx =================================================================== diff -u -rddf4a8eaed5f420b3feaa52460aa9def8af69c4f -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx (.../Resources.resx) (revision ddf4a8eaed5f420b3feaa52460aa9def8af69c4f) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx (.../Resources.resx) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -171,15 +171,6 @@ BOI-2B-1 - - BOI-3A-1 - - - BOI-3B-1 - - - BOI-3C-1 - FAALMVK Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssemblyMethodTest.cs =================================================================== diff -u -r8a817e4f882227425511d9e51a6a734542971a29 -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssemblyMethodTest.cs (.../AssemblyMethodTest.cs) (revision 8a817e4f882227425511d9e51a6a734542971a29) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssemblyMethodTest.cs (.../AssemblyMethodTest.cs) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -60,15 +60,6 @@ }, { AssemblyMethod.BOI2B1, 10 - }, - { - AssemblyMethod.BOI3A1, 11 - }, - { - AssemblyMethod.BOI3B1, 12 - }, - { - AssemblyMethod.BOI3C1, 13 } }; } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/ExportableAssemblyMethodTest.cs =================================================================== diff -u -rff174a04131ee16b6435ba4c5545e873a817d172 -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/ExportableAssemblyMethodTest.cs (.../ExportableAssemblyMethodTest.cs) (revision ff174a04131ee16b6435ba4c5545e873a817d172) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/ExportableAssemblyMethodTest.cs (.../ExportableAssemblyMethodTest.cs) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -61,15 +61,6 @@ }, { ExportableAssemblyMethod.BOI2B1, 10 - }, - { - ExportableAssemblyMethod.BOI3A1, 11 - }, - { - ExportableAssemblyMethod.BOI3B1, 12 - }, - { - ExportableAssemblyMethod.BOI3C1, 13 } }; @@ -105,15 +96,6 @@ }, { ExportableAssemblyMethod.BOI2B1, "BOI-2B-1" - }, - { - ExportableAssemblyMethod.BOI3A1, "BOI-3A-1" - }, - { - ExportableAssemblyMethod.BOI3B1, "BOI-3B-1" - }, - { - ExportableAssemblyMethod.BOI3C1, "BOI-3C-1" } }; } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Converters/ExportableAssemblyMethodConverter.cs =================================================================== diff -u -r17efbc2697a98e22b078162cef888e2608b17944 -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/Integration/src/Riskeer.Integration.IO/Converters/ExportableAssemblyMethodConverter.cs (.../ExportableAssemblyMethodConverter.cs) (revision 17efbc2697a98e22b078162cef888e2608b17944) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Converters/ExportableAssemblyMethodConverter.cs (.../ExportableAssemblyMethodConverter.cs) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -72,12 +72,6 @@ return ExportableAssemblyMethod.BOI2A1; case AssemblyMethod.BOI2B1: return ExportableAssemblyMethod.BOI2B1; - case AssemblyMethod.BOI3A1: - return ExportableAssemblyMethod.BOI3A1; - case AssemblyMethod.BOI3B1: - return ExportableAssemblyMethod.BOI3B1; - case AssemblyMethod.BOI3C1: - return ExportableAssemblyMethod.BOI3C1; default: throw new NotSupportedException(); } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Converters/ExportableAssemblyMethodConverterTest.cs =================================================================== diff -u -r17efbc2697a98e22b078162cef888e2608b17944 -r108956c7b1d26428ba17158918d301d690edd6f8 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Converters/ExportableAssemblyMethodConverterTest.cs (.../ExportableAssemblyMethodConverterTest.cs) (revision 17efbc2697a98e22b078162cef888e2608b17944) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Converters/ExportableAssemblyMethodConverterTest.cs (.../ExportableAssemblyMethodConverterTest.cs) (revision 108956c7b1d26428ba17158918d301d690edd6f8) @@ -55,9 +55,6 @@ [TestCase(AssemblyMethod.Manual, ExportableAssemblyMethod.Manual)] [TestCase(AssemblyMethod.BOI2A1, ExportableAssemblyMethod.BOI2A1)] [TestCase(AssemblyMethod.BOI2B1, ExportableAssemblyMethod.BOI2B1)] - [TestCase(AssemblyMethod.BOI3A1, ExportableAssemblyMethod.BOI3A1)] - [TestCase(AssemblyMethod.BOI3B1, ExportableAssemblyMethod.BOI3B1)] - [TestCase(AssemblyMethod.BOI3C1, ExportableAssemblyMethod.BOI3C1)] public void ConvertTo_WithAssemblyMethod_ReturnsExpectedValues(AssemblyMethod assemblyMethod, ExportableAssemblyMethod expectedAssemblyMethod) {