Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -312,7 +312,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(closingStructuresFailureMechanismContext.WrappedData.NotRelevantComments)
+                new CommentContext(closingStructuresFailureMechanismContext.WrappedData.NotRelevantComments)
             };
         }
 
@@ -323,7 +323,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
                 new ClosingStructuresContext(failureMechanism.ClosingStructures, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -334,7 +334,7 @@
                 new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
@@ -587,7 +587,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(context.WrappedData.Comments),
+                new CommentContext(context.WrappedData.Comments),
                 new ClosingStructuresInputContext(context.WrappedData.InputParameters,
                                                   context.WrappedData,
                                                   context.FailureMechanism,
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2f4ab8ae59075bc9fe42f07604d2d72bb685531d -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2f4ab8ae59075bc9fe42f07604d2d72bb685531d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -146,7 +146,7 @@
             Assert.AreSame(failureMechanism, closingStructuresContext.FailureMechanism);
             Assert.AreSame(assessmentSectionStub, closingStructuresContext.AssessmentSection);
 
-            var inputCommentContext = (CommentContext<ICommentable>) inputsFolder.Contents[3];
+            var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
             Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
 
             var calculationsFolder = (ClosingStructuresCalculationGroupContext) children[1];
@@ -167,7 +167,7 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext<ICommentable>) outputsFolder.Contents[2];
+            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
             Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
         }
 
@@ -189,7 +189,7 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext<ICommentable>) children[0];
+            var commentContext = (CommentContext) children[0];
             Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
         }
 
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -142,7 +142,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
@@ -173,7 +173,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Commentable.cs
===================================================================
diff -u -rb064decd82bd1befa2425a8c9540740a6cb1815e -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Common/src/Ringtoets.Common.Data/Commentable.cs	(.../Commentable.cs)	(revision b064decd82bd1befa2425a8c9540740a6cb1815e)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Commentable.cs	(.../Commentable.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -24,8 +24,11 @@
     /// <summary>
     /// This class represents an object about which some comments can be assigned.
     /// </summary>
-    public class Commentable : ICommentable
+    public class Commentable
     {
+        /// <summary>
+        /// Gets or sets the comments associated with the data object.
+        /// </summary>
         public string Comments { get; set; }
     }
 }
\ No newline at end of file
Fisheye: Tag c0d30f326bbc7308be94ba7a77ee37744cb7bee5 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/ICommentable.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r306b732e03a09bf7dcd66e37dc1db8fa281b1480 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 306b732e03a09bf7dcd66e37dc1db8fa281b1480)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -72,7 +72,6 @@
     <Compile Include="FailureMechanism\IFailureMechanism.cs" />
     <Compile Include="Calculation\CalculationGroupExtensions.cs" />
     <Compile Include="FailureMechanism\IHasSectionResults.cs" />
-    <Compile Include="ICommentable.cs" />
     <Compile Include="Calculation\ICalculationBase.cs" />
     <Compile Include="Probabilistics\DesignVariable.cs" />
     <Compile Include="Probabilistics\IDistribution.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CommentContext.cs
