Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs
===================================================================
diff -u -r7126410c2fc1844718e4592a6088282cc7415a79 -r68953cc654409e65478d6aa4fb8c1cf44b116d9d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs	(.../DistributionPropertiesBaseTest.cs)	(revision 7126410c2fc1844718e4592a6088282cc7415a79)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs	(.../DistributionPropertiesBaseTest.cs)	(revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d)
@@ -39,7 +39,7 @@
         public void Constructor_WithParameters_ExpectedValues()
         {
             // Call
-            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.All, null);
+            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.All, null, null);
 
             // Assert
             Assert.IsInstanceOf<DistributionPropertiesBase<IDistribution>>(properties);
@@ -54,7 +54,7 @@
             DistributionPropertiesReadOnly flags)
         {
             // Call
-            TestDelegate call = () => new SimpleDistributionProperties(flags, null);
+            TestDelegate call = () => new SimpleDistributionProperties(flags, null, null);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "Observable must be specified unless no property can be set.");
@@ -65,14 +65,60 @@
         [TestCase(DistributionPropertiesReadOnly.Mean, true, false)]
         [TestCase(DistributionPropertiesReadOnly.None, false, false)]
         [TestCase(DistributionPropertiesReadOnly.StandardDeviation, false, true)]
+        public void Constructor_Always_PropertiesHaveExpectedAttributesValues(DistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectStandardDeviationReadOnly)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var observable = mocks.Stub<IObservable>();
+            var distribution = mocks.Stub<IDistribution>();
+            mocks.ReplayAll();
+
+            // Call
+            var properties = new SimpleDistributionProperties(propertiesReadOnly, observable, null)
+            {
+                Data = distribution
+            };
+
+            // Assert
+            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+            Assert.AreEqual(3, dynamicProperties.Count);
+
+            PropertyDescriptor distributionTypeProperty = dynamicProperties[0];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(distributionTypeProperty,
+                                                                            "Misc",
+                                                                            "Type verdeling",
+                                                                            "Het soort kansverdeling waarin deze parameter gedefinieerd wordt.",
+                                                                            true);
+
+            PropertyDescriptor meanProperty = dynamicProperties[1];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(meanProperty,
+                                                                            "Misc",
+                                                                            "Verwachtingswaarde",
+                                                                            "",
+                                                                            expectMeanReadOnly);
+
+            PropertyDescriptor standardDeviationProperty = dynamicProperties[2];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(standardDeviationProperty,
+                                                                            "Misc",
+                                                                            "Standaardafwijking",
+                                                                            "",
+                                                                            expectStandardDeviationReadOnly);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [TestCase(DistributionPropertiesReadOnly.All, true, true)]
+        [TestCase(DistributionPropertiesReadOnly.Mean, true, false)]
+        [TestCase(DistributionPropertiesReadOnly.None, false, false)]
+        [TestCase(DistributionPropertiesReadOnly.StandardDeviation, false, true)]
         public void DynamicReadOnlyValidationMethod_VariousReadOnlySet_ExpectedValues(DistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectStandardDeviationReadOnly)
         {
             // Setup
             var mocks = new MockRepository();
             var observable = mocks.Stub<IObservable>();
             mocks.ReplayAll();
 
-            var properties = new SimpleDistributionProperties(propertiesReadOnly, observable);
+            var properties = new SimpleDistributionProperties(propertiesReadOnly, observable, null);
 
             // Call
             bool meanIsReadOnly = properties.DynamicReadOnlyValidationMethod("Mean");
@@ -97,7 +143,7 @@
             distribution.StandardDeviation = new RoundedDouble(2, 2.2);
             mocks.ReplayAll();
 
-            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, observable);
+            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, observable, null);
 
             // Call
             properties.Data = distribution;
@@ -112,16 +158,47 @@
         }
 
         [Test]
