Fisheye: Tag 516d3fef7700690cb8dea01c8847f0030fa08b47 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/HydraulicBoundaryLocationCalculationCommandHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 516d3fef7700690cb8dea01c8847f0030fa08b47 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/IHydraulicBoundaryLocationCalculationCommandHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r9d7652958890fbd594bd7f16f383e46dfb83c7c3 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 9d7652958890fbd594bd7f16f383e46dfb83c7c3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -47,9 +47,9 @@
     </Compile>
     <Compile Include="Commands\AddAssessmentSectionCommand.cs" />
     <Compile Include="Commands\AssessmentSectionFromFileCommandHandler.cs" />
-    <Compile Include="Commands\HydraulicBoundaryLocationCalculationCommandHandler.cs" />
+    <Compile Include="GuiServices\HydraulicBoundaryLocationCalculationGuiService.cs" />
     <Compile Include="Commands\IAssessmentSectionFromFileCommandHandler.cs" />
-    <Compile Include="Commands\IHydraulicBoundaryLocationCalculationCommandHandler.cs" />
+    <Compile Include="GuiServices\IHydraulicBoundaryLocationCalculationGuiService.cs" />
     <Compile Include="PresentationObjects\DesignWaterLevelLocationContext.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryLocationContext.cs" />
     <Compile Include="PresentationObjects\DesignWaterLevelLocationsContext.cs" />
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -r58f97f0c2d1986f6ff8def960f4b6a0454129d68 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 58f97f0c2d1986f6ff8def960f4b6a0454129d68)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -52,7 +52,7 @@
 
         protected override void HandleCalculateSelectedLocations(IEnumerable<HydraulicBoundaryLocation> locations)
         {
-            CalculationCommandHandler.CalculateDesignWaterLevels(AssessmentSection, locations);
+            CalculationGuiService.CalculateDesignWaterLevels(AssessmentSection, locations);
         }
 
         protected override void InitializeDataGridView()
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/HydraulicBoundaryLocationsView.cs
===================================================================
diff -u -r58f97f0c2d1986f6ff8def960f4b6a0454129d68 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision 58f97f0c2d1986f6ff8def960f4b6a0454129d68)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -30,7 +30,7 @@
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Properties;
 
