Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r44420c717ac32101ba0da4739d259c622f47976e -rb68aeb86a9034514bee88a54bdc7307896d6c157 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 44420c717ac32101ba0da4739d259c622f47976e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision b68aeb86a9034514bee88a54bdc7307896d6c157) @@ -84,7 +84,6 @@ using Ringtoets.Integration.Forms.PropertyClasses; using Ringtoets.Integration.Forms.PropertyClasses.StandAlone; using Ringtoets.Integration.Forms.Views; -using Ringtoets.Integration.Forms.Views.SectionResultRows; using Ringtoets.Integration.Forms.Views.SectionResultViews; using Ringtoets.Integration.Plugin.FileImporters; using Ringtoets.Integration.Plugin.Handlers; @@ -442,71 +441,63 @@ yield return CreateFailureMechanismResultViewInfo< GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResult, - GrassCoverSlipOffInwardsResultView, - GrassCoverSlipOffInwardsSectionResultRow>( + GrassCoverSlipOffInwardsResultView>( context => new GrassCoverSlipOffInwardsResultView( context.WrappedData, (GrassCoverSlipOffInwardsFailureMechanism) context.FailureMechanism)); yield return CreateFailureMechanismResultViewInfo< GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResult, - GrassCoverSlipOffOutwardsResultView, - GrassCoverSlipOffOutwardsSectionResultRow>( + GrassCoverSlipOffOutwardsResultView>( context => new GrassCoverSlipOffOutwardsResultView( context.WrappedData, (GrassCoverSlipOffOutwardsFailureMechanism) context.FailureMechanism)); yield return CreateFailureMechanismResultViewInfo< MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResult, - MicrostabilityResultView, - MicrostabilitySectionResultRow>( + MicrostabilityResultView>( context => new MicrostabilityResultView( context.WrappedData, (MicrostabilityFailureMechanism) context.FailureMechanism)); yield return CreateFailureMechanismResultViewInfo< PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResult, - PipingStructureResultView, - PipingStructureSectionResultRow>( + PipingStructureResultView>( context => new PipingStructureResultView( context.WrappedData, (PipingStructureFailureMechanism) context.FailureMechanism)); yield return CreateFailureMechanismResultViewInfo< TechnicalInnovationFailureMechanism, TechnicalInnovationFailureMechanismSectionResult, - TechnicalInnovationResultView, - TechnicalInnovationSectionResultRow>( + TechnicalInnovationResultView>( context => new TechnicalInnovationResultView( context.WrappedData, (TechnicalInnovationFailureMechanism) context.FailureMechanism)); yield return CreateFailureMechanismResultViewInfo< StrengthStabilityLengthwiseConstructionFailureMechanism, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult, - StrengthStabilityLengthwiseConstructionResultView, - StrengthStabilityLengthwiseConstructionSectionResultRow>( + StrengthStabilityLengthwiseConstructionResultView>( context => new StrengthStabilityLengthwiseConstructionResultView( context.WrappedData, (StrengthStabilityLengthwiseConstructionFailureMechanism) context.FailureMechanism)); yield return CreateFailureMechanismResultViewInfo< WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResult, - WaterPressureAsphaltCoverResultView, - WaterPressureAsphaltCoverSectionResultRow>( + WaterPressureAsphaltCoverResultView>( context => new WaterPressureAsphaltCoverResultView( context.WrappedData, (WaterPressureAsphaltCoverFailureMechanism) context.FailureMechanism)); yield return CreateFailureMechanismResultViewInfo< MacroStabilityOutwardsFailureMechanism, MacroStabilityOutwardsFailureMechanismSectionResult, - MacroStabilityOutwardsResultView, - MacroStabilityOutwardsSectionResultRow>( + MacroStabilityOutwardsResultView>( context => new MacroStabilityOutwardsResultView( context.WrappedData, (MacroStabilityOutwardsFailureMechanism) context.FailureMechanism)); @@ -897,12 +888,11 @@ } private static ViewInfo, IEnumerable, TView> CreateFailureMechanismResultViewInfo< - TFailureMechanism, TResult, TView, TResultRow>( + TFailureMechanism, TResult, TView>( Func, TView> createInstanceFunc) where TResult : FailureMechanismSectionResult - where TView : FailureMechanismResultView + where TView : FailureMechanismResultView where TFailureMechanism : FailureMechanismBase, IHasSectionResults - where TResultRow : FailureMechanismSectionResultRow { return new ViewInfo< FailureMechanismSectionResultContext, @@ -911,7 +901,7 @@ { GetViewName = (view, context) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, + CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = createInstanceFunc }; @@ -1031,11 +1021,10 @@ #region FailureMechanismResults ViewInfo - private static bool CloseFailureMechanismResultViewForData(TView view, object dataToCloseFor) - where TView : FailureMechanismResultView + private static bool CloseFailureMechanismResultViewForData(TView view, object dataToCloseFor) + where TView : FailureMechanismResultView where TFailureMechanism : FailureMechanismBase, IHasSectionResults where TResult : FailureMechanismSectionResult - where TResultRow : FailureMechanismSectionResultRow { var assessmentSection = dataToCloseFor as IAssessmentSection; var failureMechanism = dataToCloseFor as IFailureMechanism;