===================================================================
diff -u -re775448bfb8290e43d62340a53a08723bbc035c6 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CommentContext.cs	(.../CommentContext.cs)	(revision e775448bfb8290e43d62340a53a08723bbc035c6)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CommentContext.cs	(.../CommentContext.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -26,16 +26,16 @@
 namespace Ringtoets.Common.Forms.PresentationObjects
 {
     /// <summary>
-    /// This class is a presentation object for the comment of <see cref="T"/>.
+    /// This class is a presentation object for the comment of <see cref="Commentable"/>.
     /// </summary>
-    public class CommentContext<T> : WrappedObjectContextBase<T> where T : ICommentable
+    public class CommentContext : WrappedObjectContextBase<Commentable>
     {
         /// <summary>
-        /// Creates a new instance of <see cref="CommentContext{T}"/>.
+        /// Creates a new instance of <see cref="CommentContext"/>.
         /// </summary>
         /// <param name="wrappedCommentable">The commentable item to wrap.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedCommentable"/> is <c>null</c>.</exception>
-        public CommentContext(T wrappedCommentable)
-            : base(wrappedCommentable) {}
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedCommentable"/> 
+        /// is <c>null</c>.</exception>
+        public CommentContext(Commentable wrappedCommentable) : base(wrappedCommentable) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CommentView.cs
===================================================================
diff -u -r306b732e03a09bf7dcd66e37dc1db8fa281b1480 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CommentView.cs	(.../CommentView.cs)	(revision 306b732e03a09bf7dcd66e37dc1db8fa281b1480)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CommentView.cs	(.../CommentView.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -31,7 +31,7 @@
     /// </summary>
     public partial class CommentView : UserControl, IView
     {
-        private ICommentable data;
+        private Commentable data;
 
         /// <summary>
         /// Creates a new instance of <see cref="CommentView"/>.
@@ -51,7 +51,7 @@
             }
             set
             {
-                data = value as ICommentable;
+                data = value as Commentable;
 
                 if (data != null)
                 {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CommentContextTest.cs
===================================================================
diff -u -re775448bfb8290e43d62340a53a08723bbc035c6 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CommentContextTest.cs	(.../CommentContextTest.cs)	(revision e775448bfb8290e43d62340a53a08723bbc035c6)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CommentContextTest.cs	(.../CommentContextTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Forms.PresentationObjects;
 
@@ -31,20 +29,16 @@
     public class CommentContextTest
     {
         [Test]
-        public void Constuctor_DefaultValues()
+        public void Constructor_DefaultValues()
         {
             // Setup
-            var mocks = new MockRepository();
-            var commentableMock = mocks.StrictMock<ICommentable>();
-            mocks.ReplayAll();
+            var comment = new Commentable();
 
             // Call
-            var context = new CommentContext<ICommentable>(commentableMock);
+            var context = new CommentContext(comment);
 
             // Assert
-            Assert.IsInstanceOf<WrappedObjectContextBase<ICommentable>>(context);
-            Assert.AreSame(commentableMock, context.WrappedData);
-            mocks.VerifyAll();
+            Assert.AreSame(comment, context.WrappedData);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CommentViewTest.cs
===================================================================
diff -u -r2857b234df4622cdaf80bbc75abc58af36667347 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CommentViewTest.cs	(.../CommentViewTest.cs)	(revision 2857b234df4622cdaf80bbc75abc58af36667347)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CommentViewTest.cs	(.../CommentViewTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -24,7 +24,6 @@
 using Core.Common.Controls.Views;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Forms.Views;
 
@@ -50,12 +49,10 @@
         }
 
         [Test]
-        public void Data_IComment_DataSet()
+        public void Data_Comment_DataSet()
         {
             // Setup
-            var mocks = new MockRepository();
-            var data = mocks.Stub<ICommentable>();
-            mocks.ReplayAll();
+            var data = new Commentable();
 
             using (var view = new CommentView())
             {
@@ -65,12 +62,10 @@
                 // Assert
                 Assert.AreSame(data, view.Data);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
-        public void Data_NoIComment_DataNull()
+        public void Data_NoComment_DataNull()
         {
             // Setup
             using (var view = new CommentView())
@@ -89,13 +84,13 @@
         public void Data_ContainsComment_CommentSetOnRichTextEditor()
         {
             // Setup
-            var expectedText = "<Some_text>";
+            const string expectedText = "<Some_text>";
             var validRtfString = GetValidRtfString(expectedText);
 
-            var mocks = new MockRepository();
-            var data = mocks.Stub<ICommentable>();
-            data.Comments = validRtfString;
-            mocks.ReplayAll();
+            var data = new Commentable
+            {
+                Comments = validRtfString
+            };
 
             using (var view = new CommentView())
             {
@@ -107,17 +102,13 @@
                 Assert.IsNotNull(textBoxControl);
                 Assert.AreEqual(validRtfString, textBoxControl.Rtf);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void RichTextEditorOnTextChanged_Always_SetsComments()
         {
             // Setup
-            var mocks = new MockRepository();
-            var data = mocks.Stub<ICommentable>();
-            mocks.ReplayAll();
+            var data = new Commentable();
 
             using (var form = new Form())
             using (var view = new CommentView())
@@ -142,7 +133,6 @@
                 // Assert
                 Assert.AreEqual(validRtfString, data.Comments);
             }
-            mocks.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -350,7 +350,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(grassCoverErosionInwardsFailureMechanismContext.WrappedData.NotRelevantComments)
+                new CommentContext(grassCoverErosionInwardsFailureMechanismContext.WrappedData.NotRelevantComments)
             };
         }
 
@@ -360,7 +360,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -371,7 +371,7 @@
                 new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<GrassCoverErosionInwardsFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
@@ -610,7 +610,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(context.WrappedData.Comments),
+                new CommentContext(context.WrappedData.Comments),
                 new GrassCoverErosionInwardsInputContext(context.WrappedData.InputParameters,
                                                          context.WrappedData,
                                                          context.FailureMechanism,
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -129,7 +129,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
@@ -160,7 +160,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2f4ab8ae59075bc9fe42f07604d2d72bb685531d -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2f4ab8ae59075bc9fe42f07604d2d72bb685531d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -132,7 +132,7 @@
             Assert.AreSame(failureMechanism, dikeProfilesContext.ParentFailureMechanism);
             Assert.AreSame(assessmentSectionMock, dikeProfilesContext.ParentAssessmentSection);
 
-            var inputCommentContext = (CommentContext<ICommentable>) inputsFolder.Contents[2];
+            var inputCommentContext = (CommentContext) inputsFolder.Contents[2];
             Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
 
             var calculationsFolder = (GrassCoverErosionInwardsCalculationGroupContext) children[1];
@@ -153,7 +153,7 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext<ICommentable>) outputsFolder.Contents[2];
+            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
             Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
         }
 
@@ -175,7 +175,7 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext<ICommentable>) children[0];
+            var commentContext = (CommentContext) children[0];
             Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -402,7 +402,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(failureMechanismContext.WrappedData.NotRelevantComments)
+                new CommentContext(failureMechanismContext.WrappedData.NotRelevantComments)
             };
         }
 
@@ -412,7 +412,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -422,7 +422,7 @@
             {
                 new FailureMechanismSectionResultContext<GrassCoverErosionOutwardsFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
@@ -807,7 +807,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(context.WrappedData.Comments),
+                new CommentContext(context.WrappedData.Comments),
                 new GrassCoverErosionOutwardsWaveConditionsInputContext(context.WrappedData.InputParameters,
                                                                         context.FailureMechanism)
             };
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2f4ab8ae59075bc9fe42f07604d2d72bb685531d -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2f4ab8ae59075bc9fe42f07604d2d72bb685531d)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -199,7 +199,7 @@
             Assert.AreSame(failureMechanism, foreshoreProfilesContext.ParentFailureMechanism);
             Assert.AreSame(assessmentSection, foreshoreProfilesContext.ParentAssessmentSection);
 
-            var inputCommentContext = (CommentContext<ICommentable>)inputsFolder.Contents[2];
+            var inputCommentContext = (CommentContext)inputsFolder.Contents[2];
             Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
 
             var hydraulicBoundariesGroupContext = (HydraulicBoundariesGroupContext) children[1];
@@ -217,7 +217,7 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext<ICommentable>)outputsFolder.Contents[1];
+            var outputCommentContext = (CommentContext)outputsFolder.Contents[1];
             Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
         }
 
@@ -240,7 +240,7 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext<ICommentable>) children[0];
+            var commentContext = (CommentContext) children[0];
             Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -341,7 +341,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext<ICommentable>) children[0];
+            var commentsContext = (CommentContext) children[0];
             Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
 
             var inputContext = (GrassCoverErosionOutwardsWaveConditionsInputContext) children[1];
@@ -405,7 +405,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext<ICommentable>) children[0];
+            var commentsContext = (CommentContext) children[0];
             Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
 
             var inputContext = (GrassCoverErosionOutwardsWaveConditionsInputContext) children[1];
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -349,7 +349,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
                 new HeightStructuresContext(failureMechanism.HeightStructures, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -360,15 +360,15 @@
                 new HeightStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
         private static object[] FailureMechanismDisabledChildNodeObjects(HeightStructuresFailureMechanismContext context)
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(context.WrappedData.NotRelevantComments)
+                new CommentContext(context.WrappedData.NotRelevantComments)
             };
         }
 
@@ -608,7 +608,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(context.WrappedData.Comments),
+                new CommentContext(context.WrappedData.Comments),
                 new HeightStructuresInputContext(context.WrappedData.InputParameters,
                                                  context.WrappedData,
                                                  context.FailureMechanism,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -129,7 +129,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
@@ -161,7 +161,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r212cdb0351bdd3ce918b53f081ef9b42cee562ec -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 212cdb0351bdd3ce918b53f081ef9b42cee562ec)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -138,7 +138,7 @@
             Assert.AreSame(failureMechanism, heightStructuresContext.FailureMechanism);
             Assert.AreSame(assessmentSectionStub, heightStructuresContext.AssessmentSection);
 
-            var inputCommentContext = (CommentContext<ICommentable>) inputsFolder.Contents[3];
+            var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
             Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
 
             var calculationsFolder = (HeightStructuresCalculationGroupContext) children[1];
@@ -159,7 +159,7 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext<ICommentable>) outputsFolder.Contents[2];
+            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
             Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
         }
 