@@ -59,33 +59,15 @@
             hydraulicBoundaryDatabaseObserver = new Observer(() => dataGridViewControl.RefreshDataGridView());
         }
 
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            InitializeDataGridView();
-        }
-
-        protected virtual void InitializeDataGridView()
-        {
-            dataGridViewControl.AddCheckBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.ToCalculate),
-                                                  Resources.HydraulicBoundaryLocationsView_Calculate);
-            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.Name),
-                                                 Resources.HydraulicBoundaryDatabase_Locations_Name_DisplayName);
-            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.Id),
-                                                 Resources.HydraulicBoundaryDatabase_Locations_Id_DisplayName);
-            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.Location),
-                                                 Resources.HydraulicBoundaryDatabase_Locations_Coordinates_DisplayName);
-        }
-
         /// <summary>
         /// Gets or sets the <see cref="IApplicationSelection"/>.
         /// </summary>
         public IApplicationSelection ApplicationSelection { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="IHydraulicBoundaryLocationCalculationCommandHandler"/>.
+        /// Gets or sets the <see cref="IHydraulicBoundaryLocationCalculationGuiService"/>.
         /// </summary>
-        public IHydraulicBoundaryLocationCalculationCommandHandler CalculationCommandHandler { get; set; }
+        public IHydraulicBoundaryLocationCalculationGuiService CalculationGuiService { get; set; }
 
         public object Data
         {
@@ -110,6 +92,24 @@
             }
         }
 
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            InitializeDataGridView();
+        }
+
+        protected virtual void InitializeDataGridView()
+        {
+            dataGridViewControl.AddCheckBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.ToCalculate),
+                                                  Resources.HydraulicBoundaryLocationsView_Calculate);
+            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.Name),
+                                                 Resources.HydraulicBoundaryDatabase_Locations_Name_DisplayName);
+            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.Id),
+                                                 Resources.HydraulicBoundaryDatabase_Locations_Id_DisplayName);
+            dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<HydraulicBoundaryLocationContextRow>(row => row.Location),
+                                                 Resources.HydraulicBoundaryDatabase_Locations_Coordinates_DisplayName);
+        }
+
         protected override void Dispose(bool disposing)
         {
             assessmentSectionObserver.Dispose();
@@ -229,7 +229,7 @@
 
         private void CalculateForSelectedButton_Click(object sender, EventArgs e)
         {
-            if (CalculationCommandHandler == null)
+            if (CalculationGuiService == null)
             {
                 return;
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs
===================================================================
diff -u -r58f97f0c2d1986f6ff8def960f4b6a0454129d68 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 58f97f0c2d1986f6ff8def960f4b6a0454129d68)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -52,7 +52,7 @@
 
         protected override void HandleCalculateSelectedLocations(IEnumerable<HydraulicBoundaryLocation> locations)
         {
-            CalculationCommandHandler.CalculateWaveHeights(AssessmentSection, locations);
+            CalculationGuiService.CalculateWaveHeights(AssessmentSection, locations);
         }
 
         protected override void InitializeDataGridView()
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r5410853d339d757acb6f70e2be07a332e4574d39 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 5410853d339d757acb6f70e2be07a332e4574d39)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -57,6 +57,7 @@
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.Views;
@@ -204,7 +205,7 @@
         private RingtoetsRibbon ribbonCommandHandler;
 
         private IAssessmentSectionFromFileCommandHandler assessmentSectionFromFileCommandHandler;
-        private IHydraulicBoundaryLocationCalculationCommandHandler hydraulicBoundaryLocationCalculationCommandHandler;
+        private IHydraulicBoundaryLocationCalculationGuiService hydraulicBoundaryLocationCalculationGuiService;
 
         public override IRibbonCommandHandler RibbonCommandHandler
         {
@@ -237,7 +238,7 @@
                 throw new InvalidOperationException("Gui cannot be null");
             }
             assessmentSectionFromFileCommandHandler = new AssessmentSectionFromFileCommandHandler(Gui.MainWindow, Gui, Gui.DocumentViewController);
-            hydraulicBoundaryLocationCalculationCommandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(Gui.MainWindow);
+            hydraulicBoundaryLocationCalculationGuiService = new HydraulicBoundaryLocationCalculationGuiService(Gui.MainWindow);
 
             ribbonCommandHandler = new RingtoetsRibbon
             {
@@ -295,7 +296,7 @@
                 AfterCreate = (view, context) =>
                 {
                     view.ApplicationSelection = Gui;
-                    view.CalculationCommandHandler = hydraulicBoundaryLocationCalculationCommandHandler;
+                    view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
                 }
             };
 
@@ -307,7 +308,7 @@
                 AfterCreate = (view, context) =>
                 {
                     view.ApplicationSelection = Gui;
-                    view.CalculationCommandHandler = hydraulicBoundaryLocationCalculationCommandHandler;
+                    view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
                 }
             };
 
@@ -1048,11 +1049,11 @@
                 RingtoetsCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
-                    if (hydraulicBoundaryLocationCalculationCommandHandler == null)
+                    if (hydraulicBoundaryLocationCalculationGuiService == null)
                     {
                         return;
                     }
-                    hydraulicBoundaryLocationCalculationCommandHandler.CalculateDesignWaterLevels(
+                    hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(
                         nodeData.WrappedData,
                         nodeData.WrappedData.HydraulicBoundaryDatabase.Locations);
                 });
@@ -1080,11 +1081,11 @@
                 RingtoetsCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
-                    if (hydraulicBoundaryLocationCalculationCommandHandler == null)
+                    if (hydraulicBoundaryLocationCalculationGuiService == null)
                     {
                         return;
                     }
-                    hydraulicBoundaryLocationCalculationCommandHandler.CalculateWaveHeights(
+                    hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(
                         nodeData.WrappedData,
                         nodeData.WrappedData.HydraulicBoundaryDatabase.Locations);
                 });
Fisheye: Tag 516d3fef7700690cb8dea01c8847f0030fa08b47 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/HydraulicBoundaryLocationCommandHandlerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r9d7652958890fbd594bd7f16f383e46dfb83c7c3 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 9d7652958890fbd594bd7f16f383e46dfb83c7c3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -66,7 +66,7 @@
     </Compile>
     <Compile Include="Commands\AddAssessmentSectionCommandTest.cs" />
     <Compile Include="Commands\AssessmentSectionFromFileCommandHandlerTest.cs" />
-    <Compile Include="Commands\HydraulicBoundaryLocationCommandHandlerTest.cs" />
+    <Compile Include="GuiServices\HydraulicBoundaryLocationGuiServiceTest.cs" />
     <Compile Include="ExportInfos\HydraulicBoundaryDatabaseContextExportInfoTest.cs" />
     <Compile Include="ExportInfos\ReferenceLineContextExportInfoTest.cs" />
     <Compile Include="FailureMechanismContributionViewIntegrationTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r58f97f0c2d1986f6ff8def960f4b6a0454129d68 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 58f97f0c2d1986f6ff8def960f4b6a0454129d68)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -34,7 +34,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.Views;
 
 namespace Ringtoets.Integration.Forms.Test.Views
