Fisheye: Tag c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Forms/DisplayFailureMechanismSectionAssemblyGroupConverter.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Forms.Test/DisplayFailureMechanismSectionAssemblyGroupConverterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs =================================================================== diff -u -r59c1849ec9222afe9293f754132842699cb75b0d -rc095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs (.../FailureMechanismSectionAssemblyGroupProperties.cs) (revision 59c1849ec9222afe9293f754132842699cb75b0d) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs (.../FailureMechanismSectionAssemblyGroupProperties.cs) (revision c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05) @@ -26,7 +26,6 @@ using Core.Gui.Attributes; using Core.Gui.PropertyBag; using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.Forms; using Riskeer.Common.Forms.Helpers; using Riskeer.Common.Forms.TypeConverters; using Riskeer.Integration.Forms.Properties; @@ -63,11 +62,11 @@ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssemblyGroup_Name_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.AssemblyGroup_Name_Description))] [TypeConverter(typeof(EnumTypeConverter))] - public DisplayFailureMechanismSectionAssemblyGroup Group + public FailureMechanismSectionAssemblyGroup Group { get { - return DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(data.FailureMechanismSectionAssemblyGroup); + return data.FailureMechanismSectionAssemblyGroup; } } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.Designer.cs =================================================================== diff -u -r2190e91a6a95bf2e998c9c77bba2ab9ac107f3a7 -rc095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.Designer.cs (.../FailureMechanismSectionAssemblyGroupsView.Designer.cs) (revision 2190e91a6a95bf2e998c9c77bba2ab9ac107f3a7) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.Designer.cs (.../FailureMechanismSectionAssemblyGroupsView.Designer.cs) (revision c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05) @@ -40,7 +40,7 @@ /// private void InitializeComponent() { - this.assemblyGroupsTable = new AssemblyGroupsTable(); + this.assemblyGroupsTable = new AssemblyGroupsTable(); this.groupBoxPanel = new System.Windows.Forms.Panel(); this.groupBoxPanel.SuspendLayout(); this.SuspendLayout(); @@ -73,7 +73,7 @@ #endregion - private AssemblyGroupsTable assemblyGroupsTable; + private AssemblyGroupsTable assemblyGroupsTable; private System.Windows.Forms.Panel groupBoxPanel; } } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.cs =================================================================== diff -u -r8b53f46fbb8e8cebdb3f25d7f460a56c1751424e -rc095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.cs (.../FailureMechanismSectionAssemblyGroupsView.cs) (revision 8b53f46fbb8e8cebdb3f25d7f460a56c1751424e) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.cs (.../FailureMechanismSectionAssemblyGroupsView.cs) (revision c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05) @@ -26,7 +26,6 @@ using Core.Common.Base; using Core.Common.Controls.Views; using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.Forms; using Riskeer.Common.Forms.Helpers; using Riskeer.Integration.Data; using Riskeer.Integration.Util; @@ -84,12 +83,12 @@ private void UpdateTableData() { - Tuple[] dataToSet = + Tuple[] dataToSet = FailureMechanismSectionAssemblyGroupsHelper.GetFailureMechanismSectionAssemblyGroupBoundaries(AssessmentSection).Select( - assemblyGroupBoundaries => new Tuple( + assemblyGroupBoundaries => new Tuple( assemblyGroupBoundaries, AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyGroupColor(assemblyGroupBoundaries.FailureMechanismSectionAssemblyGroup), - DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(assemblyGroupBoundaries.FailureMechanismSectionAssemblyGroup))).ToArray(); + assemblyGroupBoundaries.FailureMechanismSectionAssemblyGroup)).ToArray(); assemblyGroupsTable.SetData(dataToSet); } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs =================================================================== diff -u -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5 -rc095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs (.../FailureMechanismSectionAssemblyGroupPropertiesTest.cs) (revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs (.../FailureMechanismSectionAssemblyGroupPropertiesTest.cs) (revision c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05) @@ -26,7 +26,6 @@ using Core.Gui.TestUtil; using NUnit.Framework; using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.Forms; using Riskeer.Common.Forms.Helpers; using Riskeer.Integration.Forms.PropertyClasses; @@ -63,7 +62,7 @@ Assert.AreSame(assemblyCategory, properties.Data); TestHelper.AssertTypeConverter(); - Assert.AreEqual(DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(assemblyCategory.FailureMechanismSectionAssemblyGroup), properties.Group); + Assert.AreEqual(assemblyCategory.FailureMechanismSectionAssemblyGroup, properties.Group); Assert.AreEqual(assemblyCategory.LowerBoundary, properties.LowerBoundary); Assert.AreEqual(assemblyCategory.UpperBoundary, properties.UpperBoundary); } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupsPropertiesTest.cs =================================================================== diff -u -rc44e94b38a58f622d2724a84d2741480766d9dd1 -rc095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupsPropertiesTest.cs (.../FailureMechanismSectionAssemblyGroupsPropertiesTest.cs) (revision c44e94b38a58f622d2724a84d2741480766d9dd1) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupsPropertiesTest.cs (.../FailureMechanismSectionAssemblyGroupsPropertiesTest.cs) (revision c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05) @@ -28,7 +28,6 @@ using Core.Gui.TestUtil; using NUnit.Framework; using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.Forms; using Riskeer.AssemblyTool.KernelWrapper.Calculators; using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Groups; @@ -127,7 +126,7 @@ FailureMechanismSectionAssemblyGroupBoundaries assemblyGroupBoundaries = output.ElementAt(i); FailureMechanismSectionAssemblyGroupProperties property = failureMechanismAssemblyGroups[i]; - Assert.AreEqual(DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(assemblyGroupBoundaries.FailureMechanismSectionAssemblyGroup), property.Group); + Assert.AreEqual(assemblyGroupBoundaries.FailureMechanismSectionAssemblyGroup, property.Group); Assert.AreEqual(assemblyGroupBoundaries.UpperBoundary, property.UpperBoundary); Assert.AreEqual(assemblyGroupBoundaries.LowerBoundary, property.LowerBoundary); } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs =================================================================== diff -u -rc44e94b38a58f622d2724a84d2741480766d9dd1 -rc095c0f1895bd88e452f5cdc1d5ccf755f7d2e05 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs (.../FailureMechanismSectionAssemblyGroupsViewTest.cs) (revision c44e94b38a58f622d2724a84d2741480766d9dd1) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs (.../FailureMechanismSectionAssemblyGroupsViewTest.cs) (revision c095c0f1895bd88e452f5cdc1d5ccf755f7d2e05) @@ -122,7 +122,7 @@ FailureMechanismSectionAssemblyGroupBoundaries expectedBoundary = expectedAssemblyGroupBoundaries.ElementAt(i); var actualBoundary = (AssemblyGroupRow) assemblyGroupsTable.Rows[i].DataBoundItem; - Assert.AreEqual(DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(expectedBoundary.FailureMechanismSectionAssemblyGroup), actualBoundary.Group); + Assert.AreEqual(expectedBoundary.FailureMechanismSectionAssemblyGroup, actualBoundary.Group); Assert.AreEqual(expectedBoundary.LowerBoundary, actualBoundary.LowerBoundary); Assert.AreEqual(expectedBoundary.UpperBoundary, actualBoundary.UpperBoundary); }