@@ -181,7 +181,7 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext<ICommentable>) children[0];
+            var commentContext = (CommentContext) children[0];
             Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -390,7 +390,7 @@
                 MacrostabilityOutwardsFailureMechanismSectionResult,
                 MacrostabilityOutwardsResultView>();
 
-            yield return new ViewInfo<CommentContext<ICommentable>, ICommentable, CommentView>
+            yield return new ViewInfo<CommentContext, Commentable, CommentView>
             {
                 GetViewName = (view, context) => RingtoetsIntegrationPluginResources.Comment_DisplayName,
                 GetViewData = context => context.WrappedData,
@@ -648,7 +648,7 @@
             yield return CreateFailureMechanismSectionResultTreeNodeInfo<MacrostabilityInwardsFailureMechanismSectionResult>();
             yield return CreateFailureMechanismSectionResultTreeNodeInfo<MacrostabilityOutwardsFailureMechanismSectionResult>();
 
-            yield return new TreeNodeInfo<CommentContext<ICommentable>>
+            yield return new TreeNodeInfo<CommentContext>
             {
                 Text = comment => RingtoetsIntegrationPluginResources.Comment_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.EditDocumentIcon,
@@ -1015,12 +1015,12 @@
             return false;
         }
 
-        private static IEnumerable<ICommentable> GetCommentableElements(CalculationGroup calculationGroup)
+        private static IEnumerable<Commentable> GetCommentableElements(CalculationGroup calculationGroup)
         {
             return calculationGroup.GetCalculations().Select(c => c.Comments);
         }
 
-        private static IEnumerable<ICommentable> GetCommentableElements(IAssessmentSection assessmentSection)
+        private static IEnumerable<Commentable> GetCommentableElements(IAssessmentSection assessmentSection)
         {
             yield return assessmentSection.Comments;
             foreach (var commentable in assessmentSection.GetFailureMechanisms().SelectMany(GetCommentableElements))
@@ -1029,7 +1029,7 @@
             }
         }
 