@@ -209,14 +209,14 @@
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
             var mockRepository = new MockRepository();
-            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
+            var guiServiceMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
 
             IEnumerable<HydraulicBoundaryLocation> locations = null;
-            commandHandlerMock.Expect(ch => ch.CalculateDesignWaterLevels(assessmentSection, null)).IgnoreArguments().WhenCalled(
+            guiServiceMock.Expect(ch => ch.CalculateDesignWaterLevels(assessmentSection, null)).IgnoreArguments().WhenCalled(
                 invocation => { locations = (IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[1]; });
             mockRepository.ReplayAll();
 
-            view.CalculationCommandHandler = commandHandlerMock;
+            view.CalculationGuiService = guiServiceMock;
             var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
 
             // Call
@@ -231,7 +231,7 @@
         }
 
         [Test]
-        public void CalculateForSelectedButton_OneSelectedButCalculationCommandHandlerNotSet_DoesNotThrowException()
+        public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs
===================================================================
diff -u -r58f97f0c2d1986f6ff8def960f4b6a0454129d68 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision 58f97f0c2d1986f6ff8def960f4b6a0454129d68)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -35,7 +35,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Views;
 
@@ -341,11 +341,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
+            var guiServiceMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
             mockRepository.ReplayAll();
 
             TestHydraulicBoundaryLocationsView view = ShowFullyConfiguredTestHydraulicBoundaryLocationsView();
-            view.CalculationCommandHandler = commandHandlerMock;
+            view.CalculationGuiService = guiServiceMock;
             var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
 
             // Call
@@ -368,10 +368,10 @@
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
             var mockRepository = new MockRepository();
-            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
+            var guiServiceMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
             mockRepository.ReplayAll();
 
-            view.CalculationCommandHandler = commandHandlerMock;
+            view.CalculationGuiService = guiServiceMock;
             var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
 
             // Call
@@ -385,7 +385,7 @@
         }
 
         [Test]
-        public void CalculateForSelectedButton_OneSelectedButCalculationCommandHandlerNotSet_DoesNotThrowException()
+        public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
             ShowFullyConfiguredTestHydraulicBoundaryLocationsView();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r58f97f0c2d1986f6ff8def960f4b6a0454129d68 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 58f97f0c2d1986f6ff8def960f4b6a0454129d68)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -34,7 +34,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.Views;
 
 namespace Ringtoets.Integration.Forms.Test.Views
@@ -205,14 +205,14 @@
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
             var mockRepository = new MockRepository();
-            var commandHandlerMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationCommandHandler>();
+            var guiServiceMock = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
 
             IEnumerable<HydraulicBoundaryLocation> locations = null;
-            commandHandlerMock.Expect(ch => ch.CalculateWaveHeights(assessmentSection, null)).IgnoreArguments().WhenCalled(
+            guiServiceMock.Expect(ch => ch.CalculateWaveHeights(assessmentSection, null)).IgnoreArguments().WhenCalled(
                 invocation => { locations = (IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[1]; });
             mockRepository.ReplayAll();
 
-            view.CalculationCommandHandler = commandHandlerMock;
+            view.CalculationGuiService = guiServiceMock;
             var button = new ButtonTester("CalculateForSelectedButton", testForm);
 
             // Call
@@ -227,7 +227,7 @@
         }
 
         [Test]
-        public void CalculateForSelectedButton_OneSelectedButCalculationCommandHandlerNotSet_DoesNotThrowException()
+        public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -r5410853d339d757acb6f70e2be07a332e4574d39 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 5410853d339d757acb6f70e2be07a332e4574d39)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Views;
 
@@ -154,7 +155,7 @@
                 info.AfterCreate(view, context);
 
                 // Assert
-                Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationCommandHandler>(view.CalculationCommandHandler);
+                Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationGuiService>(view.CalculationGuiService);
                 Assert.AreSame(view.ApplicationSelection, guiStub);
             }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -r5410853d339d757acb6f70e2be07a332e4574d39 -r516d3fef7700690cb8dea01c8847f0030fa08b47
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision 5410853d339d757acb6f70e2be07a332e4574d39)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision 516d3fef7700690cb8dea01c8847f0030fa08b47)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Forms.Commands;
+using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Views;
 
@@ -155,7 +156,7 @@
                 info.AfterCreate(view, context);
 
                 // Assert
-                Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationCommandHandler>(view.CalculationCommandHandler);
+                Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationGuiService>(view.CalculationGuiService);
                 Assert.AreSame(view.ApplicationSelection, guiStub);
             }
             mocks.VerifyAll();