Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -39,7 +39,7 @@
/// The view for a collection of for closing structures.
///
public class ClosingStructuresFailureMechanismResultView
- : FailureMechanismResultView>
+ : FailureMechanismResultView, ClosingStructuresFailureMechanism>
{
private const int assessmentLayerTwoAIndex = 2;
private readonly IAssessmentSection assessmentSection;
@@ -56,7 +56,7 @@
IAssessmentSection assessmentSection,
ClosingStructuresFailureMechanism failureMechanism,
IObservableEnumerable> failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
if (assessmentSection == null)
{
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -77,7 +77,8 @@
using (var view = new ClosingStructuresFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>>(view);
+ Assert.IsInstanceOf,
+ ClosingStructuresFailureMechanism>>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs (.../FailureMechanismResultView.Designer.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs (.../FailureMechanismResultView.Designer.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -21,7 +21,7 @@
namespace Ringtoets.Common.Forms.Views
{
- partial class FailureMechanismResultView
+ partial class FailureMechanismResultView
{
///
/// Required designer variable.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -25,7 +25,6 @@
using Core.Common.Base;
using Core.Common.Controls.DataGrid;
using Core.Common.Controls.Views;
-using Core.Common.Util;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Forms.Properties;
@@ -36,24 +35,24 @@
///
/// The type of the failure mechanism this view belongs to.
/// The type of results which are presented by the
- /// .
- public abstract partial class FailureMechanismResultView : UserControl, IView
+ /// .
+ public abstract partial class FailureMechanismResultView : UserControl, IView
+ where TFailureMechanism : IFailureMechanism
where TSectionResult : FailureMechanismSectionResult
- where TFailureMechanism : FailureMechanismBase
{
protected const int AssessmentLayerOneColumnIndex = 1;
private readonly Observer failureMechanismSectionResultObserver;
private readonly IObservableEnumerable failureMechanismSectionResults;
private readonly RecursiveObserver, TSectionResult> failureMechanismSectionResultsObserver;
///
- /// Creates a new instance of .
+ /// Creates a new instance of .
///
- /// The failure mechanism this view belongs to.
/// The collection of to
/// show in the view.
- /// Thrown when any input parameter is null.
- protected FailureMechanismResultView(TFailureMechanism failureMechanism, IObservableEnumerable failureMechanismSectionResults)
+ /// The failure mechanism this view belongs to.
+ /// Thrown when any parameter is null.
+ protected FailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults, TFailureMechanism failureMechanism)
{
if (failureMechanism == null)
{
@@ -108,8 +107,8 @@
protected override void Dispose(bool disposing)
{
- failureMechanismSectionResultObserver?.Dispose();
- failureMechanismSectionResultsObserver?.Dispose();
+ failureMechanismSectionResultObserver.Dispose();
+ failureMechanismSectionResultsObserver.Dispose();
if (disposing)
{
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -r74e362128e21e414c29a561f6e6fe113bcab2635 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 74e362128e21e414c29a561f6e6fe113bcab2635)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -168,10 +168,10 @@
}
}
- public class TestFailureMechanismResultView : FailureMechanismResultView
+ public class TestFailureMechanismResultView : FailureMechanismResultView
{
public TestFailureMechanismResultView(TestFailureMechanism failureMechanism, IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
UpdateDataGridViewDataSource();
}
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -34,15 +34,15 @@
///
/// The view for a collection of .
///
- public class DuneErosionFailureMechanismResultView : FailureMechanismResultView
+ public class DuneErosionFailureMechanismResultView : FailureMechanismResultView
{
///
/// Creates a new instance of .
///
///
public DuneErosionFailureMechanismResultView(DuneErosionFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += DisableIrrelevantFieldsFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -51,7 +51,7 @@
using (var view = new DuneErosionFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -38,7 +38,7 @@
/// The view for the .
///
public class GrassCoverErosionInwardsFailureMechanismResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
private const int assessmentLayerTwoAIndex = 2;
private readonly IAssessmentSection assessmentSection;
@@ -55,7 +55,7 @@
IAssessmentSection assessmentSection,
GrassCoverErosionInwardsFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
if (assessmentSection == null)
{
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -77,8 +77,8 @@
using (var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -35,7 +35,7 @@
/// The view for a collection of .
///
public class GrassCoverErosionOutwardsFailureMechanismResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -44,7 +44,7 @@
public GrassCoverErosionOutwardsFailureMechanismResultView(
GrassCoverErosionOutwardsFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -51,8 +51,8 @@
using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -39,7 +39,7 @@
/// The view for the .
///
public class HeightStructuresFailureMechanismResultView
- : FailureMechanismResultView>
+ : FailureMechanismResultView, HeightStructuresFailureMechanism>
{
private const int assessmentLayerTwoAIndex = 2;
private readonly IAssessmentSection assessmentSection;
@@ -56,7 +56,7 @@
IAssessmentSection assessmentSection,
HeightStructuresFailureMechanism failureMechanism,
IObservableEnumerable> failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
if (assessmentSection == null)
{
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -77,8 +77,8 @@
using (var view = new HeightStructuresFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>>(view);
+ Assert.IsInstanceOf,
+ HeightStructuresFailureMechanism>>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs (.../GrassCoverSlipOffInwardsResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,7 @@
/// The view for a collection of .
///
public class GrassCoverSlipOffInwardsResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -46,7 +46,7 @@
public GrassCoverSlipOffInwardsResultView(
GrassCoverSlipOffInwardsFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs (.../GrassCoverSlipOffOutwardsResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,7 @@
/// The view for a collection of .
///
public class GrassCoverSlipOffOutwardsResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -46,7 +46,7 @@
public GrassCoverSlipOffOutwardsResultView(
GrassCoverSlipOffOutwardsFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,7 @@
/// The view for a collection of .
///
public class MacroStabilityOutwardsResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -46,7 +46,7 @@
public MacroStabilityOutwardsResultView(
MacroStabilityOutwardsFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,7 @@
/// The view for a collection of .
///
public class MicrostabilityResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -46,7 +46,7 @@
public MicrostabilityResultView(
MicrostabilityFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs (.../PipingStructureResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,7 @@
/// The view for a collection of .
///
public class PipingStructureResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -46,7 +46,7 @@
public PipingStructureResultView(
PipingStructureFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,8 +37,8 @@
/// The view for a collection of .
///
public class StrengthStabilityLengthwiseConstructionResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -47,7 +47,7 @@
public StrengthStabilityLengthwiseConstructionResultView(
StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs (.../TechnicalInnovationResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,7 @@
/// The view for a collection of .
///
public class TechnicalInnovationResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -46,7 +46,7 @@
public TechnicalInnovationResultView(
TechnicalInnovationFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs (.../WaterPressureAsphaltCoverResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,8 @@
/// The view for a collection of .
///
public class WaterPressureAsphaltCoverResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -46,7 +47,7 @@
public WaterPressureAsphaltCoverResultView(
WaterPressureAsphaltCoverFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -886,7 +886,7 @@
TFailureMechanism, TResult, TView>(
Func, TView> createInstanceFunc)
where TResult : FailureMechanismSectionResult
- where TView : FailureMechanismResultView
+ where TView : FailureMechanismResultView
where TFailureMechanism : FailureMechanismBase, IHasSectionResults
{
return new ViewInfo<
@@ -1017,7 +1017,7 @@
#region FailureMechanismResults ViewInfo
private static bool CloseFailureMechanismResultViewForData(TView view, object dataToCloseFor)
- where TView : FailureMechanismResultView
+ where TView : FailureMechanismResultView
where TFailureMechanism : FailureMechanismBase, IHasSectionResults
where TResult : FailureMechanismSectionResult
{
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -52,8 +52,8 @@
using (var view = new GrassCoverSlipOffInwardsResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs
===================================================================
diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -52,8 +52,8 @@
using (var view = new GrassCoverSlipOffOutwardsResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -53,8 +53,8 @@
using (var view = new MacroStabilityOutwardsResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -52,8 +52,8 @@
using (var view = new MicrostabilityResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -52,8 +52,8 @@
using (var view = new PipingStructureResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -51,8 +51,8 @@
using (var view = new StrengthStabilityLengthwiseConstructionResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -51,8 +51,8 @@
using (var view = new TechnicalInnovationResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -51,8 +51,8 @@
using (var view = new WaterPressureAsphaltCoverResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r6d6256a21a3a1bc8e4811db1eb638df3cfb4c37b -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 6d6256a21a3a1bc8e4811db1eb638df3cfb4c37b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -37,7 +37,8 @@
/// The view for the .
///
public class MacroStabilityInwardsFailureMechanismResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
private const int assessmentLayerTwoAIndex = 2;
private const double tolerance = 1e-6;
@@ -56,7 +57,7 @@
IAssessmentSection assessmentSection,
MacroStabilityInwardsFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
if (assessmentSection == null)
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6d6256a21a3a1bc8e4811db1eb638df3cfb4c37b -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 6d6256a21a3a1bc8e4811db1eb638df3cfb4c37b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -76,8 +76,8 @@
using (var view = new MacroStabilityInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs
===================================================================
diff -u -r212b554dfd4ca66295fd34f33d9a49ba1fcc4e14 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 212b554dfd4ca66295fd34f33d9a49ba1fcc4e14)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -36,7 +36,7 @@
///
/// The view for the .
///
- public class PipingFailureMechanismResultView : FailureMechanismResultView
+ public class PipingFailureMechanismResultView : FailureMechanismResultView
{
private const int assessmentLayerTwoAIndex = 2;
private const double tolerance = 1e-6;
@@ -55,7 +55,7 @@
IAssessmentSection assessmentSection,
PipingFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
if (assessmentSection == null)
{
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -r212b554dfd4ca66295fd34f33d9a49ba1fcc4e14 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 212b554dfd4ca66295fd34f33d9a49ba1fcc4e14)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -94,7 +94,7 @@
pipingFailureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(pipingFailureMechanism, view.FailureMechanism);
}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -40,8 +40,8 @@
/// for stability point structures.
///
public class StabilityPointStructuresFailureMechanismResultView
- : FailureMechanismResultView>
+ : FailureMechanismResultView,
+ StabilityPointStructuresFailureMechanism>
{
private const int assessmentLayerTwoAIndex = 2;
private readonly IAssessmentSection assessmentSection;
@@ -58,7 +58,7 @@
IAssessmentSection assessmentSection,
StabilityPointStructuresFailureMechanism failureMechanism,
IObservableEnumerable> failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
if (assessmentSection == null)
{
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -78,8 +78,8 @@
using (var view = new StabilityPointStructuresFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>>(view);
+ Assert.IsInstanceOf,
+ StabilityPointStructuresFailureMechanism>>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -35,7 +35,7 @@
/// The view for a collection of .
///
public class StabilityStoneCoverResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -44,7 +44,7 @@
public StabilityStoneCoverResultView(
StabilityStoneCoverFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += DisableIrrelevantFieldsFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -51,8 +51,8 @@
using (var view = new StabilityStoneCoverResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs
===================================================================
diff -u -red5b5a31c2480fbef4ebc8258ee92eed978f5049 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision ed5b5a31c2480fbef4ebc8258ee92eed978f5049)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -35,7 +35,7 @@
/// The view for a collection of .
///
public class WaveImpactAsphaltCoverFailureMechanismResultView
- : FailureMechanismResultView
+ : FailureMechanismResultView
{
///
/// Creates a new instance of .
@@ -44,7 +44,7 @@
public WaveImpactAsphaltCoverFailureMechanismResultView(
WaveImpactAsphaltCoverFailureMechanism failureMechanism,
IObservableEnumerable failureMechanismSectionResults)
- : base(failureMechanism, failureMechanismSectionResults)
+ : base(failureMechanismSectionResults, failureMechanism)
{
DataGridViewControl.CellFormatting += OnCellFormatting;
UpdateDataGridViewDataSource();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -r7f80815f667036fe5000fb938d61aee1edd157e0
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0)
@@ -51,8 +51,8 @@
using (var view = new WaveImpactAsphaltCoverFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults))
{
// Assert
- Assert.IsInstanceOf>(view);
+ Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);
}