Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rdd3fbc29b15246ce6d2496e685398011e85bd21d -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dd3fbc29b15246ce6d2496e685398011e85bd21d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -4047,7 +4047,7 @@ } /// - /// Looks up a localized string similar to Hs [m]. + /// Looks up a localized string similar to Golfhoogte [m]. /// public static string WaveHeightCalculation_Result_DisplayName { get { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rdd3fbc29b15246ce6d2496e685398011e85bd21d -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision dd3fbc29b15246ce6d2496e685398011e85bd21d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -1444,7 +1444,7 @@ Is convergentie bereikt in de golfhoogte berekening? - Hs [m] + Golfhoogte [m] Berekende golfhoogte. Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationOutputProperties.cs =================================================================== diff -u -rdd3fbc29b15246ce6d2496e685398011e85bd21d -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationOutputProperties.cs (.../DesignWaterLevelCalculationOutputProperties.cs) (revision dd3fbc29b15246ce6d2496e685398011e85bd21d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationOutputProperties.cs (.../DesignWaterLevelCalculationOutputProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Core.Common.Base.Data; using Core.Common.Util.Attributes; using Ringtoets.Common.Data.Hydraulics; @@ -28,17 +27,15 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// ViewModel of with design water level for properties panel + /// ViewModel of a with design water level results for properties panel /// showing only output. /// public class DesignWaterLevelCalculationOutputProperties : HydraulicBoundaryLocationCalculationOutputProperties { + /// /// /// Creates a new instance of . /// - /// The hydraulic boundary location calculation. - /// The name of the category boundary this calculation belongs to. - /// Thrown when is null. public DesignWaterLevelCalculationOutputProperties(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation, string categoryBoundaryName) : base(hydraulicBoundaryLocationCalculation, categoryBoundaryName) {} Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsGroupProperties.cs =================================================================== diff -u -rbb29d09db7cda2fbce4c36d2d544f5ef74c7c103 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsGroupProperties.cs (.../DesignWaterLevelCalculationsGroupProperties.cs) (revision bb29d09db7cda2fbce4c36d2d544f5ef74c7c103) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsGroupProperties.cs (.../DesignWaterLevelCalculationsGroupProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -31,7 +31,7 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// ViewModel of an enumeration of with design water level results for properties panel. + /// ViewModel of a collection of with design water level calculations for properties panel. /// public class DesignWaterLevelCalculationsGroupProperties : HydraulicBoundaryLocationCalculationsGroupBaseProperties { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs =================================================================== diff -u -rc78bc8b201c53e91bd6ef0579876cbdcd9dc5b6b -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs (.../DesignWaterLevelCalculationsProperties.cs) (revision c78bc8b201c53e91bd6ef0579876cbdcd9dc5b6b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs (.../DesignWaterLevelCalculationsProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.ComponentModel; using System.Linq; using Core.Common.Base; @@ -31,16 +30,15 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// ViewModel of an enumeration of with + /// ViewModel of a collection of with /// a design water level calculation result for properties panel. /// public class DesignWaterLevelCalculationsProperties : HydraulicBoundaryLocationCalculationsProperties { + /// /// /// Creates a new instance of . /// - /// The enumeration of hydraulic boundary location calculations to set as data. - /// Thrown when is null. public DesignWaterLevelCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations) : base(hydraulicBoundaryLocationCalculations) {} Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationBaseProperties.cs =================================================================== diff -u -rbb29d09db7cda2fbce4c36d2d544f5ef74c7c103 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationBaseProperties.cs (.../HydraulicBoundaryLocationCalculationBaseProperties.cs) (revision bb29d09db7cda2fbce4c36d2d544f5ef74c7c103) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationBaseProperties.cs (.../HydraulicBoundaryLocationCalculationBaseProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -37,7 +37,7 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// Base viewmodel of for properties panel. + /// Base ViewModel of for properties panel. /// [TypeConverter(typeof(ExpandableObjectConverter))] public abstract class HydraulicBoundaryLocationCalculationBaseProperties : ObjectProperties Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs =================================================================== diff -u -rbb29d09db7cda2fbce4c36d2d544f5ef74c7c103 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs (.../HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs) (revision bb29d09db7cda2fbce4c36d2d544f5ef74c7c103) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs (.../HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -28,7 +28,7 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// Base viewmodel of an enumeration of with calculations per category boundary for properties panel. + /// Base ViewModel of a collection of with calculations per category boundary for properties panel. /// public abstract class HydraulicBoundaryLocationCalculationsGroupBaseProperties : ObjectProperties> { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs =================================================================== diff -u -r934f5e201c55b7bf13f970ec2d2e1eca635006f6 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs (.../HydraulicBoundaryLocationCalculationsProperties.cs) (revision 934f5e201c55b7bf13f970ec2d2e1eca635006f6) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs (.../HydraulicBoundaryLocationCalculationsProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -27,7 +27,7 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// ViewModel of an enumeration of for properties panel. + /// ViewModel of a collection of for properties panel. /// public abstract class HydraulicBoundaryLocationCalculationsProperties : ObjectProperties>, IDisposable { @@ -36,7 +36,7 @@ /// /// Creates a new instance of . /// - /// The enumeration of hydraulic boundary location calculations to set as data. + /// The collection of hydraulic boundary location calculations to set as data. /// Thrown when is null. protected HydraulicBoundaryLocationCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations) { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationOutputProperties.cs =================================================================== diff -u -r6200b56b8a269fc956bb09a102d2f9165fb7dd3d -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationOutputProperties.cs (.../WaveHeightCalculationOutputProperties.cs) (revision 6200b56b8a269fc956bb09a102d2f9165fb7dd3d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationOutputProperties.cs (.../WaveHeightCalculationOutputProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Core.Common.Base.Data; using Core.Common.Util.Attributes; using Ringtoets.Common.Data.Hydraulics; @@ -28,19 +27,17 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// ViewModel of with wave height for properties panel + /// ViewModel of a with wave height results for properties panel /// showing only output. /// public class WaveHeightCalculationOutputProperties : HydraulicBoundaryLocationCalculationOutputProperties { + /// /// /// Creates a new instance of . /// - /// The hydraulic boundary location calculation. - /// The name of the category boundary this calculation belongs to. - /// Thrown when is null. public WaveHeightCalculationOutputProperties(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation, - string categoryBoundaryName) + string categoryBoundaryName) : base(hydraulicBoundaryLocationCalculation, categoryBoundaryName) {} [ResourcesDisplayName(typeof(Resources), nameof(Resources.WaveHeightCalculation_Result_DisplayName))] Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationsGroupProperties.cs =================================================================== diff -u -rbb29d09db7cda2fbce4c36d2d544f5ef74c7c103 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationsGroupProperties.cs (.../WaveHeightCalculationsGroupProperties.cs) (revision bb29d09db7cda2fbce4c36d2d544f5ef74c7c103) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationsGroupProperties.cs (.../WaveHeightCalculationsGroupProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -31,7 +31,7 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// ViewModel of an enumeration of with wave height results for properties panel. + /// ViewModel of a collection of with wave height calculations for properties panel. /// public class WaveHeightCalculationsGroupProperties : HydraulicBoundaryLocationCalculationsGroupBaseProperties { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs =================================================================== diff -u -rc78bc8b201c53e91bd6ef0579876cbdcd9dc5b6b -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs (.../WaveHeightCalculationsProperties.cs) (revision c78bc8b201c53e91bd6ef0579876cbdcd9dc5b6b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs (.../WaveHeightCalculationsProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.ComponentModel; using System.Linq; using Core.Common.Base; @@ -31,16 +30,15 @@ namespace Ringtoets.Common.Forms.PropertyClasses { /// - /// ViewModel of an enumeration of with + /// ViewModel of a collection of with /// a wave height calculation result for properties panel. /// public class WaveHeightCalculationsProperties : HydraulicBoundaryLocationCalculationsProperties { + /// /// /// Creates a new instance of . /// - /// The enumeration of hydraulic boundary location calculations to set as data. - /// Thrown when is null. public WaveHeightCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations) : base(hydraulicBoundaryLocationCalculations) {} Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationOutputPropertiesTest.cs =================================================================== diff -u -r6200b56b8a269fc956bb09a102d2f9165fb7dd3d -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationOutputPropertiesTest.cs (.../WaveHeightCalculationOutputPropertiesTest.cs) (revision 6200b56b8a269fc956bb09a102d2f9165fb7dd3d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationOutputPropertiesTest.cs (.../WaveHeightCalculationOutputPropertiesTest.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -68,7 +68,7 @@ PropertyDescriptor waveHeightProperty = dynamicProperties[waveHeightPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waveHeightProperty, resultCategory, - "Hs [m]", + "Golfhoogte [m]", "Berekende golfhoogte.", true); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs =================================================================== diff -u -r91259c905e8a5a16d7a242bdbe217bda9266b428 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs (.../WaveHeightCalculationPropertiesTest.cs) (revision 91259c905e8a5a16d7a242bdbe217bda9266b428) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs (.../WaveHeightCalculationPropertiesTest.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -68,7 +68,7 @@ PropertyDescriptor waveHeightProperty = dynamicProperties[waveHeightPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waveHeightProperty, resultCategory, - "Hs [m]", + "Golfhoogte [m]", "Berekende golfhoogte.", true); Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsProperties.cs =================================================================== diff -u -r32530951096be4324bbce19ac13b49d2b8fe5e34 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsProperties.cs (.../DuneLocationCalculationsProperties.cs) (revision 32530951096be4324bbce19ac13b49d2b8fe5e34) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsProperties.cs (.../DuneLocationCalculationsProperties.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -32,7 +32,7 @@ namespace Ringtoets.DuneErosion.Forms.PropertyClasses { /// - /// ViewModel of an enumeration of for the properties panel. + /// ViewModel of a collection of for the properties panel. /// public class DuneLocationCalculationsProperties : ObjectProperties>, IDisposable { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj =================================================================== diff -u -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj) (revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -146,10 +146,6 @@ {41B829C1-630F-40B0-8BEE-B1C4C94EC8C4} Ringtoets.GrassCoverErosionOutwards.Forms - - {18E9F7C8-3170-4E9D-8D9F-1378225EED90} - Ringtoets.GrassCoverErosionOutwards.Service - {033ED27D-E806-42B4-9689-8150CFAE1906} Ringtoets.GrassCoverErosionOutwards.Util Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs =================================================================== diff -u -r6d64ec25765e17f16059e15084096fef1dce2672 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs) (revision 6d64ec25765e17f16059e15084096fef1dce2672) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -162,7 +162,7 @@ Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText); var waveHeightColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[waveHeightColumnIndex]; - Assert.AreEqual("Hs [m]", waveHeightColumn.HeaderText); + Assert.AreEqual("Golfhoogte [m]", waveHeightColumn.HeaderText); var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First(); Assert.IsFalse(button.Enabled); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj =================================================================== diff -u -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57 -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -291,11 +291,6 @@ Ringtoets.Integration.Data False - - {28811C4A-6C18-42C1-88B2-A03A3784E2D0} - Ringtoets.Integration.Service - False - Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs =================================================================== diff -u -recb0e5b29e11012efd3944171530d9310e07804a -rf937806272bc4ed4d04ab0de94937057649b9fe6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision ecb0e5b29e11012efd3944171530d9310e07804a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision f937806272bc4ed4d04ab0de94937057649b9fe6) @@ -142,7 +142,7 @@ Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText); var waveHeightColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[waveHeightColumnIndex]; - Assert.AreEqual("Hs [m]", waveHeightColumn.HeaderText); + Assert.AreEqual("Golfhoogte [m]", waveHeightColumn.HeaderText); var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First(); Assert.IsFalse(button.Enabled);