Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs
===================================================================
diff -u -r6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8 -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision 6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="ClosingStructuresCalculation"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class ClosingStructuresCalculationContext : ClosingStructuresContextBase<ClosingStructuresCalculation>,
+    public class ClosingStructuresCalculationContext : StructuresContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>,
                                                        ICalculationContext<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs
===================================================================
diff -u -r6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8 -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -31,15 +31,15 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order to be able to create configurable closing structures calculations.
     /// </summary>
-    public class ClosingStructuresCalculationGroupContext : ClosingStructuresContextBase<CalculationGroup>,
+    public class ClosingStructuresCalculationGroupContext : StructuresContextBase<CalculationGroup, ClosingStructuresFailureMechanism>,
                                                             ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresCalculationGroupContext"/>.
         /// </summary>
         /// <param name="calculationGroup">The <see cref="CalculationGroup"/> instance that is wrapped by this context object.</param>
         /// <param name="failureMechanism">The failure mechanism which contains the calculation group.</param>
-        /// <param name="assessmentSection">The assessment section which containts the calculation group.</param>
+        /// <param name="assessmentSection">The assessment section which contains the calculation group.</param>
         /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are <c>null</c>.</exception>
         public ClosingStructuresCalculationGroupContext(CalculationGroup calculationGroup,
                                                         ClosingStructuresFailureMechanism failureMechanism,
Fisheye: Tag 45c25fd7cf4e088ccc658e6caae1d1c53a598e22 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContextBase.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs
===================================================================
diff -u -r6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8 -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs	(.../ClosingStructuresInputContext.cs)	(revision 6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs	(.../ClosingStructuresInputContext.cs)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -22,14 +22,15 @@
 using System;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
 {
     /// <summary>
     /// Presentation object for all data required to configure an instance of <see cref="ClosingStructuresInput"/>
     /// in order to be able to configure closing structures calculations.
     /// </summary>
-    public class ClosingStructuresInputContext : ClosingStructuresContextBase<ClosingStructuresInput>
+    public class ClosingStructuresInputContext : StructuresContextBase<ClosingStructuresInput, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresInputContext"/>.
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj
===================================================================
diff -u -r0764f95727a4586e2b566d1e66c989a6327f3e2b -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision 0764f95727a4586e2b566d1e66c989a6327f3e2b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -46,7 +46,6 @@
     <Compile Include="PresentationObjects\ClosingStructuresCalculationContext.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresContext.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresCalculationGroupContext.cs" />
-    <Compile Include="PresentationObjects\ClosingStructuresContextBase.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresInputContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs
===================================================================
diff -u -r9214f74184b5923e0fb04b86d50c5bf8e5e57cdc -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision 9214f74184b5923e0fb04b86d50c5bf8e5e57cdc)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -46,7 +46,7 @@
             var context = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<ClosingStructuresContextBase<ClosingStructuresCalculation>>(context);
+            Assert.IsInstanceOf<StructuresContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
             Assert.IsInstanceOf<ICalculationContext<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
             Assert.AreEqual(calculation, context.WrappedData);
             Assert.AreEqual(failureMechanism, context.FailureMechanism);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -r8587508c66a1bc0938465e97cf365cc1ef254f53 -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -47,12 +47,12 @@
             var groupContext = new ClosingStructuresCalculationGroupContext(calculationGroup, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<ClosingStructuresContextBase<CalculationGroup>>(groupContext);
+            Assert.IsInstanceOf<StructuresContextBase<CalculationGroup, ClosingStructuresFailureMechanism>>(groupContext);
             Assert.IsInstanceOf<ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>>(groupContext);
             Assert.AreSame(calculationGroup, groupContext.WrappedData);
             Assert.AreSame(failureMechanism, groupContext.FailureMechanism);
             Assert.AreSame(assessmentSectionMock, groupContext.AssessmentSection);
             mockRepository.VerifyAll();
         }
     }
-}
+}
\ No newline at end of file
Fisheye: Tag 45c25fd7cf4e088ccc658e6caae1d1c53a598e22 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextBaseTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs
===================================================================
diff -u -ree5ab18ca7554ffb2ce9546dd72b341da59f0345 -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs	(.../ClosingStructuresInputContextTest.cs)	(revision ee5ab18ca7554ffb2ce9546dd72b341da59f0345)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs	(.../ClosingStructuresInputContextTest.cs)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -24,6 +24,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.PresentationObjects
 {
@@ -45,7 +46,7 @@
             var context = new ClosingStructuresInputContext(input, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<ClosingStructuresContextBase<ClosingStructuresInput>>(context);
+            Assert.IsInstanceOf<StructuresContextBase<ClosingStructuresInput, ClosingStructuresFailureMechanism>>(context);
             Assert.AreEqual(input, context.WrappedData);
             Assert.AreEqual(failureMechanism, context.FailureMechanism);
             Assert.AreEqual(assessmentSectionMock, context.AssessmentSection);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -r0764f95727a4586e2b566d1e66c989a6327f3e2b -r45c25fd7cf4e088ccc658e6caae1d1c53a598e22
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 0764f95727a4586e2b566d1e66c989a6327f3e2b)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 45c25fd7cf4e088ccc658e6caae1d1c53a598e22)
@@ -64,7 +64,6 @@
     <Compile Include="PresentationObjects\ClosingStructuresCalculationContextTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresContextTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresCalculationGroupContextTest.cs" />
-    <Compile Include="PresentationObjects\ClosingStructuresContextBaseTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresInputContextTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresScenariosContextTest.cs" />