Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointView.cs =================================================================== diff -u -r1f76045f08612f7b8259c460771c7cdbdb5447a7 -r7f83f6036c43b1fbccec621de33a4efbb85f3983 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointView.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointView.cs) (revision 1f76045f08612f7b8259c460771c7cdbdb5447a7) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointView.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointView.cs) (revision 7f83f6036c43b1fbccec621de33a4efbb85f3983) @@ -35,11 +35,14 @@ /// /// Creates a new instance of . /// + /// The calculation to show the illustration points for. /// A for obtaining the illustration point /// data ( with objects) /// that must be presented. - /// Thrown when is null. - public OvertoppingOutputGeneralResultFaultTreeIllustrationPointView(Func> getGeneralResultFunc) - : base(getGeneralResultFunc) {} + /// Thrown when any parameter is null. + public OvertoppingOutputGeneralResultFaultTreeIllustrationPointView( + GrassCoverErosionInwardsCalculation calculation, + Func> getGeneralResultFunc) + : base(calculation, getGeneralResultFunc) {} } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r7da32973d26d568b9f5fce1de5a35dc62c40320f -r7f83f6036c43b1fbccec621de33a4efbb85f3983 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 7da32973d26d568b9f5fce1de5a35dc62c40320f) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 7f83f6036c43b1fbccec621de33a4efbb85f3983) @@ -226,7 +226,7 @@ GetViewData = context => context.WrappedData, CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData, CreateInstance = context => new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView( - () => context.WrappedData.Output?.OvertoppingOutput.GeneralResult) + context.WrappedData, () => context.WrappedData.Output?.OvertoppingOutput.GeneralResult) }; yield return new ViewInfo Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs =================================================================== diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r7f83f6036c43b1fbccec621de33a4efbb85f3983 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision 7f83f6036c43b1fbccec621de33a4efbb85f3983) @@ -23,6 +23,7 @@ using NUnit.Framework; using Riskeer.Common.Data.TestUtil.IllustrationPoints; using Riskeer.Common.Forms.Views; +using Riskeer.GrassCoverErosionInwards.Data; using Riskeer.GrassCoverErosionInwards.Forms.Views; namespace Riskeer.GrassCoverErosionInwards.Forms.Test.Views @@ -35,7 +36,9 @@ public void Constructor_ExpectedValues() { // Call - var view = new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView(() => new TestGeneralResultFaultTreeIllustrationPoint()); + var view = new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView( + new GrassCoverErosionInwardsCalculation(), + () => new TestGeneralResultFaultTreeIllustrationPoint()); // Assert Assert.IsInstanceOf(view); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs =================================================================== diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r7f83f6036c43b1fbccec621de33a4efbb85f3983 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision 7f83f6036c43b1fbccec621de33a4efbb85f3983) @@ -36,20 +36,13 @@ public class OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewInfoTest : GrassCoverErosionInwardsOutputViewInfoTestBase { - protected override string ViewName - { - get - { - return "Sterkte berekening"; - } - } + protected override string ViewName => "Sterkte berekening"; protected override IView GetView(ICalculation data) { - return new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView(() => new TestGeneralResultFaultTreeIllustrationPoint()) - { - Data = data - }; + return new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView( + (GrassCoverErosionInwardsCalculation) data, + () => new TestGeneralResultFaultTreeIllustrationPoint()); } protected override OvertoppingOutputContext GetContext(GrassCoverErosionInwardsCalculation calculation)