-        public void SetProperties_MeanWithObserverable_ValueSetNotifyObservers()
+        public void Mean_ReadOnlyWithObserverable_ThrowsArgumentException()
         {
             // Setup
+            var mocks = new MockRepository();
+            var observable = mocks.Stub<IObservable>();
+            var distribution = mocks.Stub<IDistribution>();
+            mocks.ReplayAll();
+
+            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.All, observable, null)
+            {
+                Data = distribution
+            };
+
+            // Call
+            TestDelegate test = () => properties.Mean = new RoundedDouble(2, 20);
+
+            // Assert
+            const string expectedMessage = "Mean is set to be read-only.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Mean_WithObserverable_ValueSetNotifyObservers(bool withHandler)
+        {
+            // Setup
             var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
             observerableMock.Expect(o => o.NotifyObservers());
+            DistributionPropertiesBase<IDistribution>.IChangeHandler handler = null;
+            if (withHandler)
+            {
+                handler = mockRepository.StrictMock<DistributionPropertiesBase<IDistribution>.IChangeHandler>();
+                handler.Expect(o => o.PropertyChanged());
+            }
             var distribution = mockRepository.Stub<IDistribution>();
             mockRepository.ReplayAll();
 
-            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock)
+            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock, handler)
             {
                 Data = distribution
             };
@@ -138,15 +215,15 @@
         [Test]
         [TestCase(DistributionPropertiesReadOnly.All)]
         [TestCase(DistributionPropertiesReadOnly.StandardDeviation)]
-        public void SetProperties_ReadOnlyStandardDeviationWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
+        public void StandardDeviation_ReadOnlyWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
         {
             // Setup
             var mocks = new MockRepository();
             var observable = mocks.Stub<IObservable>();
             var distribution = mocks.Stub<IDistribution>();
             mocks.ReplayAll();
 
-            var properties = new SimpleDistributionProperties(propertiesReadOnly, observable)
+            var properties = new SimpleDistributionProperties(propertiesReadOnly, observable, null)
             {
                 Data = distribution
             };
@@ -161,16 +238,24 @@
         }
 
         [Test]
-        public void SetProperties_StandardDeviationWithObserverable_ValueSetNotifyObservers()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void StandardDeviation_WithObserverable_ValueSetNotifyObservers(bool withHandler)
         {
             // Setup
             var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
-            observerableMock.Expect(o => o.NotifyObservers()).Repeat.Once();
+            observerableMock.Expect(o => o.NotifyObservers());
+            DistributionPropertiesBase<IDistribution>.IChangeHandler handler = null;
+            if (withHandler)
+            {
+                handler = mockRepository.StrictMock<DistributionPropertiesBase<IDistribution>.IChangeHandler>();
+                handler.Expect(o => o.PropertyChanged());
+            }
             var distribution = mockRepository.Stub<IDistribution>();
             mockRepository.ReplayAll();
 
-            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock)
+            var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock, handler)
             {
                 Data = distribution
             };
@@ -184,56 +269,10 @@
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        [TestCase(DistributionPropertiesReadOnly.All, true, true)]
-        [TestCase(DistributionPropertiesReadOnly.Mean, true, false)]
-        [TestCase(DistributionPropertiesReadOnly.None, false, false)]
-        [TestCase(DistributionPropertiesReadOnly.StandardDeviation, false, true)]
-        public void Constructor_Always_PropertiesHaveExpectedAttributesValues(DistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectStandardDeviationReadOnly)
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var observable = mocks.Stub<IObservable>();
-            var distribution = mocks.Stub<IDistribution>();
-            mocks.ReplayAll();
-
-            // Call
-            var properties = new SimpleDistributionProperties(propertiesReadOnly, observable)
-            {
-                Data = distribution
-            };
-
-            // Assert
-            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(3, dynamicProperties.Count);
-
-            PropertyDescriptor distributionTypeProperty = dynamicProperties[0];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(distributionTypeProperty,
-                                                                            "Misc",
-                                                                            "Type verdeling",
-                                                                            "Het soort kansverdeling waarin deze parameter gedefinieerd wordt.",
-                                                                            true);
-
-            PropertyDescriptor meanProperty = dynamicProperties[1];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(meanProperty,
-                                                                            "Misc",
-                                                                            "Verwachtingswaarde",
-                                                                            "",
-                                                                            expectMeanReadOnly);
-
-            PropertyDescriptor standardDeviationProperty = dynamicProperties[2];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(standardDeviationProperty,
-                                                                            "Misc",
-                                                                            "Standaardafwijking",
-                                                                            "",
-                                                                            expectStandardDeviationReadOnly);
-            mocks.VerifyAll();
-        }
-
         private class SimpleDistributionProperties : DistributionPropertiesBase<IDistribution>
         {
-            public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable)
-                : base(propertiesReadOnly, observable) {}
+            public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, IObservable observable, IChangeHandler handler)
+                : base(propertiesReadOnly, observable, handler) {}
 
             public override string DistributionType
             {