-        private static IEnumerable<ICommentable> GetCommentableElements(IFailureMechanism failureMechanism)
+        private static IEnumerable<Commentable> GetCommentableElements(IFailureMechanism failureMechanism)
         {
             yield return failureMechanism.InputComments;
             yield return failureMechanism.OutputComments;
@@ -1051,7 +1051,7 @@
                 new ReferenceLineContext(nodeData),
                 new FailureMechanismContributionContext(nodeData.FailureMechanismContribution, nodeData),
                 new HydraulicBoundaryDatabaseContext(nodeData),
-                new CommentContext<ICommentable>(nodeData.Comments)
+                new CommentContext(nodeData.Comments)
             };
 
             IEnumerable<object> failureMechanismContexts = WrapFailureMechanismsInContexts(nodeData);
@@ -1120,7 +1120,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(nodeData.WrappedData.NotRelevantComments)
+                new CommentContext(nodeData.WrappedData.NotRelevantComments)
             };
         }
 
@@ -1129,7 +1129,7 @@
             return new ArrayList
             {
                 new FailureMechanismSectionsContext(nodeData, assessmentSection),
-                new CommentContext<ICommentable>(nodeData.InputComments)
+                new CommentContext(nodeData.InputComments)
             };
         }
 
@@ -1221,7 +1221,7 @@
                 failureMechanismSectionResultContexts[0] =
                     new FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(stabilityPointConstruction.SectionResults, nodeData);
             }
