Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs
===================================================================
diff -u -rd3ee3323c871a2796496b0f2ab1fe65ead8ad81d -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision d3ee3323c871a2796496b0f2ab1fe65ead8ad81d)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -30,10 +30,8 @@
     /// Presentation object for all data required to configure an instance of <see cref="StabilityPointStructuresCalculation"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class StabilityPointStructuresCalculationContext : StabilityPointStructuresContextBase<StabilityPointStructuresCalculation>,
-                                                              ICalculationContext<
-                                                                  StabilityPointStructuresCalculation,
-                                                                  StabilityPointStructuresFailureMechanism>
+    public class StabilityPointStructuresCalculationContext : StructuresContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>,
+                                                              ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresCalculationContext"/>.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs
===================================================================
diff -u -rd3ee3323c871a2796496b0f2ab1fe65ead8ad81d -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(.../StabilityPointStructuresCalculationGroupContext.cs)	(revision d3ee3323c871a2796496b0f2ab1fe65ead8ad81d)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(.../StabilityPointStructuresCalculationGroupContext.cs)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -31,10 +31,8 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order be able to create configurable stability point structures calculations.
     /// </summary>
-    public class StabilityPointStructuresCalculationGroupContext : StabilityPointStructuresContextBase<CalculationGroup>,
-                                                                   ICalculationContext<
-                                                                       CalculationGroup,
-                                                                       StabilityPointStructuresFailureMechanism>
+    public class StabilityPointStructuresCalculationGroupContext : StructuresContextBase<CalculationGroup, StabilityPointStructuresFailureMechanism>,
+                                                                   ICalculationContext<CalculationGroup, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresCalculationGroupContext"/>.
Fisheye: Tag 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresContextBase.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs
===================================================================
diff -u -r7a0eb8b2709b5c13d4711701213826b9cbd5aafe -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(.../StabilityPointStructuresInputContext.cs)	(revision 7a0eb8b2709b5c13d4711701213826b9cbd5aafe)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(.../StabilityPointStructuresInputContext.cs)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
 
 namespace Ringtoets.StabilityPointStructures.Forms.PresentationObjects
@@ -29,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="StabilityPointStructuresInput"/>
     /// in order to be able to configure stability point structures calculations.
     /// </summary>
-    public class StabilityPointStructuresInputContext : StabilityPointStructuresContextBase<StabilityPointStructuresInput>
+    public class StabilityPointStructuresInputContext : StructuresContextBase<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresInputContext"/>.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj
===================================================================
diff -u -r81e4be22ff8e2ea37c432625f91e986c95554297 -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj	(.../Ringtoets.StabilityPointStructures.Forms.csproj)	(revision 81e4be22ff8e2ea37c432625f91e986c95554297)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj	(.../Ringtoets.StabilityPointStructures.Forms.csproj)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -43,7 +43,6 @@
     <Compile Include="PresentationObjects\StabilityPointStructuresContext.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresCalculationContext.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresCalculationGroupContext.cs" />
-    <Compile Include="PresentationObjects\StabilityPointStructuresContextBase.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresInputContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs
===================================================================
diff -u -r7a0eb8b2709b5c13d4711701213826b9cbd5aafe -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision 7a0eb8b2709b5c13d4711701213826b9cbd5aafe)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -46,7 +46,7 @@
             var context = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StabilityPointStructuresContextBase<StabilityPointStructuresCalculation>>(context);
+            Assert.IsInstanceOf<StructuresContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
             Assert.IsInstanceOf<ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation, context.WrappedData);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -r7a0eb8b2709b5c13d4711701213826b9cbd5aafe -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(.../StabilityPointStructuresCalculationGroupContextTest.cs)	(revision 7a0eb8b2709b5c13d4711701213826b9cbd5aafe)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(.../StabilityPointStructuresCalculationGroupContextTest.cs)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -47,7 +47,7 @@
             var groupContext = new StabilityPointStructuresCalculationGroupContext(calculationGroup, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StabilityPointStructuresContextBase<CalculationGroup>>(groupContext);
+            Assert.IsInstanceOf<StructuresContextBase<CalculationGroup, StabilityPointStructuresFailureMechanism>>(groupContext);
             Assert.IsInstanceOf<ICalculationContext<CalculationGroup, StabilityPointStructuresFailureMechanism>>(groupContext);
             Assert.AreSame(calculationGroup, groupContext.WrappedData);
             Assert.AreSame(failureMechanism, groupContext.FailureMechanism);
Fisheye: Tag 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresContextBaseTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs
===================================================================
diff -u -r7a0eb8b2709b5c13d4711701213826b9cbd5aafe -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(.../StabilityPointStructuresInputContextTest.cs)	(revision 7a0eb8b2709b5c13d4711701213826b9cbd5aafe)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(.../StabilityPointStructuresInputContextTest.cs)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -23,6 +23,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
 
@@ -53,7 +54,7 @@
             var context = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StabilityPointStructuresContextBase<StabilityPointStructuresInput>>(context);
+            Assert.IsInstanceOf<StructuresContextBase<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>>(context);
             Assert.AreSame(input, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj
===================================================================
diff -u -r81e4be22ff8e2ea37c432625f91e986c95554297 -r3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision 81e4be22ff8e2ea37c432625f91e986c95554297)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision 3df1b8d140f5d2a2e2f6f51df8c6c4766e9d1a3f)
@@ -64,7 +64,6 @@
     <Compile Include="PresentationObjects\StabilityPointStructuresContextTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresCalculationContextTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresCalculationGroupContextTest.cs" />
-    <Compile Include="PresentationObjects\StabilityPointStructuresContextBaseTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresInputContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />