Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs =================================================================== diff -u -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0 -r25d6e696e6d0aee11324eef715c7f30e0956702d --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs (.../HydraulicBoundaryLocationsView.cs) (revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs (.../HydraulicBoundaryLocationsView.cs) (revision 25d6e696e6d0aee11324eef715c7f30e0956702d) @@ -145,7 +145,7 @@ HydraulicBoundaryLocation location = ((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject; - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = GetCalculation(location); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = getCalculationFunc(location); HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = hydraulicBoundaryLocationCalculation.Output; if (hydraulicBoundaryLocationCalculation.HasOutput && hydraulicBoundaryLocationOutput.HasGeneralResult) @@ -167,24 +167,15 @@ } /// - /// Gets the based on - /// the data. - /// - /// The - /// to retrieve the calculation from. - /// A . - protected abstract HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location); - - /// /// Creates a new row that is added to the data table. /// /// The location for which to create a new row. /// The newly created row. - /// Thrown when or - /// is null. + /// Thrown when is null or + /// returns null. private HydraulicBoundaryLocationRow CreateNewRow(HydraulicBoundaryLocation location) { - return new HydraulicBoundaryLocationRow(location, GetCalculation(location)); + return new HydraulicBoundaryLocationRow(location, getCalculationFunc(location)); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs =================================================================== diff -u -r56a906870d38358a03a7aff7e9454b7bb3585666 -r25d6e696e6d0aee11324eef715c7f30e0956702d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 56a906870d38358a03a7aff7e9454b7bb3585666) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 25d6e696e6d0aee11324eef715c7f30e0956702d) @@ -341,11 +341,6 @@ { return null; } - - protected override HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location) - { - return getCalculationFunc(location); - } } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs =================================================================== diff -u -r5c823d529eb2fcbf28cecd468b056de07fdb1c11 -r25d6e696e6d0aee11324eef715c7f30e0956702d --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 5c823d529eb2fcbf28cecd468b056de07fdb1c11) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 25d6e696e6d0aee11324eef715c7f30e0956702d) @@ -126,10 +126,5 @@ ? RingtoetsCommonFormsResources.Contribution_of_failure_mechanism_zero : base.ValidateCalculatableObjects(); } - - protected override HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location) - { - return getCalculationFunc(location); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs =================================================================== diff -u -r5c823d529eb2fcbf28cecd468b056de07fdb1c11 -r25d6e696e6d0aee11324eef715c7f30e0956702d --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 5c823d529eb2fcbf28cecd468b056de07fdb1c11) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 25d6e696e6d0aee11324eef715c7f30e0956702d) @@ -128,10 +128,5 @@ ? RingtoetsCommonFormsResources.Contribution_of_failure_mechanism_zero : base.ValidateCalculatableObjects(); } - - protected override HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location) - { - return getCalculationFunc(location); - } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs =================================================================== diff -u -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0 -r25d6e696e6d0aee11324eef715c7f30e0956702d --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs (.../DesignWaterLevelLocationsView.cs) (revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs (.../DesignWaterLevelLocationsView.cs) (revision 25d6e696e6d0aee11324eef715c7f30e0956702d) @@ -92,10 +92,5 @@ dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Result), Resources.HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName); } - - protected override HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location) - { - return getCalculationFunc(location); - } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs =================================================================== diff -u -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0 -r25d6e696e6d0aee11324eef715c7f30e0956702d --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs (.../WaveHeightLocationsView.cs) (revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs (.../WaveHeightLocationsView.cs) (revision 25d6e696e6d0aee11324eef715c7f30e0956702d) @@ -92,10 +92,5 @@ dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Result), Resources.HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName); } - - protected override HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location) - { - return getCalculationFunc(location); - } } } \ No newline at end of file