-            failureMechanismSectionResultContexts[1] = new CommentContext<ICommentable>(nodeData.OutputComments);
+            failureMechanismSectionResultContexts[1] = new CommentContext(nodeData.OutputComments);
             return failureMechanismSectionResultContexts;
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -reef76311cf166ff9bf9f08b3c5ca879307b7f7d7 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision eef76311cf166ff9bf9f08b3c5ca879307b7f7d7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -163,7 +163,7 @@
                 Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, context.WrappedData.HydraulicBoundaryDatabase);
                 Assert.AreSame(assessmentSection, context.WrappedData);
 
-                var commentContext = (CommentContext<ICommentable>) objects[3];
+                var commentContext = (CommentContext) objects[3];
                 Assert.AreSame(assessmentSection.Comments, commentContext.WrappedData);
 
                 var pipingFailureMechanismContext = (PipingFailureMechanismContext) objects[4];
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision f1bf048f691ca575f22e8807911ace0338fa425d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -56,7 +56,7 @@
                 var info = GetInfo(plugin);
 
                 // Assert
-                Assert.AreEqual(typeof(CommentContext<ICommentable>), info.TagType);
+                Assert.AreEqual(typeof(CommentContext), info.TagType);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
                 Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
@@ -79,44 +79,38 @@
         public void Text_Always_ReturnsName()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
-            mocks.ReplayAll();
+            var comment = new Commentable();
 
             using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
 
-                var context = new CommentContext<ICommentable>(commentMock);
+                var context = new CommentContext(comment);
 
                 // Call
                 var text = info.Text(context);
 
                 // Assert
                 Assert.AreEqual("Opmerkingen", text);
-
-                mocks.VerifyAll();
             }
         }
 
         [Test]
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
-            mocks.ReplayAll();
+            var comment = new Commentable();
 
             using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
-                var context = new CommentContext<ICommentable>(commentMock);
+                var context = new CommentContext(comment);
 
                 // Call
                 var image = info.Image(context);
 
                 // Assert
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.EditDocumentIcon, image);
-
-                mocks.VerifyAll();
             }
         }
 
@@ -152,7 +146,7 @@
 
         private TreeNodeInfo GetInfo(PluginBase gui)
         {
-            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext<ICommentable>));
+            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext));
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7a165d807e1cce8ca51f7707ce6addb0951aa8b4 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision 7a165d807e1cce8ca51f7707ce6addb0951aa8b4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -183,15 +183,15 @@
                 Assert.AreSame(failureMechanism, failureMechanismSectionsContext.WrappedData);
                 Assert.AreSame(assessmentSection, failureMechanismSectionsContext.ParentAssessmentSection);
 
-                var inputCommentContext = (CommentContext<ICommentable>) inputFolder.Contents[1];
+                var inputCommentContext = (CommentContext) inputFolder.Contents[1];
                 Assert.IsNotNull(inputCommentContext);
                 Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
 
                 var outputFolder = (CategoryTreeFolder) children[1];
                 Assert.AreEqual("Oordeel", outputFolder.Name);
                 Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-                var outputCommentContext = (CommentContext<ICommentable>) outputFolder.Contents[0];
+                var outputCommentContext = (CommentContext) outputFolder.Contents[0];
                 Assert.IsNotNull(outputCommentContext);
                 Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
             }
@@ -259,7 +259,7 @@
 
                 // Assert
                 Assert.AreEqual(1, children.Length);
-                var commentContext = (CommentContext<ICommentable>) children[0];
+                var commentContext = (CommentContext) children[0];
                 Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
             }
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r0be8a14b7c545ae5a07d1da6a0fa70829323b0f2 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 0be8a14b7c545ae5a07d1da6a0fa70829323b0f2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -424,8 +424,8 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(CommentContext<ICommentable>),
-                    typeof(ICommentable),
+                    typeof(CommentContext),
+                    typeof(Commentable),
                     typeof(CommentView));
             }
         }
@@ -463,7 +463,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<MacrostabilityOutwardsFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<MacrostabilityInwardsFailureMechanismSectionResult>)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CommentContext<ICommentable>)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CommentContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityAssessmentOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyProbabilityAssessmentOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(RingtoetsProject)));
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -59,39 +59,39 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(CommentContext<ICommentable>), info.DataType);
+            Assert.AreEqual(typeof(CommentContext), info.DataType);
         }
 
         [Test]
         public void GetViewName_Always_ReturnsViewName()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
+            var comment = new Commentable();
             var viewMock = mocks.StrictMock<CommentView>();
 
             mocks.ReplayAll();
 
             // Call
-            var viewName = info.GetViewName(viewMock, commentMock);
+            var viewName = info.GetViewName(viewMock, comment);
 
             // Assert
             Assert.AreEqual("Opmerkingen", viewName);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GetViewData_Always_ReturnsIComment()
+        public void GetViewData_Always_ReturnsComment()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
-            var contextMock = mocks.StrictMock<CommentContext<ICommentable>>(commentMock);
+            var comment = new Commentable();
+            var contextMock = mocks.StrictMock<CommentContext>(comment);
             mocks.ReplayAll();
 
             // Call
             var viewData = info.GetViewData(contextMock);
 
             // Assert
-            Assert.AreSame(commentMock, viewData);
+            Assert.AreSame(comment, viewData);
             mocks.VerifyAll();
         }
 
@@ -112,7 +112,7 @@
             var dataType = info.DataType;
 
             // Assert
-            Assert.AreEqual(typeof(CommentContext<ICommentable>), dataType);
+            Assert.AreEqual(typeof(CommentContext), dataType);
         }
 
         [Test]
@@ -122,11 +122,11 @@
             var viewDataType = info.ViewDataType;
 
             // Assert
-            Assert.AreEqual(typeof(ICommentable), viewDataType);
+            Assert.AreEqual(typeof(Commentable), viewDataType);
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsEditDocumentIcon()
         {
             // Call
             var image = info.Image;
@@ -139,12 +139,12 @@
         public void CloseForData_ObjectIsNotObjectOfInterest_ReturnFalse()
         {
             // Setup
-            var commentableMock = mocks.Stub<ICommentable>();
+            var comment = new Commentable();
             mocks.ReplayAll();
 
             using (var view = new CommentView
             {
-                Data = commentableMock
+                Data = comment
             })
             {
                 // Call
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -581,7 +581,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(pipingFailureMechanismContext.WrappedData.NotRelevantComments)
+                new CommentContext(pipingFailureMechanismContext.WrappedData.NotRelevantComments)
             };
         }
 
@@ -592,7 +592,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new RingtoetsPipingSurfaceLinesContext(failureMechanism.SurfaceLines, failureMechanism, assessmentSection),
                 new StochasticSoilModelsContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -603,7 +603,7 @@
                 new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
@@ -635,7 +635,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(pipingCalculationScenarioContext.WrappedData.Comments),
+                new CommentContext(pipingCalculationScenarioContext.WrappedData.Comments),
                 new PipingInputContext(pipingCalculationScenarioContext.WrappedData.InputParameters,
                                        pipingCalculationScenarioContext.WrappedData,
                                        pipingCalculationScenarioContext.AvailablePipingSurfaceLines,
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -127,7 +127,7 @@
 
             // Assert
             Assert.AreEqual(3, children.Length);
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(pipingCalculationContext.WrappedData.Comments, commentContext.WrappedData);
 
@@ -160,7 +160,7 @@
 
             // Assert
             Assert.AreEqual(3, children.Length);
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(pipingCalculationContext.WrappedData.Comments, commentContext.WrappedData);
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r39b5069cba551091731554a275e54896e5a5daa8 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 39b5069cba551091731554a275e54896e5a5daa8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -163,7 +163,7 @@
             Assert.AreSame(pipingFailureMechanism, stochasticSoilModelContext.FailureMechanism);
             Assert.AreSame(assessmentSection, stochasticSoilModelContext.AssessmentSection);
 
-            var inputCommentContext = (CommentContext<ICommentable>) inputsFolder.Contents[3];
+            var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
             Assert.AreSame(pipingFailureMechanism.InputComments, inputCommentContext.WrappedData);
 
             var calculationsFolder = (PipingCalculationGroupContext) children[1];
@@ -186,7 +186,7 @@
             Assert.AreSame(pipingFailureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(pipingFailureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext<ICommentable>) outputsFolder.Contents[2];
+            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
             Assert.AreSame(pipingFailureMechanism.OutputComments, outputCommentContext.WrappedData);
         }
 
@@ -212,7 +212,7 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext<ICommentable>) children[0];
+            var commentContext = (CommentContext) children[0];
             Assert.AreSame(pipingFailureMechanism.NotRelevantComments, commentContext.WrappedData);
         }
 
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -351,7 +351,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(stabilityPointStructuresFailureMechanismContext.WrappedData.NotRelevantComments)
+                new CommentContext(stabilityPointStructuresFailureMechanismContext.WrappedData.NotRelevantComments)
             };
         }
 
@@ -363,7 +363,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
                 new StabilityPointStructuresContext(failureMechanism.StabilityPointStructures, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -374,7 +374,7 @@
                 new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
@@ -616,7 +616,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(context.WrappedData.Comments),
+                new CommentContext(context.WrappedData.Comments),
                 new StabilityPointStructuresInputContext(context.WrappedData.InputParameters,
                                                          context.WrappedData,
                                                          context.FailureMechanism,
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -128,7 +128,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
@@ -159,7 +159,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext<ICommentable>;
+            var commentContext = children[0] as CommentContext;
             Assert.IsNotNull(commentContext);
             Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r39b5069cba551091731554a275e54896e5a5daa8 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 39b5069cba551091731554a275e54896e5a5daa8)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -139,7 +139,7 @@
                 Assert.AreSame(failureMechanism, stabilityPointStructuresContext.FailureMechanism);
                 Assert.AreSame(assessmentSectionMock, stabilityPointStructuresContext.AssessmentSection);
 
-                var inputCommentContext = (CommentContext<ICommentable>) inputsFolder.Contents[3];
+                var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
                 Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
 
                 var calculationsFolder = (StabilityPointStructuresCalculationGroupContext) children[1];
@@ -160,7 +160,7 @@
                 Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
                 Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-                var outputCommentContext = (CommentContext<ICommentable>) outputsFolder.Contents[2];
+                var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
                 Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
             }
             mocksRepository.VerifyAll();
@@ -188,7 +188,7 @@
 
                 // Assert
                 Assert.AreEqual(1, children.Length);
-                var commentContext = (CommentContext<ICommentable>) children[0];
+                var commentContext = (CommentContext) children[0];
                 Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
             }
             mocksRepository.VerifyAll();
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -230,7 +230,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(failureMechanismContext.WrappedData.NotRelevantComments)
+                new CommentContext(failureMechanismContext.WrappedData.NotRelevantComments)
             };
         }
 
@@ -240,7 +240,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -250,7 +250,7 @@
             {
                 new FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
@@ -505,7 +505,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(context.WrappedData.Comments),
+                new CommentContext(context.WrappedData.Comments),
                 new StabilityStoneCoverWaveConditionsInputContext(context.WrappedData.InputParameters,
                                                                   context.FailureMechanism.ForeshoreProfiles,
                                                                   context.AssessmentSection)
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra79d3e37090f92397ee0ae111ff5e013263c9cd7 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision a79d3e37090f92397ee0ae111ff5e013263c9cd7)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -199,7 +199,7 @@
             Assert.AreSame(failureMechanism, profilesContext.ParentFailureMechanism);
             Assert.AreSame(assessmentSection, profilesContext.ParentAssessmentSection);
 
