Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r7a5959b7e672dabb21f10a7782294845e134533c -r364b5a86dfbcb8d554affb8061b9f2eace8af45d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 7a5959b7e672dabb21f10a7782294845e134533c) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 364b5a86dfbcb8d554affb8061b9f2eace8af45d) @@ -498,15 +498,23 @@ context.WrappedData, (WaterPressureAsphaltCoverFailureMechanism) context.FailureMechanism)); - yield return CreateFailureMechanismResultViewInfo< - MacroStabilityOutwardsFailureMechanism, - MacroStabilityOutwardsFailureMechanismSectionResult, - MacroStabilityOutwardsResultView, - MacroStabilityOutwardsSectionResultRow>( - context => new MacroStabilityOutwardsResultView( + yield return new ViewInfo< + ProbabilityFailureMechanismSectionResultContext, + IEnumerable, + MacroStabilityOutwardsResultView> + { + GetViewName = (view, context) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, + Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, + CloseForData = CloseFailureMechanismResultViewForData, + GetViewData = context => context.WrappedData, + CreateInstance = context => new MacroStabilityOutwardsResultView( context.WrappedData, (MacroStabilityOutwardsFailureMechanism) context.FailureMechanism, - context.AssessmentSection)); + context.AssessmentSection) + }; yield return new ViewInfo { @@ -834,8 +842,16 @@ yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); - yield return CreateFailureMechanismSectionResultTreeNodeInfo(); + yield return new TreeNodeInfo> + { + Text = context => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, + Image = context => RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, + ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) + .AddOpenItem() + .Build() + }; + yield return new TreeNodeInfo { Text = comment => RingtoetsIntegrationPluginResources.Comment_DisplayName, @@ -895,16 +911,16 @@ }; } - private static ViewInfo, IEnumerable, TView> CreateFailureMechanismResultViewInfo< + private static ViewInfo, IEnumerable, TView> CreateFailureMechanismResultViewInfo< TFailureMechanism, TResult, TView, TResultRow>( - Func, TView> createInstanceFunc) + Func, TView> createInstanceFunc) where TResult : FailureMechanismSectionResult where TView : FailureMechanismResultView where TFailureMechanism : FailureMechanismBase, IHasSectionResults where TResultRow : FailureMechanismSectionResultRow { return new ViewInfo< - ProbabilityFailureMechanismSectionResultContext, + FailureMechanismSectionResultContext, IEnumerable, TView> { @@ -916,10 +932,10 @@ }; } - private TreeNodeInfo> CreateFailureMechanismSectionResultTreeNodeInfo() + private TreeNodeInfo> CreateFailureMechanismSectionResultTreeNodeInfo() where T : FailureMechanismSectionResult { - return new TreeNodeInfo> + return new TreeNodeInfo> { Text = context => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, Image = context => RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, @@ -1401,50 +1417,50 @@ if (grassCoverSlipOffInwards != null) { failureMechanismSectionResultContexts[0] = - new ProbabilityFailureMechanismSectionResultContext( - grassCoverSlipOffInwards.SectionResults, nodeData, assessmentSection); + new FailureMechanismSectionResultContext( + grassCoverSlipOffInwards.SectionResults, nodeData); } if (grassCoverSlipOffOutwards != null) { failureMechanismSectionResultContexts[0] = - new ProbabilityFailureMechanismSectionResultContext( - grassCoverSlipOffOutwards.SectionResults, nodeData, assessmentSection); + new FailureMechanismSectionResultContext( + grassCoverSlipOffOutwards.SectionResults, nodeData); } if (microstability != null) { failureMechanismSectionResultContexts[0] = - new ProbabilityFailureMechanismSectionResultContext( - microstability.SectionResults, nodeData, assessmentSection); + new FailureMechanismSectionResultContext( + microstability.SectionResults, nodeData); } if (pipingStructure != null) { failureMechanismSectionResultContexts[0] = - new ProbabilityFailureMechanismSectionResultContext( - pipingStructure.SectionResults, nodeData, assessmentSection); + new FailureMechanismSectionResultContext( + pipingStructure.SectionResults, nodeData); } if (technicalInnovation != null) { failureMechanismSectionResultContexts[0] = - new ProbabilityFailureMechanismSectionResultContext( - technicalInnovation.SectionResults, nodeData, assessmentSection); + new FailureMechanismSectionResultContext( + technicalInnovation.SectionResults, nodeData); } if (strengthStabilityLengthwiseConstruction != null) { failureMechanismSectionResultContexts[0] = - new ProbabilityFailureMechanismSectionResultContext( - strengthStabilityLengthwiseConstruction.SectionResults, nodeData, assessmentSection); + new FailureMechanismSectionResultContext( + strengthStabilityLengthwiseConstruction.SectionResults, nodeData); } if (waterPressureAsphaltCover != null) { failureMechanismSectionResultContexts[0] = - new ProbabilityFailureMechanismSectionResultContext( - waterPressureAsphaltCover.SectionResults, nodeData, assessmentSection); + new FailureMechanismSectionResultContext( + waterPressureAsphaltCover.SectionResults, nodeData); } if (macroStabilityOutwards != null)