Fisheye: Tag 84afb606e58d67c6342c4f11bf66b042e49f52d6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/CalculateDesignWaterLevelCommandHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/HydraulicBoundaryLocationCalculationCommandHandler.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/HydraulicBoundaryLocationCalculationCommandHandler.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/HydraulicBoundaryLocationCalculationCommandHandler.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,94 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Core.Common.Base.Service;
+using Core.Common.Gui.Forms.ProgressDialog;
+using log4net;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.HydraRing.IO;
+using Ringtoets.Integration.Forms.Properties;
+using Ringtoets.Integration.Service;
+
+namespace Ringtoets.Integration.Forms.Commands
+{
+    /// <summary>
+    /// This class is responsible for calculating the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/>
+    /// and <see cref="HydraulicBoundaryLocation.WaveHeight"/>.
+    /// </summary>
+    public class HydraulicBoundaryLocationCalculationCommandHandler : IHydraulicBoundaryLocationCalculationCommandHandler
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(HydraulicBoundaryLocationCalculationCommandHandler));
+        private readonly IWin32Window viewParent;
+        private readonly IAssessmentSection assessmentSection;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HydraulicBoundaryLocationCalculationCommandHandler"/> class.
+        /// </summary>
+        /// <param name="viewParent">The parent of the view.</param>
+        /// <param name="assessmentSection">The assessment section.</param>
+        public HydraulicBoundaryLocationCalculationCommandHandler(IWin32Window viewParent, IAssessmentSection assessmentSection)
+        {
+            if (viewParent == null)
+            {
+                throw new ArgumentNullException("viewParent");
+            }
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException("assessmentSection");
+            }
+            this.viewParent = viewParent;
+            this.assessmentSection = assessmentSection;
+        }
+
+        public void CalculateDesignWaterLevels(IEnumerable<HydraulicBoundaryLocation> locations)
+        {
+            var activities = locations.Select(hbl => new DesignWaterLevelCalculationActivity(assessmentSection, hbl)).ToArray();
+            RunActivities(activities);
+        }
+
+        public void CalculateWaveHeights(IEnumerable<HydraulicBoundaryLocation> locations)
+        {
+            var activities = locations.Select(hbl => new WaveHeightCalculationActivity(assessmentSection, hbl)).ToArray();
+            RunActivities(activities);
+        }
+
+        private void RunActivities<TActivity>(IList<TActivity> activities) where TActivity : Activity
+        {
+            var hrdFile = assessmentSection.HydraulicBoundaryDatabase.FilePath;
+            var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hrdFile);
+            if (string.IsNullOrEmpty(validationProblem))
+            {
+                ActivityProgressDialogRunner.Run(viewParent, activities);
+
+                assessmentSection.HydraulicBoundaryDatabase.NotifyObservers();
+            }
+            else
+            {
+                log.ErrorFormat(Resources.CalculateHydraulicBoundaryLocation_ContextMenuStrip_Start_calculation_failed_0_, validationProblem);
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 84afb606e58d67c6342c4f11bf66b042e49f52d6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/ICalculateDesignWaterLevelCommandHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/IHydraulicBoundaryLocationCalculationCommandHandler.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/IHydraulicBoundaryLocationCalculationCommandHandler.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/IHydraulicBoundaryLocationCalculationCommandHandler.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Integration.Forms.Commands
+{
+    /// <summary>
+    /// Interface for <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/> and 
+    /// <see cref="HydraulicBoundaryLocation.WaveHeight"/> calculations.
+    /// </summary>
+    public interface IHydraulicBoundaryLocationCalculationCommandHandler
+    {
+        /// <summary>
+        /// Performs the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/> calculation for all <paramref name="locations"/>.
+        /// </summary>
+        /// <param name="locations">The <see cref="HydraulicBoundaryLocation"/> objects to calculate 
+        /// the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/> for.</param>
+        void CalculateDesignWaterLevels(IEnumerable<HydraulicBoundaryLocation> locations);
+
+        /// <summary>
+        /// Performs the <see cref="HydraulicBoundaryLocation.WaveHeight"/> calculation for all <paramref name="locations"/>.
+        /// </summary>
+        /// <param name="locations">The <see cref="HydraulicBoundaryLocation"/> objects to calculate 
+        /// the <see cref="HydraulicBoundaryLocation.WaveHeight"/> for.</param>
+        void CalculateWaveHeights(IEnumerable<HydraulicBoundaryLocation> locations);
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r6de162f9e652176605480f16f131ae9a14fbe05f -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6de162f9e652176605480f16f131ae9a14fbe05f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -295,15 +316,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Berekenen.
-        /// </summary>
-        public static string DesignWaterLevelLocationContextRow_Calculate {
-            get {
-                return ResourceManager.GetString("DesignWaterLevelLocationContextRow_Calculate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Toetspeilen.
         /// </summary>
         public static string DesignWaterLevelLocationsContext_DisplayName {
@@ -552,6 +564,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Berekenen.
+        /// </summary>
+        public static string HydraulicBoundaryLocationsView_Calculate {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryLocationsView_Calculate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap Map {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r6de162f9e652176605480f16f131ae9a14fbe05f -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 6de162f9e652176605480f16f131ae9a14fbe05f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -318,7 +318,7 @@
   <data name="HydraulicBoundaryDatabase_Convergence_WaveHeight_Description" xml:space="preserve">
     <value>Convergentie status van de golfhoogte berekening.</value>
   </data>
-  <data name="DesignWaterLevelLocationContextRow_Calculate" xml:space="preserve">
+  <data name="HydraulicBoundaryLocationsView_Calculate" xml:space="preserve">
     <value>Berekenen</value>
   </data>
   <data name="CalculateHydraulicBoundaryLocation_ContextMenuStrip_Start_calculation_failed_0_" xml:space="preserve">
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -48,9 +48,9 @@
     </Compile>
     <Compile Include="Commands\AddAssessmentSectionCommand.cs" />
     <Compile Include="Commands\AssessmentSectionFromFileCommandHandler.cs" />
-    <Compile Include="Commands\CalculateDesignWaterLevelCommandHandler.cs" />
+    <Compile Include="Commands\HydraulicBoundaryLocationCalculationCommandHandler.cs" />
     <Compile Include="Commands\IAssessmentSectionFromFileCommandHandler.cs" />
-    <Compile Include="Commands\ICalculateDesignWaterLevelCommandHandler.cs" />
+    <Compile Include="Commands\IHydraulicBoundaryLocationCalculationCommandHandler.cs" />
     <Compile Include="PresentationObjects\DesignWaterLevelLocationContext.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryLocationContext.cs" />
     <Compile Include="PresentationObjects\DesignWaterLevelLocationsContext.cs" />
@@ -101,6 +101,7 @@
     <Compile Include="Views\DesignWaterLevelLocationsView.Designer.cs">
       <DependentUpon>DesignWaterLevelLocationsView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Views\HydraulicBoundaryLocationContextRow.cs" />
     <Compile Include="Views\SectionResultRows\FailureMechanismSectionResultRow.cs" />
     <Compile Include="Views\SectionResultRows\ClosingStructureSectionResultRow.cs" />
     <Compile Include="Views\SectionResultRows\DuneErosionSectionResultRow.cs" />
@@ -162,6 +163,13 @@
     <Compile Include="Views\SectionResultViews\WaveImpactAsphaltCoverResultView.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Views\WaveHeightLocationContextRow.cs" />
+    <Compile Include="Views\WaveHeightLocationsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\WaveHeightLocationsView.Designer.cs">
+      <DependentUpon>WaveHeightLocationsView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -273,6 +281,9 @@
       <DependentUpon>DesignWaterLevelLocationsView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Views\WaveHeightLocationsView.resx">
+      <DependentUpon>WaveHeightLocationsView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationContextRow.cs
===================================================================
diff -u -r5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54 -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationContextRow.cs	(.../DesignWaterLevelLocationContextRow.cs)	(revision 5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationContextRow.cs	(.../DesignWaterLevelLocationContextRow.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -22,93 +22,35 @@
 using System;
 using System.ComponentModel;
 using Core.Common.Base.Data;
-using Core.Common.Base.Geometry;
 using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.Views
 {
     /// <summary>
     /// This class represents a row of <see cref="DesignWaterLevelLocationContext"/>.
     /// </summary>
-    internal class DesignWaterLevelLocationContextRow
+    internal class DesignWaterLevelLocationContextRow : HydraulicBoundaryLocationContextRow
     {
-        private readonly DesignWaterLevelLocationContext designWaterLevelLocationContext;
-
         /// <summary>
         /// Creates a new instance of <see cref="DesignWaterLevelLocationContextRow"/>.
         /// </summary>
-        /// <param name="designWaterLevelLocationContext">The <see cref="DesignWaterLevelLocationContext"/> for this row.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="designWaterLevelLocationContext"/> is <c>null</c>.</exception>
-        internal DesignWaterLevelLocationContextRow(DesignWaterLevelLocationContext designWaterLevelLocationContext)
-        {
-            if (designWaterLevelLocationContext == null)
-            {
-                throw new ArgumentNullException("designWaterLevelLocationContext");
-            }
+        /// <param name="hydraulicBoundaryLocationContext">The <see cref="DesignWaterLevelLocationContext"/> for this row.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationContext"/> is <c>null</c>.</exception>
+        internal DesignWaterLevelLocationContextRow(DesignWaterLevelLocationContext hydraulicBoundaryLocationContext)
+            : base(hydraulicBoundaryLocationContext) {}
 
-            this.designWaterLevelLocationContext = designWaterLevelLocationContext;
-        }
-
         /// <summary>
-        /// Gets or sets whether the <see cref="DesignWaterLevelLocationContextRow"/> is set to be calculated.
+        /// Gets the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/>.
         /// </summary>
-        public bool ToCalculate { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="Ringtoets.HydraRing.Data.HydraulicBoundaryLocation.Name"/>.
-        /// </summary>
-        public string Name
-        {
-            get
-            {
-                return designWaterLevelLocationContext.HydraulicBoundaryLocation.Name;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Ringtoets.HydraRing.Data.HydraulicBoundaryLocation.Id"/>.
-        /// </summary>
-        public long Id
-        {
-            get
-            {
-                return designWaterLevelLocationContext.HydraulicBoundaryLocation.Id;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Ringtoets.HydraRing.Data.HydraulicBoundaryLocation.Location"/>.
-        /// </summary>
-        public Point2D Location
-        {
-            get
-            {
-                return designWaterLevelLocationContext.HydraulicBoundaryLocation.Location;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Ringtoets.HydraRing.Data.HydraulicBoundaryLocation.DesignWaterLevel"/>.
-        /// </summary>
         [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
         public RoundedDouble DesignWaterLevel
         {
             get
             {
-                return new RoundedDouble(2, designWaterLevelLocationContext.HydraulicBoundaryLocation.DesignWaterLevel);
+                return HydraulicBoundaryLocationContext.HydraulicBoundaryLocation.DesignWaterLevel;
             }
         }
-
-        /// <summary>
-        /// Gets the <see cref="Ringtoets.HydraRing.Data.HydraulicBoundaryLocation"/>.
-        /// </summary>
-        public DesignWaterLevelLocationContext DesignWaterLevelLocationContext
-        {
-            get
-            {
-                return designWaterLevelLocationContext;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -r8351a9c0ff58140e8b0e5e65f7790e210f6d648a -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 8351a9c0ff58140e8b0e5e65f7790e210f6d648a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -64,9 +64,9 @@
         public IApplicationSelection ApplicationSelection { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="ICalculateDesignWaterLevelCommandHandler"/>.
+        /// Gets or sets the <see cref="IHydraulicBoundaryLocationCalculationCommandHandler"/>.
         /// </summary>
-        public ICalculateDesignWaterLevelCommandHandler CalculationCommandHandler { get; set; }
+        public IHydraulicBoundaryLocationCalculationCommandHandler CalculationCommandHandler { get; set; }
 
         public object Data
         {
@@ -114,7 +114,7 @@
             dataGridViewControl.AddCellClickHandler(DataGridViewOnCellClick);
 
             dataGridViewControl.AddCheckBoxColumn(TypeUtils.GetMemberName<DesignWaterLevelLocationContextRow>(row => row.ToCalculate),
-                                                  Resources.DesignWaterLevelLocationContextRow_Calculate);
+                                                  Resources.HydraulicBoundaryLocationsView_Calculate);
             dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<DesignWaterLevelLocationContextRow>(row => row.Name),
                                                  Resources.HydraulicBoundaryDatabase_Locations_Name_DisplayName);
             dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<DesignWaterLevelLocationContextRow>(row => row.Id),
@@ -143,9 +143,9 @@
             return dataGridViewControl.Rows.Cast<DataGridViewRow>().Select(row => (DesignWaterLevelLocationContextRow) row.DataBoundItem);
         }
 
-        private IEnumerable<HydraulicBoundaryLocation> GetSelectedDesignWaterLevelLocationContext()
+        private IEnumerable<HydraulicBoundaryLocation> GetSelectedHydraulicBoundaryLocationContext()
         {
-            return GetDesignWaterLevelLocationContextRows().Where(r => r.ToCalculate).Select(r => r.DesignWaterLevelLocationContext.HydraulicBoundaryLocation);
+            return GetDesignWaterLevelLocationContextRows().Where(r => r.ToCalculate).Select(r => r.HydraulicBoundaryLocationContext.HydraulicBoundaryLocation);
         }
 
         #region Event handling
@@ -184,7 +184,7 @@
                                           : null;
 
             return designWaterLevelRow != null
-                       ? designWaterLevelRow.DesignWaterLevelLocationContext
+                       ? designWaterLevelRow.HydraulicBoundaryLocationContext
                        : null;
         }
 
@@ -206,7 +206,7 @@
             {
                 return;
             }
-            var locations = GetSelectedDesignWaterLevelLocationContext();
+            var locations = GetSelectedHydraulicBoundaryLocationContext();
             CalculationCommandHandler.CalculateDesignWaterLevels(locations);
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/HydraulicBoundaryLocationContextRow.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/HydraulicBoundaryLocationContextRow.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/HydraulicBoundaryLocationContextRow.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,100 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base.Geometry;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.PresentationObjects;
+
+namespace Ringtoets.Integration.Forms.Views
+{
+    /// <summary>
+    /// This class represents a row of <see cref="HydraulicBoundaryLocationContext"/>.
+    /// </summary>
+    internal abstract class HydraulicBoundaryLocationContextRow
+    {
+        private readonly HydraulicBoundaryLocationContext hydraulicBoundaryLocationContext;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="HydraulicBoundaryLocationContextRow"/>.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocationContext">The <see cref="HydraulicBoundaryLocationContext"/> for this row.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationContext"/> is <c>null</c>.</exception>
+        internal HydraulicBoundaryLocationContextRow(HydraulicBoundaryLocationContext hydraulicBoundaryLocationContext)
+        {
+            if (hydraulicBoundaryLocationContext == null)
+            {
+                throw new ArgumentNullException("hydraulicBoundaryLocationContext");
+            }
+
+            this.hydraulicBoundaryLocationContext = hydraulicBoundaryLocationContext;
+        }
+
+        /// <summary>
+        /// Gets or sets whether the <see cref="HydraulicBoundaryLocationContextRow"/> is set to be calculated.
+        /// </summary>
+        public bool ToCalculate { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="HydraulicBoundaryLocation.Name"/>.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return hydraulicBoundaryLocationContext.HydraulicBoundaryLocation.Name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="HydraulicBoundaryLocation.Id"/>.
+        /// </summary>
+        public long Id
+        {
+            get
+            {
+                return hydraulicBoundaryLocationContext.HydraulicBoundaryLocation.Id;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="HydraulicBoundaryLocation.Location"/>.
+        /// </summary>
+        public Point2D Location
+        {
+            get
+            {
+                return hydraulicBoundaryLocationContext.HydraulicBoundaryLocation.Location;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Ringtoets.Integration.Forms.PresentationObjects.HydraulicBoundaryLocationContext"/>.
+        /// </summary>
+        public HydraulicBoundaryLocationContext HydraulicBoundaryLocationContext
+        {
+            get
+            {
+                return hydraulicBoundaryLocationContext;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationContextRow.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationContextRow.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationContextRow.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using Core.Common.Base.Data;
+using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.PresentationObjects;
+
+namespace Ringtoets.Integration.Forms.Views
+{
+    /// <summary>
+    /// This class represents a row of <see cref="HydraulicBoundaryLocationContext"/>.
+    /// </summary>
+    internal class WaveHeightLocationContextRow : HydraulicBoundaryLocationContextRow
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="WaveHeightLocationContextRow"/>.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocationContext">The <see cref="WaveHeightLocationContext"/> for this row.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationContext"/> is <c>null</c>.</exception>
+        internal WaveHeightLocationContextRow(WaveHeightLocationContext hydraulicBoundaryLocationContext)
+            : base(hydraulicBoundaryLocationContext) {}
+
+        /// <summary>
+        /// Gets the <see cref="HydraulicBoundaryLocation.WaveHeight"/>.
+        /// </summary>
+        [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
+        public RoundedDouble WaveHeight
+        {
+            get
+            {
+                return HydraulicBoundaryLocationContext.HydraulicBoundaryLocation.WaveHeight;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.Designer.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.Designer.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.Designer.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,142 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.Integration.Forms.Views
+{
+    partial class WaveHeightLocationsView
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl();
+            this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
+            this.ButtonGroupBox = new System.Windows.Forms.GroupBox();
+            this.CalculateForSelectedButton = new System.Windows.Forms.Button();
+            this.DeselectAllButton = new System.Windows.Forms.Button();
+            this.SelectAllButton = new System.Windows.Forms.Button();
+            this.tableLayoutPanel.SuspendLayout();
+            this.ButtonGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // dataGridViewControl
+            // 
+            this.dataGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridViewControl.Location = new System.Drawing.Point(3, 3);
+            this.dataGridViewControl.MultiSelect = true;
+            this.dataGridViewControl.Name = "dataGridViewControl";
+            this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
+            this.dataGridViewControl.Size = new System.Drawing.Size(529, 264);
+            this.dataGridViewControl.TabIndex = 0;
+            // 
+            // tableLayoutPanel
+            // 
+            this.tableLayoutPanel.ColumnCount = 1;
+            this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel.Controls.Add(this.dataGridViewControl, 0, 0);
+            this.tableLayoutPanel.Controls.Add(this.ButtonGroupBox, 0, 1);
+            this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel.Name = "tableLayoutPanel";
+            this.tableLayoutPanel.RowCount = 2;
+            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel.Size = new System.Drawing.Size(535, 329);
+            this.tableLayoutPanel.TabIndex = 2;
+            // 
+            // ButtonGroupBox
+            // 
+            this.ButtonGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonGroupBox.Controls.Add(this.CalculateForSelectedButton);
+            this.ButtonGroupBox.Controls.Add(this.DeselectAllButton);
+            this.ButtonGroupBox.Controls.Add(this.SelectAllButton);
+            this.ButtonGroupBox.Location = new System.Drawing.Point(3, 275);
+            this.ButtonGroupBox.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.ButtonGroupBox.Name = "ButtonGroupBox";
+            this.ButtonGroupBox.Size = new System.Drawing.Size(529, 51);
+            this.ButtonGroupBox.TabIndex = 1;
+            this.ButtonGroupBox.TabStop = false;
+            this.ButtonGroupBox.Text = "Toetspeilen berekenen";
+            // 
+            // CalculateForSelectedButton
+            // 
+            this.CalculateForSelectedButton.Location = new System.Drawing.Point(227, 19);
+            this.CalculateForSelectedButton.Name = "CalculateForSelectedButton";
+            this.CalculateForSelectedButton.Size = new System.Drawing.Size(207, 23);
+            this.CalculateForSelectedButton.TabIndex = 2;
+            this.CalculateForSelectedButton.Text = "Bereken voor geselecteerde locaties";
+            this.CalculateForSelectedButton.UseVisualStyleBackColor = true;
+            this.CalculateForSelectedButton.Click += new System.EventHandler(this.CalculateForSelectedButton_Click);
+            // 
+            // DeselectAllButton
+            // 
+            this.DeselectAllButton.Location = new System.Drawing.Point(110, 19);
+            this.DeselectAllButton.Name = "DeselectAllButton";
+            this.DeselectAllButton.Size = new System.Drawing.Size(111, 23);
+            this.DeselectAllButton.TabIndex = 1;
+            this.DeselectAllButton.Text = "Deselecteer alles";
+            this.DeselectAllButton.UseVisualStyleBackColor = true;
+            this.DeselectAllButton.Click += new System.EventHandler(this.DeselectAllButton_Click);
+            // 
+            // SelectAllButton
+            // 
+            this.SelectAllButton.Location = new System.Drawing.Point(6, 19);
+            this.SelectAllButton.Name = "SelectAllButton";
+            this.SelectAllButton.Size = new System.Drawing.Size(98, 23);
+            this.SelectAllButton.TabIndex = 0;
+            this.SelectAllButton.Text = "Selecteer alles";
+            this.SelectAllButton.UseVisualStyleBackColor = true;
+            this.SelectAllButton.Click += new System.EventHandler(this.SelectAllButton_Click);
+            // 
+            // WaveHeightLocationsView
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.tableLayoutPanel);
+            this.Name = "WaveHeightLocationsView";
+            this.Size = new System.Drawing.Size(535, 329);
+            this.tableLayoutPanel.ResumeLayout(false);
+            this.ButtonGroupBox.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
+        private System.Windows.Forms.GroupBox ButtonGroupBox;
+        private System.Windows.Forms.Button CalculateForSelectedButton;
+        private System.Windows.Forms.Button DeselectAllButton;
+        private System.Windows.Forms.Button SelectAllButton;
+    }
+}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,215 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Core.Common.Base;
+using Core.Common.Controls.Views;
+using Core.Common.Gui.Selection;
+using Core.Common.Utils.Extensions;
+using Core.Common.Utils.Reflection;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.Properties;
+
+namespace Ringtoets.Integration.Forms.Views
+{
+    /// <summary>
+    /// View for the <see cref="HydraulicBoundaryLocation"/> with <see cref="HydraulicBoundaryLocation.WaveHeight"/>.
+    /// </summary>
+    public partial class WaveHeightLocationsView : UserControl, ISelectionProvider
+    {
+        private readonly Observer assessmentSectionObserver;
+        private readonly Observer hydraulicBoundaryDatabaseObserver;
+        private IAssessmentSection assessmentSection;
+        private bool updatingDataSource;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="WaveHeightLocationsView"/>.
+        /// </summary>
+        public WaveHeightLocationsView()
+        {
+            InitializeComponent();
+            InitializeDataGridView();
+
+            assessmentSectionObserver = new Observer(UpdateDataGridViewDataSource);
+            hydraulicBoundaryDatabaseObserver = new Observer(() => dataGridViewControl.RefreshDataGridView());
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IApplicationSelection"/>.
+        /// </summary>
+        public IApplicationSelection ApplicationSelection { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IHydraulicBoundaryLocationCalculationCommandHandler"/>.
+        /// </summary>
+        public IHydraulicBoundaryLocationCalculationCommandHandler CalculationCommandHandler { get; set; }
+
+        public object Data
+        {
+            get
+            {
+                return assessmentSection;
+            }
+            set
+            {
+                assessmentSection = value as IAssessmentSection;
+
+                UpdateDataGridViewDataSource();
+                assessmentSectionObserver.Observable = assessmentSection;
+            }
+        }
+
+        public object Selection
+        {
+            get
+            {
+                return CreateSelectedItemFromCurrentRow();
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            assessmentSectionObserver.Dispose();
+            hydraulicBoundaryDatabaseObserver.Dispose();
+
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void SetHydraulicBoundaryDatabaseObserver()
+        {
+            hydraulicBoundaryDatabaseObserver.Observable = assessmentSection != null ? assessmentSection.HydraulicBoundaryDatabase : null;
+        }
+
+        private void InitializeDataGridView()
+        {
+            dataGridViewControl.AddCellClickHandler(DataGridViewOnCellClick);
+
+            dataGridViewControl.AddCheckBoxColumn(TypeUtils.GetMemberName<WaveHeightLocationContextRow>(row => row.ToCalculate),
+                                                  Resources.HydraulicBoundaryLocationsView_Calculate);
+            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<WaveHeightLocationContextRow>(row => row.Name),
+                                                 Resources.HydraulicBoundaryDatabase_Locations_Name_DisplayName);
+            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<WaveHeightLocationContextRow>(row => row.Id),
+                                                 Resources.HydraulicBoundaryDatabase_Locations_Id_DisplayName);
+            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<WaveHeightLocationContextRow>(row => row.Location),
+                                                 Resources.HydraulicBoundaryDatabase_Locations_Coordinates_DisplayName);
+            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<WaveHeightLocationContextRow>(row => row.WaveHeight),
+                                                 Resources.HydraulicBoundaryDatabase_Locations_WaveHeight_DisplayName);
+        }
+
+        private void UpdateDataGridViewDataSource()
+        {
+            SetHydraulicBoundaryDatabaseObserver();
+
+            updatingDataSource = true;
+            dataGridViewControl.SetDataSource(assessmentSection != null && assessmentSection.HydraulicBoundaryDatabase != null
+                                                  ? assessmentSection.HydraulicBoundaryDatabase.Locations.Select(
+                                                      hl => new WaveHeightLocationContextRow(
+                                                                new WaveHeightLocationContext(assessmentSection.HydraulicBoundaryDatabase, hl))).ToArray()
+                                                  : null);
+            updatingDataSource = false;
+        }
+
+        private IEnumerable<WaveHeightLocationContextRow> GetWaveHeightLocationContextRows()
+        {
+            return dataGridViewControl.Rows.Cast<DataGridViewRow>().Select(row => (WaveHeightLocationContextRow) row.DataBoundItem);
+        }
+
+        private IEnumerable<HydraulicBoundaryLocation> GetSelectedHydraulicBoundaryLocationContext()
+        {
+            return GetWaveHeightLocationContextRows().Where(r => r.ToCalculate).Select(r => r.HydraulicBoundaryLocationContext.HydraulicBoundaryLocation);
+        }
+
+        #region Event handling
+
+        private void DataGridViewOnCellClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (updatingDataSource)
+            {
+                return;
+            }
+
+            UpdateApplicationSelection();
+        }
+
+        private void UpdateApplicationSelection()
+        {
+            if (ApplicationSelection == null)
+            {
+                return;
+            }
+
+            HydraulicBoundaryLocationContext selection = CreateSelectedItemFromCurrentRow();
+            if ((ApplicationSelection.Selection == null && selection != null) ||
+                (ApplicationSelection.Selection != null && !ReferenceEquals(selection, ApplicationSelection.Selection)))
+            {
+                ApplicationSelection.Selection = selection;
+            }
+        }
+
+        private HydraulicBoundaryLocationContext CreateSelectedItemFromCurrentRow()
+        {
+            var currentRow = dataGridViewControl.CurrentRow;
+
+            var waterLevelRow = currentRow != null
+                                    ? (WaveHeightLocationContextRow) currentRow.DataBoundItem
+                                    : null;
+
+            return waterLevelRow != null
+                       ? waterLevelRow.HydraulicBoundaryLocationContext
+                       : null;
+        }
+
+        private void SelectAllButton_Click(object sender, EventArgs e)
+        {
+            GetWaveHeightLocationContextRows().ForEachElementDo(row => row.ToCalculate = true);
+            dataGridViewControl.RefreshDataGridView();
+        }
+
+        private void DeselectAllButton_Click(object sender, EventArgs e)
+        {
+            GetWaveHeightLocationContextRows().ForEachElementDo(row => row.ToCalculate = false);
+            dataGridViewControl.RefreshDataGridView();
+        }
+
+        private void CalculateForSelectedButton_Click(object sender, EventArgs e)
+        {
+            if (CalculationCommandHandler == null)
+            {
+                return;
+            }
+            var locations = GetSelectedHydraulicBoundaryLocationContext();
+            CalculationCommandHandler.CalculateWaveHeights(locations);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.resx
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.resx	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.resx	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/packages.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/packages.config	(.../packages.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/packages.config	(.../packages.config)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -r6de162f9e652176605480f16f131ae9a14fbe05f -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 6de162f9e652176605480f16f131ae9a14fbe05f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -139,11 +139,6 @@
       <Name>Ringtoets.HeightStructures.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
-      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
-      <Name>Ringtoets.HydraRing.Calculation</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
       <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
       <Name>Ringtoets.HydraRing.Data</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r6de162f9e652176605480f16f131ae9a14fbe05f -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 6de162f9e652176605480f16f131ae9a14fbe05f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -32,7 +32,6 @@
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms;
-using Core.Common.Gui.Forms.ProgressDialog;
 using Core.Common.Gui.Plugin;
 using Core.Common.IO.Exceptions;
 using Core.Common.Utils.Extensions;
@@ -265,6 +264,7 @@
             {
                 GetObjectPropertiesData = context => context.WrappedData.HydraulicBoundaryDatabase
             };
+            yield return new PropertyInfo<WaveHeightLocationContext, WaveHeightLocationContextProperties>();
         }
 
         /// <summary>
@@ -293,10 +293,22 @@
                 AfterCreate = (view, context) =>
                 {
                     view.ApplicationSelection = Gui;
-                    view.CalculationCommandHandler = new CalculateDesignWaterLevelCommandHandler(Gui.MainWindow, context.WrappedData);
+                    view.CalculationCommandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(Gui.MainWindow, context.WrappedData);
                 }
             };
 
+            yield return new ViewInfo<WaveHeightLocationsContext, IAssessmentSection, WaveHeightLocationsView>
+            {
+                GetViewName = (v, o) => RingtoetsFormsResources.WaveHeightLocationsContext_DisplayName,
+                GetViewData = context => context.WrappedData,
+                Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
+                AfterCreate = (view, context) =>
+                {
+                    view.ApplicationSelection = Gui;
+                    view.CalculationCommandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(Gui.MainWindow, context.WrappedData);
+                }
+            };
+
             yield return new ViewInfo<IAssessmentSection, AssessmentSectionView>
             {
                 GetViewName = (v, o) => RingtoetsFormsResources.AssessmentSectionMap_DisplayName,
@@ -1034,7 +1046,7 @@
                 RingtoetsCommonFormsResources.FailureMechanismIcon,
                 (sender, args) =>
                 {
-                    var command = new CalculateDesignWaterLevelCommandHandler(Gui.MainWindow, nodeData.WrappedData);
+                    var command = new HydraulicBoundaryLocationCalculationCommandHandler(Gui.MainWindow, nodeData.WrappedData);
                     command.CalculateDesignWaterLevels(nodeData.WrappedData.HydraulicBoundaryDatabase.Locations);
                 });
 
@@ -1060,20 +1072,8 @@
                 RingtoetsCommonFormsResources.FailureMechanismIcon,
                 (sender, args) =>
                 {
-                    var hrdFile = nodeData.WrappedData.HydraulicBoundaryDatabase.FilePath;
-                    var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hrdFile);
-                    if (validationProblem == null)
-                    {
-                        var activities = nodeData.WrappedData.HydraulicBoundaryDatabase.Locations.Select(hbl => new WaveHeightCalculationActivity(nodeData.WrappedData, hbl)).ToArray();
-
-                        ActivityProgressDialogRunner.Run(Gui.MainWindow, activities);
-
-                        nodeData.WrappedData.HydraulicBoundaryDatabase.NotifyObservers();
-                    }
-                    else
-                    {
-                        log.ErrorFormat(Resources.RingtoetsPlugin_HydraulicBoundaryDatabaseContextMenuStrip_Start_calculation_failed_0_, validationProblem);
-                    }
+                    var command = new HydraulicBoundaryLocationCalculationCommandHandler(Gui.MainWindow, nodeData.WrappedData);
+                    command.CalculateWaveHeights(nodeData.WrappedData.HydraulicBoundaryDatabase.Locations);
                 });
 
             if (nodeData.WrappedData.HydraulicBoundaryDatabase == null)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/packages.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/packages.config	(.../packages.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/packages.config	(.../packages.config)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Fisheye: Tag 84afb606e58d67c6342c4f11bf66b042e49f52d6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/CalculateDesignWaterLevelCommandHandlerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/HydraulicBoundaryLocationCommandHandlerTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/HydraulicBoundaryLocationCommandHandlerTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/HydraulicBoundaryLocationCommandHandlerTest.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,336 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using Core.Common.Base;
+using Core.Common.TestUtil;
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.Commands;
+
+namespace Ringtoets.Integration.Forms.Test.Commands
+{
+    [TestFixture]
+    public class HydraulicBoundaryLocationCommandHandlerTest : NUnitFormTest
+    {
+        private MockRepository mockRepository;
+        private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockRepository = new MockRepository();
+        }
+
+        [Test]
+        public void Constructor_NullMainWindow_ThrowsArgumentNullException()
+        {
+            // Setup
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            // Call
+            TestDelegate test = () => new HydraulicBoundaryLocationCalculationCommandHandler(null, assessmentSectionMock);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            const string expectedParamName = "viewParent";
+            Assert.AreEqual(expectedParamName, paramName);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Constructor_NullIAssessmentSection_ThrowsArgumentNullException()
+        {
+            // Setup & Call
+            TestDelegate test = () => new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            const string expectedParamName = "assessmentSection";
+            Assert.AreEqual(expectedParamName, paramName);
+        }
+
+        [Test]
+        public void DefaultConstructor_DefaultValues()
+        {
+            // Setup
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            // Call
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+
+            // Assert
+            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationCommandHandler>(commandHandler);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateDesignWaterLevels_HydraulicDatabaseDoesNotExist_LogsErrorAndDoesNotNotifyObservers()
+        {
+            // Setup
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = "Does not exist"
+            };
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Any();
+
+            var observerMock = mockRepository.StrictMock<IObserver>();
+            mockRepository.ReplayAll();
+
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
+
+            hydraulicBoundaryDatabase.Attach(observerMock);
+
+            // Call
+            Action call = () => commandHandler.CalculateDesignWaterLevels(locations);
+
+            // Assert
+            TestHelper.AssertLogMessages(call, messages =>
+            {
+                var msgs = messages.ToArray();
+                Assert.AreEqual(1, msgs.Length);
+                StringAssert.StartsWith("Berekeningen konden niet worden gestart. ", msgs.First());
+            });
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateDesignWaterLevels_ValidPathEmptyList_NotifyObserversButNoLog()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath
+            };
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Any();
+
+            var observerMock = mockRepository.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+            mockRepository.ReplayAll();
+
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
+
+            hydraulicBoundaryDatabase.Attach(observerMock);
+
+            DialogBoxHandler = (name, wnd) =>
+            {
+                // Expect an activity dialog which is automatically closed
+            };
+
+            // Call
+            Action call = () => commandHandler.CalculateDesignWaterLevels(locations);
+
+            // Assert
+            TestHelper.AssertLogMessagesCount(call, 0);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateDesignWaterLevels_ValidPathOneLocationInTheList_NotifyObserversAndLogsMessages()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath
+            };
+
+            var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1.0, 1);
+
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Expect(asm => asm.Id).Return(null);
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.AtLeastOnce();
+            assessmentSectionMock.Expect(asm => asm.FailureMechanismContribution).Return(failureMechanismContribution);
+
+            var observerMock = mockRepository.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+            mockRepository.ReplayAll();
+
+            const string hydraulicLocationName = "name";
+            var locations = new List<HydraulicBoundaryLocation>
+            {
+                new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3)
+            };
+
+            hydraulicBoundaryDatabase.Attach(observerMock);
+
+            DialogBoxHandler = (name, wnd) =>
+            {
+                // Expect an activity dialog which is automatically closed
+            };
+
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+
+            // Call
+            Action call = () => commandHandler.CalculateDesignWaterLevels(locations);
+
+            // Assert
+            TestHelper.AssertLogMessages(call, messages =>
+            {
+                var msgs = messages.ToArray();
+                Assert.AreEqual(6, msgs.Length);
+                string expectedName = string.Format("Toetspeil voor locatie {0}", hydraulicLocationName);
+                StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", expectedName), msgs.First());
+                StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", expectedName), msgs.Skip(1).First());
+                StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", expectedName), msgs.Skip(2).First());
+                StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", expectedName), msgs.Skip(3).First());
+                StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", expectedName), msgs.Last());
+            });
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateWaveHeight_HydraulicDatabaseDoesNotExist_LogsErrorAndDoesNotNotifyObservers()
+        {
+            // Setup
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = "Does not exist"
+            };
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Any();
+
+            var observerMock = mockRepository.StrictMock<IObserver>();
+            mockRepository.ReplayAll();
+
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
+
+            hydraulicBoundaryDatabase.Attach(observerMock);
+
+            // Call
+            Action call = () => commandHandler.CalculateWaveHeights(locations);
+
+            // Assert
+            TestHelper.AssertLogMessages(call, messages =>
+            {
+                var msgs = messages.ToArray();
+                Assert.AreEqual(1, msgs.Length);
+                StringAssert.StartsWith("Berekeningen konden niet worden gestart. ", msgs.First());
+            });
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateWaveHeights_ValidPathEmptyList_NotifyObserversButNoLog()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath
+            };
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Any();
+
+            var observerMock = mockRepository.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+            mockRepository.ReplayAll();
+
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
+
+            hydraulicBoundaryDatabase.Attach(observerMock);
+
+            DialogBoxHandler = (name, wnd) =>
+            {
+                // Expect an activity dialog which is automatically closed
+            };
+
+            // Call
+            Action call = () => commandHandler.CalculateWaveHeights(locations);
+
+            // Assert
+            TestHelper.AssertLogMessagesCount(call, 0);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateWaveHeights_ValidPathOneLocationInTheList_NotifyObserversAndLogsMessages()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath
+            };
+
+            var failureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1.0, 1);
+
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Expect(asm => asm.Id).Return(null);
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.AtLeastOnce();
+            assessmentSectionMock.Expect(asm => asm.FailureMechanismContribution).Return(failureMechanismContribution);
+
+            var observerMock = mockRepository.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+            mockRepository.ReplayAll();
+
+            const string hydraulicLocationName = "name";
+            var locations = new List<HydraulicBoundaryLocation>
+            {
+                new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3)
+            };
+
+            hydraulicBoundaryDatabase.Attach(observerMock);
+
+            DialogBoxHandler = (name, wnd) =>
+            {
+                // Expect an activity dialog which is automatically closed
+            };
+
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+
+            // Call
+            Action call = () => commandHandler.CalculateWaveHeights(locations);
+
+            // Assert
+            TestHelper.AssertLogMessages(call, messages =>
+            {
+                var msgs = messages.ToArray();
+                Assert.AreEqual(6, msgs.Length);
+                string expectedName = string.Format("Golfhoogte voor locatie {0}", hydraulicLocationName);
+                StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", expectedName), msgs.First());
+                StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", expectedName), msgs.Skip(1).First());
+                StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", expectedName), msgs.Skip(2).First());
+                StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", expectedName), msgs.Skip(3).First());
+                StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", expectedName), msgs.Last());
+            });
+            mockRepository.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision f1bf048f691ca575f22e8807911ace0338fa425d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -67,7 +67,7 @@
     </Compile>
     <Compile Include="Commands\AddAssessmentSectionCommandTest.cs" />
     <Compile Include="Commands\AssessmentSectionFromFileCommandHandlerTest.cs" />
-    <Compile Include="Commands\CalculateDesignWaterLevelCommandHandlerTest.cs" />
+    <Compile Include="Commands\HydraulicBoundaryLocationCommandHandlerTest.cs" />
     <Compile Include="ExportInfos\HydraulicBoundaryDatabaseContextExportInfoTest.cs" />
     <Compile Include="ExportInfos\ReferenceLineContextExportInfoTest.cs" />
     <Compile Include="FailureMechanismContributionViewIntegrationTest.cs" />
@@ -123,6 +123,7 @@
     <Compile Include="Views\FailureMechanismContributionItemRowTest.cs" />
     <Compile Include="Views\DesignWaterLevelLocationContextRowTest.cs" />
     <Compile Include="Views\DesignWaterLevelLocationsViewTest.cs" />
+    <Compile Include="Views\HydraulicBoundaryLocationContextRowTest.cs" />
     <Compile Include="Views\SectionResultRows\FailureMechanismSectionResultRowTest.cs" />
     <Compile Include="Views\SectionResultViews\ClosingStructureResultViewTest.cs" />
     <Compile Include="Views\SectionResultViews\DuneErosionResultViewTest.cs" />
@@ -156,6 +157,8 @@
     <Compile Include="Views\FailureMechanismContributionViewTest.cs" />
     <Compile Include="Views\SectionResultRows\StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs" />
     <Compile Include="Views\SectionResultRows\DuneErosionSectionResultRowTest.cs" />
+    <Compile Include="Views\WaveHeightLocationContextRowTest.cs" />
+    <Compile Include="Views\WaveHeightLocationsViewTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -27,6 +27,7 @@
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
+using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
@@ -279,11 +280,11 @@
 
             var contextMenuRunWaveHeightCalculationsIndex = 0;
 
-            RoundedDouble designWaterLevel = (RoundedDouble) 4.2;
+            RoundedDouble waveHeight = (RoundedDouble) 4.2;
             var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(100001, "", 1.1, 2.2);
             var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(100002, "", 3.3, 4.4)
             {
-                WaveHeight = designWaterLevel
+                WaveHeight = waveHeight
             };
 
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
@@ -305,7 +306,8 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
 
                 mockRepository.ReplayAll();
 
@@ -327,7 +329,7 @@
                     Assert.IsNaN(hydraulicBoundaryLocation1.WaveHeight); // No result set
 
                     // Previous result not cleared
-                    Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation2.WaveHeight, hydraulicBoundaryLocation2.WaveHeight.GetAccuracy());
+                    Assert.AreEqual(waveHeight, hydraulicBoundaryLocation2.WaveHeight, hydraulicBoundaryLocation2.WaveHeight.GetAccuracy());
                 }
             }
             mockRepository.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationContextRowTest.cs
===================================================================
diff -u -r5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54 -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationContextRowTest.cs	(.../DesignWaterLevelLocationContextRowTest.cs)	(revision 5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationContextRowTest.cs	(.../DesignWaterLevelLocationContextRowTest.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -36,18 +36,18 @@
     public class DesignWaterLevelLocationContextRowTest
     {
         [Test]
-        public void Constructor_WithoutHydraulicBoundaryLocation_ThrowsArgumentNullException()
+        public void Constructor_WithoutDesignWaterLevelLocationContext_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate test = () => new DesignWaterLevelLocationContextRow(null);
 
             // Assert
             var paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("designWaterLevelLocationContext", paramName);
+            Assert.AreEqual("hydraulicBoundaryLocationContext", paramName);
         }
 
         [Test]
-        public void Constructor_WithHydraulicBoundaryLocation_PropertiesFromHydraulicBoundaryLocation()
+        public void Constructor_WithDesignWaterLevelLocationContext_PropertiesFromHydraulicBoundaryLocation()
         {
             // Setup
             const int id = 1;
@@ -68,12 +68,13 @@
             var row = new DesignWaterLevelLocationContextRow(context);
 
             // Assert
+            Assert.IsInstanceOf<HydraulicBoundaryLocationContextRow>(row);
             Assert.AreEqual(id, row.Id);
             Assert.AreEqual(locationname, row.Name);
             Assert.AreEqual(designWaterLevel, row.DesignWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
             var expectedPoint2D = new Point2D(coordinateX, coordinateY);
             Assert.AreEqual(expectedPoint2D, row.Location);
-            Assert.AreSame(context, row.DesignWaterLevelLocationContext);
+            Assert.AreSame(context, row.HydraulicBoundaryLocationContext);
             Assert.IsFalse(row.ToCalculate);
             Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationContextRow,
                               NoValueRoundedDoubleConverter>(r => r.DesignWaterLevel));
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -362,7 +362,7 @@
             DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
 
             var mockRepository = new MockRepository();
-            var commandHandlerMock = mockRepository.StrictMock<ICalculateDesignWaterLevelCommandHandler>();
+            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
 
             IEnumerable<HydraulicBoundaryLocation> locations = null;
             commandHandlerMock.Expect(ch => ch.CalculateDesignWaterLevels(null)).IgnoreArguments().WhenCalled(
@@ -391,7 +391,7 @@
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
             var mockRepository = new MockRepository();
-            var commandHandlerMock = mockRepository.StrictMock<ICalculateDesignWaterLevelCommandHandler>();
+            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
 
             IEnumerable<HydraulicBoundaryLocation> locations = null;
             commandHandlerMock.Expect(ch => ch.CalculateDesignWaterLevels(null)).IgnoreArguments().WhenCalled(
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationContextRowTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationContextRowTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationContextRowTest.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,100 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base.Geometry;
+using NUnit.Framework;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.Views;
+
+namespace Ringtoets.Integration.Forms.Test.Views
+{
+    [TestFixture]
+    public class HydraulicBoundaryLocationContextRowTest
+    {
+        [Test]
+        public void Constructor_WithoutHydraulicBoundaryLocationContext_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new TestHydraulicBoundaryLocationContextRow(null);
+
+            // Assert
+            var paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("hydraulicBoundaryLocationContext", paramName);
+        }
+
+        [Test]
+        public void Constructor_WithHydraulicBoundaryLocationContext_PropertiesFromHydraulicBoundaryLocation()
+        {
+            // Setup
+            const int id = 1;
+            const string locationname = "LocationName";
+            const double coordinateX = 1.0;
+            const double coordinateY = 2.0;
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationname, coordinateX, coordinateY);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
+            var context = new TestHydraulicBoundaryLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation);
+
+            // Call
+            var row = new TestHydraulicBoundaryLocationContextRow(context);
+
+            // Assert
+            Assert.AreEqual(id, row.Id);
+            Assert.AreEqual(locationname, row.Name);
+            var expectedPoint2D = new Point2D(coordinateX, coordinateY);
+            Assert.AreEqual(expectedPoint2D, row.Location);
+            Assert.IsFalse(row.ToCalculate);
+        }
+
+        [Test]
+        public void Constructor_Property_SetPropertyAsExpected()
+        {
+            // Setup
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "LocationName", 1.0, 2.0);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
+            var context = new TestHydraulicBoundaryLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation);
+            var row = new TestHydraulicBoundaryLocationContextRow(context);
+
+            // Call
+            row.ToCalculate = true;
+
+            // Assert
+            Assert.IsTrue(row.ToCalculate);
+        }
+
+        private class TestHydraulicBoundaryLocationContext : HydraulicBoundaryLocationContext
+        {
+            public TestHydraulicBoundaryLocationContext(HydraulicBoundaryDatabase wrappedData, HydraulicBoundaryLocation hydraulicBoundaryLocation)
+                : base(wrappedData, hydraulicBoundaryLocation) {}
+        }
+
+        private class TestHydraulicBoundaryLocationContextRow : HydraulicBoundaryLocationContextRow
+        {
+            public TestHydraulicBoundaryLocationContextRow(HydraulicBoundaryLocationContext hydraulicBoundaryLocationContext)
+                : base(hydraulicBoundaryLocationContext) {}
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationContextRowTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationContextRowTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationContextRowTest.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,101 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// 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.Base.Geometry;
+using Core.Common.Utils.Reflection;
+using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.Views;
+
+namespace Ringtoets.Integration.Forms.Test.Views
+{
+    [TestFixture]
+    public class WaveHeightLocationContextRowTest
+    {
+        [Test]
+        public void Constructor_WithoutWaveHeightLocationContext_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new WaveHeightLocationContextRow(null);
+
+            // Assert
+            var paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("hydraulicBoundaryLocationContext", paramName);
+        }
+
+        [Test]
+        public void Constructor_WithWaveHeightLocationContext_PropertiesFromHydraulicBoundaryLocation()
+        {
+            // Setup
+            const int id = 1;
+            const string locationname = "LocationName";
+            const double coordinateX = 1.0;
+            const double coordinateY = 2.0;
+            RoundedDouble waveHeight = (RoundedDouble)3.0;
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationname, coordinateX, coordinateY)
+            {
+                WaveHeight = waveHeight
+            };
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
+            var context = new WaveHeightLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation);
+
+            // Call
+            var row = new WaveHeightLocationContextRow(context);
+
+            // Assert
+            Assert.IsInstanceOf<HydraulicBoundaryLocationContextRow>(row);
+            Assert.AreEqual(id, row.Id);
+            Assert.AreEqual(locationname, row.Name);
+            Assert.AreEqual(waveHeight, row.WaveHeight, hydraulicBoundaryLocation.WaveHeight.GetAccuracy());
+            var expectedPoint2D = new Point2D(coordinateX, coordinateY);
+            Assert.AreEqual(expectedPoint2D, row.Location);
+            Assert.AreSame(context, row.HydraulicBoundaryLocationContext);
+            Assert.IsFalse(row.ToCalculate);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<WaveHeightLocationContextRow,
+                              NoValueRoundedDoubleConverter>(r => r.WaveHeight));
+        }
+
+        [Test]
+        public void Constructor_Property_SetPropertyAsExpected()
+        {
+            // Setup
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "LocationName", 1.0, 2.0);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
+            var context = new WaveHeightLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation);
+            var row = new WaveHeightLocationContextRow(context);
+
+            // Call
+            row.ToCalculate = true;
+
+            // Assert
+            Assert.IsTrue(row.ToCalculate);
+        } 
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,496 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Forms;
+using Core.Common.Base;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Core.Common.Controls.Views;
+using Core.Common.Gui.Selection;
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.Views;
+
+namespace Ringtoets.Integration.Forms.Test.Views
+{
+    [TestFixture]
+    public class WaveHeightLocationsViewTest
+    {
+        private Form testForm;
+
+        [SetUp]
+        public void Setup()
+        {
+            testForm = new Form();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            testForm.Dispose();
+        }
+
+        [Test]
+        public void DefaultConstructor_DefaultValues()
+        {
+            // Call
+            using (var view = new WaveHeightLocationsView())
+            {
+                // Assert
+                Assert.IsInstanceOf<UserControl>(view);
+                Assert.IsInstanceOf<IView>(view);
+                Assert.IsNull(view.Data);
+            }
+        }
+
+        [Test]
+        public void Constructor_DataGridViewCorrectlyInitialized()
+        {
+            // Setup & Call
+            ShowWaveHeightLocationsView();
+
+            // Assert
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            Assert.AreEqual(5, dataGridView.ColumnCount);
+
+            var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
+            const string expectedLocationCalculateHeaderText = "Berekenen";
+            Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText);
+
+            var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
+            const string expectedLocationNameHeaderText = "Naam";
+            Assert.AreEqual(expectedLocationNameHeaderText, locationNameColumn.HeaderText);
+
+            var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
+            const string expectedLocationIdHeaderText = "ID";
+            Assert.AreEqual(expectedLocationIdHeaderText, locationIdColumn.HeaderText);
+
+            var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
+            const string expectedLocationHeaderText = "Coördinaten [m]";
+            Assert.AreEqual(expectedLocationHeaderText, locationColumn.HeaderText);
+
+            var locationWaveHeightColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationWaveHeightColumnIndex];
+            const string expectedLocationWaveHeightHeaderText = "Hs [m]";
+            Assert.AreEqual(expectedLocationWaveHeightHeaderText, locationWaveHeightColumn.HeaderText);
+        }
+
+        [Test]
+        public void Data_IAssessmentSection_DataSet()
+        {
+            // Setup
+            using (var view = new WaveHeightLocationsView())
+            {
+                var assessmentSection = new TestAssessmentSection();
+
+                // Call
+                view.Data = assessmentSection;
+
+                // Assert
+                Assert.AreSame(assessmentSection, view.Data);
+            }
+        }
+
+        [Test]
+        public void Data_OtherThanIAssessmentSection_DataNull()
+        {
+            // Setup
+            using (var view = new WaveHeightLocationsView())
+            {
+                var data = new object();
+
+                // Call
+                view.Data = data;
+
+                // Assert
+                Assert.IsNull(view.Data);
+            }
+        }
+
+        [Test]
+        public void WaveHeightLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
+        {
+            // Setup & Call
+            ShowFullyConfiguredWaveHeightLocationsView();
+
+            // Assert
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var rows = dataGridView.Rows;
+            Assert.AreEqual(3, rows.Count);
+
+            var cells = rows[0].Cells;
+            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
+
+            cells = rows[1].Cells;
+            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[locationWaveHeightColumnIndex].FormattedValue);
+
+            cells = rows[2].Cells;
+            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
+        }
+
+        [Test]
+        public void WaveHeightLocationsView_HydraulicBoundaryDatabaseUpdated_DataGridViewCorrectlyUpdated()
+        {
+            // Setup
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
+            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+            HydraulicBoundaryDatabase newHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
+            {
+                WaveHeight = (RoundedDouble) 10.23
+            };
+            newHydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
+            // Precondition
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var rows = dataGridView.Rows;
+            Assert.AreEqual(3, rows.Count);
+
+            // Call
+            assessmentSection.HydraulicBoundaryDatabase = newHydraulicBoundaryDatabase;
+            assessmentSection.NotifyObservers();
+
+            // Assert
+            Assert.AreEqual(1, rows.Count);
+            var cells = rows[0].Cells;
+            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual(hydraulicBoundaryLocation.WaveHeight, cells[locationWaveHeightColumnIndex].Value);
+        }
+
+        [Test]
+        public void WaveHeightLocationsView_AssessmentSectionUpdated_DataGridViewCorrectlyUpdated()
+        {
+            // Setup
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
+            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+
+            // Precondition
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var rows = dataGridView.Rows;
+            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual("-", rows[0].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), rows[1].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[2].Cells[locationWaveHeightColumnIndex].FormattedValue);
+
+            // Call
+            assessmentSection.HydraulicBoundaryDatabase.Locations.ForEach(loc => loc.WaveHeight = (RoundedDouble) double.NaN);
+            assessmentSection.NotifyObservers();
+
+            // Assert
+            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual("-", rows[0].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[1].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[2].Cells[locationWaveHeightColumnIndex].FormattedValue);
+        }
+
+        [Test]
+        public void WaveHeightLocationsView_SelectingCellInRow_ApplicationSelectionCorrectlySynced()
+        {
+            // Setup
+            var view = ShowFullyConfiguredWaveHeightLocationsView();
+            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+            var secondHydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.Skip(1).First();
+
+            var mocks = new MockRepository();
+            var applicationSelectionMock = mocks.StrictMock<IApplicationSelection>();
+            applicationSelectionMock.Stub(asm => asm.Selection).Return(null);
+            applicationSelectionMock.Expect(asm => asm.Selection = new WaveHeightLocationContext(
+                                                                       assessmentSection.HydraulicBoundaryDatabase,
+                                                                       secondHydraulicBoundaryLocation));
+            mocks.ReplayAll();
+
+            view.ApplicationSelection = applicationSelectionMock;
+
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+
+            // Call
+            dataGridView.CurrentCell = dataGridView.Rows[1].Cells[locationNameColumnIndex];
+            EventHelper.RaiseEvent(dataGridView, "CellClick", new DataGridViewCellEventArgs(1, 0));
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void WaveHeightLocationsView_SelectingCellInAlreadySelectedRow_ApplicationSelectionNotSyncedRedundantly()
+        {
+            // Setup
+            var view = ShowFullyConfiguredWaveHeightLocationsView();
+
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            dataGridView.CurrentCell = dataGridView.Rows[1].Cells[locationNameColumnIndex];
+
+            var mocks = new MockRepository();
+            var applicationSelectionMock = mocks.StrictMock<IApplicationSelection>();
+            applicationSelectionMock.Stub(asm => asm.Selection).Return(view.Selection);
+            mocks.ReplayAll();
+
+            view.ApplicationSelection = applicationSelectionMock;
+
+            // Call
+            dataGridView.CurrentCell = dataGridView.Rows[1].Cells[locationNameColumnIndex];
+            EventHelper.RaiseEvent(dataGridView, "CellClick", new DataGridViewCellEventArgs(locationNameColumnIndex, 0));
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [TestCase(0)]
+        [TestCase(1)]
+        [TestCase(2)]
+        public void Selection_Always_ReturnsTheSelectedRowObject(int selectedRow)
+        {
+            // Setup
+            var view = ShowFullyConfiguredWaveHeightLocationsView();
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            dataGridView.CurrentCell = dataGridView.Rows[selectedRow].Cells[locationNameColumnIndex];
+
+            // Call
+            var selection = view.Selection;
+
+            // Assert
+            Assert.IsInstanceOf<WaveHeightLocationContext>(selection);
+            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = ((IAssessmentSection) view.Data).HydraulicBoundaryDatabase;
+            Assert.AreSame(hydraulicBoundaryDatabase, ((WaveHeightLocationContext) selection).WrappedData);
+        }
+
+        [Test]
+        public void SelectAllButton_SelectAllButtonClicked_AllLocationsSelected()
+        {
+            // Setup
+            ShowFullyConfiguredWaveHeightLocationsView();
+
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var rows = dataGridView.Rows;
+            var button = new ButtonTester("SelectAllButton", testForm);
+
+            // Precondition
+            Assert.IsFalse((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsFalse((bool) rows[2].Cells[locationCalculateColumnIndex].Value);
+
+            // Call
+            button.Click();
+
+            // Assert
+            Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsTrue((bool) rows[1].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsTrue((bool) rows[2].Cells[locationCalculateColumnIndex].Value);
+        }
+
+        [Test]
+        public void DeselectAllButton_AllLocationsSelectedDeselectAllButtonClicked_AllLocationsNotSelected()
+        {
+            // Setup
+            ShowFullyConfiguredWaveHeightLocationsView();
+
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var rows = dataGridView.Rows;
+            var button = new ButtonTester("DeselectAllButton", testForm);
+
+            foreach (DataGridViewRow row in rows)
+            {
+                row.Cells[locationCalculateColumnIndex].Value = true;
+            }
+
+            // Precondition
+            Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsTrue((bool) rows[1].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsTrue((bool) rows[2].Cells[locationCalculateColumnIndex].Value);
+
+            // Call
+            button.Click();
+
+            // Assert
+            Assert.IsFalse((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value);
+            Assert.IsFalse((bool) rows[2].Cells[locationCalculateColumnIndex].Value);
+        }
+
+        [Test]
+        public void CalculateForSelectedButton_NoneSelected_CallsCalculateWaveHeights()
+        {
+            // Setup
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
+
+            var mockRepository = new MockRepository();
+            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
+
+            IEnumerable<HydraulicBoundaryLocation> locations = null;
+            commandHandlerMock.Expect(ch => ch.CalculateWaveHeights(null)).IgnoreArguments().WhenCalled(
+                invocation => { locations = (IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[0]; });
+            mockRepository.ReplayAll();
+
+            view.CalculationCommandHandler = commandHandlerMock;
+            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+
+            // Call
+            button.Click();
+
+            // Assert
+            Assert.AreEqual(0, locations.Count());
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateForSelectedButton_OneSelected_CallsCalculateWaveHeights()
+        {
+            // Setup
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
+
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var rows = dataGridView.Rows;
+            rows[0].Cells[locationCalculateColumnIndex].Value = true;
+
+            var mockRepository = new MockRepository();
+            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
+
+            IEnumerable<HydraulicBoundaryLocation> locations = null;
+            commandHandlerMock.Expect(ch => ch.CalculateWaveHeights(null)).IgnoreArguments().WhenCalled(
+                invocation => { locations = (IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[0]; });
+            mockRepository.ReplayAll();
+
+            view.CalculationCommandHandler = commandHandlerMock;
+            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+
+            // Call
+            button.Click();
+
+            // Assert
+            var hydraulicBoundaryLocations = locations.ToArray();
+            Assert.AreEqual(1, hydraulicBoundaryLocations.Length);
+            HydraulicBoundaryLocation expectedLocation = ((IAssessmentSection) view.Data).HydraulicBoundaryDatabase.Locations.First();
+            Assert.AreEqual(expectedLocation, hydraulicBoundaryLocations.First());
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateForSelectedButton_CalculationCommandHandlerNotSet_DoesNotThrowException()
+        {
+            // Setup
+            ShowFullyConfiguredWaveHeightLocationsView();
+            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+
+            // Call
+            TestDelegate test = () => button.Click();
+
+            // Assert
+            Assert.DoesNotThrow(test);
+        }
+
+        private const int locationCalculateColumnIndex = 0;
+        private const int locationNameColumnIndex = 1;
+        private const int locationIdColumnIndex = 2;
+        private const int locationColumnIndex = 3;
+        private const int locationWaveHeightColumnIndex = 4;
+
+        private WaveHeightLocationsView ShowWaveHeightLocationsView()
+        {
+            var view = new WaveHeightLocationsView();
+
+            testForm.Controls.Add(view);
+            testForm.Show();
+
+            return view;
+        }
+
+        private WaveHeightLocationsView ShowFullyConfiguredWaveHeightLocationsView()
+        {
+            var view = ShowWaveHeightLocationsView();
+
+            var assessmentSection = new TestAssessmentSection()
+            {
+                HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
+            };
+
+            view.Data = assessmentSection;
+            return view;
+        }
+
+        private class TestAssessmentSection : Observable, IAssessmentSection
+        {
+            public string Comments { get; set; }
+            public long StorageId { get; set; }
+            public string Id { get; set; }
+            public string Name { get; set; }
+            public AssessmentSectionComposition Composition { get; private set; }
+            public ReferenceLine ReferenceLine { get; set; }
+            public FailureMechanismContribution FailureMechanismContribution { get; private set; }
+            public HydraulicBoundaryDatabase HydraulicBoundaryDatabase { get; set; }
+
+            public IEnumerable<IFailureMechanism> GetFailureMechanisms()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void ChangeComposition(AssessmentSectionComposition newComposition)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestHydraulicBoundaryDatabase : HydraulicBoundaryDatabase
+        {
+            public TestHydraulicBoundaryDatabase()
+            {
+                Locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0));
+                Locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
+                {
+                    WaveHeight = (RoundedDouble) 1.23
+                });
+                Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
+                {
+                    DesignWaterLevel = (RoundedDouble) 2.45
+                });
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/app.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/app.config	(.../app.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/app.config	(.../app.config)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/packages.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/packages.config	(.../packages.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/packages.config	(.../packages.config)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r6de162f9e652176605480f16f131ae9a14fbe05f -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 6de162f9e652176605480f16f131ae9a14fbe05f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -86,6 +86,7 @@
     <Compile Include="ViewInfos\GrassCoverSlipOffInwardsResultViewInfoTest.cs" />
     <Compile Include="ViewInfos\GrassCoverErosionOutwardsResultViewInfoTest.cs" />
     <Compile Include="ViewInfos\WaterPressureAsphaltCoverResultViewInfoTest.cs" />
+    <Compile Include="ViewInfos\WaveHeightLocationsViewInfoTest.cs" />
     <Compile Include="ViewInfos\WaveImpactAsphaltCoverResultViewInfoTest.cs" />
     <Compile Include="ViewInfos\MacrostabilityInwardsResultViewInfoTest.cs" />
     <Compile Include="ViewInfos\MacrostabilityOutwardsResultViewInfoTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rc6008af63ec14ed14cbcbb45c3b58cae88f1c07f -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision c6008af63ec14ed14cbcbb45c3b58cae88f1c07f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -196,7 +196,7 @@
                 PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(10, propertyInfos.Length);
+                Assert.AreEqual(11, propertyInfos.Length);
 
                 var ringtoetsProjectProperties = propertyInfos.Single(pi => pi.DataType == typeof(IProject));
                 Assert.AreEqual(typeof(RingtoetsProjectProperties), ringtoetsProjectProperties.PropertyObjectType);
@@ -257,6 +257,12 @@
                 Assert.IsNull(waveHeightLocationsContextProperties.AdditionalDataCheck);
                 Assert.IsNotNull(waveHeightLocationsContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(waveHeightLocationsContextProperties.AfterCreate);
+
+                var waveHeightLocationContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(WaveHeightLocationContext));
+                Assert.AreEqual(typeof(WaveHeightLocationContextProperties), waveHeightLocationContextProperties.PropertyObjectType);
+                Assert.IsNull(waveHeightLocationContextProperties.AdditionalDataCheck);
+                Assert.IsNull(waveHeightLocationContextProperties.GetObjectPropertiesData);
+                Assert.IsNull(waveHeightLocationContextProperties.AfterCreate);
             }
         }
 
@@ -292,7 +298,7 @@
                 ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(19, viewInfos.Length);
+                Assert.AreEqual(20, viewInfos.Length);
 
                 var contributionViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismContributionContext));
                 Assert.AreEqual(typeof(FailureMechanismContributionView), contributionViewInfo.ViewType);
@@ -302,6 +308,10 @@
                 Assert.AreEqual(typeof(DesignWaterLevelLocationsView), designWaterLevelLocationsViewInfo.ViewType);
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, designWaterLevelLocationsViewInfo.Image);
 
+                var waveHeightLocationsViewInfo = viewInfos.Single(vi => vi.DataType == typeof(WaveHeightLocationsContext));
+                Assert.AreEqual(typeof(WaveHeightLocationsView), waveHeightLocationsViewInfo.ViewType);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, waveHeightLocationsViewInfo.Image);
+
                 var mapViewInfo = viewInfos.Single(vi => vi.DataType == typeof(IAssessmentSection));
                 Assert.AreEqual(typeof(AssessmentSectionView), mapViewInfo.ViewType);
                 TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.Map, mapViewInfo.Image);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -r8351a9c0ff58140e8b0e5e65f7790e210f6d648a -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 8351a9c0ff58140e8b0e5e65f7790e210f6d648a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -150,7 +150,7 @@
                 info.AfterCreate(view, context);
 
                 // Assert
-                Assert.IsInstanceOf<ICalculateDesignWaterLevelCommandHandler>(view.CalculationCommandHandler);
+                Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationCommandHandler>(view.CalculationCommandHandler);
                 Assert.AreSame(view.ApplicationSelection, guiStub);
             }
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -0,0 +1,159 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Gui;
+using Core.Common.Gui.Commands;
+using Core.Common.Gui.Forms.MainWindow;
+using Core.Common.Gui.Plugin;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.Properties;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.Views;
+
+namespace Ringtoets.Integration.Plugin.Test.ViewInfos
+{
+    [TestFixture]
+    public class WaveHeightLocationsViewInfoTest
+    {
+        private MockRepository mocks;
+        private RingtoetsPlugin plugin;
+        private ViewInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            plugin = new RingtoetsPlugin();
+            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(WaveHeightLocationsView));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
+        [Test]
+        public void GetViewName_Always_ReturnsViewName()
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+            var view = new WaveHeightLocationsView();
+
+            // Call
+            var viewName = info.GetViewName(view, assessmentSection);
+
+            // Assert
+            Assert.AreEqual("Golfhoogtes", viewName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ViewDataType_Always_ReturnsViewDataType()
+        {
+            // Call
+            var viewDataType = info.ViewDataType;
+
+            // Assert
+            Assert.AreEqual(typeof(IAssessmentSection), viewDataType);
+        }
+
+        [Test]
+        public void DataType_Always_ReturnsDataType()
+        {
+            // Call
+            var dataType = info.DataType;
+
+            // Assert
+            Assert.AreEqual(typeof(WaveHeightLocationsContext), dataType);
+        }
+
+        [Test]
+        public void Image_Always_ReturnsGenericInputOutputIcon()
+        {
+            // Call
+            var image = info.Image;
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+        }
+
+        [Test]
+        public void GetViewData_Always_ReturnsHydraulicBoundaryDatabase()
+        {
+            // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+            mocks.ReplayAll();
+            var context = new WaveHeightLocationsContext(assessmentSection);
+
+            // Call
+            var viewData = info.GetViewData(context);
+
+            // Assert
+            Assert.AreSame(assessmentSection, viewData);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AfterCreate_WithGuiSet_SetsSpecificPropertiesToView()
+        {
+            // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
+            IGui guiStub = mocks.Stub<IGui>();
+            guiStub.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+            guiStub.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+            guiStub.Stub(g => g.ViewCommands).Return(mocks.Stub<IViewCommands>());
+            guiStub.Stub(g => g.MainWindow).Return(mocks.Stub<IMainWindow>());
+
+            mocks.ReplayAll();
+
+            var context = new WaveHeightLocationsContext(assessmentSection);
+
+            var view = new WaveHeightLocationsView();
+
+            using (var ringtoetsPlugin = new RingtoetsPlugin())
+            {
+                info = ringtoetsPlugin.GetViewInfos().First(tni => tni.ViewType == typeof(WaveHeightLocationsView));
+                ringtoetsPlugin.Gui = guiStub;
+
+                // Call
+                info.AfterCreate(view, context);
+
+                // Assert
+                Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationCommandHandler>(view.CalculationCommandHandler);
+                Assert.AreSame(view.ApplicationSelection, guiStub);
+            }
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/packages.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r84afb606e58d67c6342c4f11bf66b042e49f52d6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/packages.config	(.../packages.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/packages.config	(.../packages.config)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.