-            var commentContext = (CommentContext<ICommentable>) inputsFolder.Contents[2];
+            var commentContext = (CommentContext) inputsFolder.Contents[2];
             Assert.AreSame(failureMechanism.InputComments, commentContext.WrappedData);
 
             var hydraulicBoundariesCalculationGroup = (StabilityStoneCoverWaveConditionsCalculationGroupContext) children[1];
@@ -215,7 +215,7 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext<ICommentable>) outputsFolder.Contents[1];
+            var outputCommentContext = (CommentContext) outputsFolder.Contents[1];
             Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
         }
 
@@ -238,7 +238,7 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext<ICommentable>) children[0];
+            var commentContext = (CommentContext) children[0];
             Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
         }
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -192,7 +192,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext<ICommentable>) children[0];
+            var commentsContext = (CommentContext) children[0];
             Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
 
             var inputContext = (StabilityStoneCoverWaveConditionsInputContext) children[1];
@@ -253,7 +253,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext<ICommentable>) children[0];
+            var commentsContext = (CommentContext) children[0];
             Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
 
             var inputContext = (StabilityStoneCoverWaveConditionsInputContext) children[1];
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -233,7 +233,7 @@
         {
             return new object[]
             {
-                new CommentContext<ICommentable>(failureMechanismContext.WrappedData.NotRelevantComments)
+                new CommentContext(failureMechanismContext.WrappedData.NotRelevantComments)
             };
         }
 
@@ -243,7 +243,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
-                new CommentContext<ICommentable>(failureMechanism.InputComments)
+                new CommentContext(failureMechanism.InputComments)
             };
         }
 
@@ -253,7 +253,7 @@
             {
                 new FailureMechanismSectionResultContext<WaveImpactAsphaltCoverFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext<ICommentable>(failureMechanism.OutputComments)
+                new CommentContext(failureMechanism.OutputComments)
             };
         }
 
@@ -511,7 +511,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<ICommentable>(context.WrappedData.Comments),
+                new CommentContext(context.WrappedData.Comments),
                 new WaveImpactAsphaltCoverWaveConditionsInputContext(context.WrappedData.InputParameters,
                                                                      context.FailureMechanism.ForeshoreProfiles,
                                                                      context.AssessmentSection)
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -192,7 +192,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext<ICommentable>) children[0];
+            var commentsContext = (CommentContext) children[0];
             Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
 
             var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext) children[1];
@@ -251,7 +251,7 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext<ICommentable>) children[0];
+            var commentsContext = (CommentContext) children[0];
             Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
 
             var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext) children[1];
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra79d3e37090f92397ee0ae111ff5e013263c9cd7 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision a79d3e37090f92397ee0ae111ff5e013263c9cd7)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -213,7 +213,7 @@
                 Assert.AreSame(failureMechanism, foreshoreProfilesContext.ParentFailureMechanism);
                 Assert.AreSame(assessmentSection, foreshoreProfilesContext.ParentAssessmentSection);
 
-                var inputCommentContext = (CommentContext<ICommentable>) inputsFolder.Contents[2];
+                var inputCommentContext = (CommentContext) inputsFolder.Contents[2];
                 Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
 
                 var hydraulicBoundariesCalculationGroup = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) children[1];
@@ -230,7 +230,7 @@
                 Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
                 Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-                var outputCommentContext = (CommentContext<ICommentable>) outputsFolder.Contents[1];
+                var outputCommentContext = (CommentContext) outputsFolder.Contents[1];
                 Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
             }
         }
@@ -258,7 +258,7 @@
 
                 // Assert
                 Assert.AreEqual(1, children.Length);
-                var commentContext = (CommentContext<ICommentable>) children[0];
+                var commentContext = (CommentContext) children[0];
                 Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
             }
         }