Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs =================================================================== diff -u -re0476d8c340b412a22c14d0869888a84e0e4fe5f -r9f96ab926e3b3738ea9b2f566b5682250ec1b76c --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision e0476d8c340b412a22c14d0869888a84e0e4fe5f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 9f96ab926e3b3738ea9b2f566b5682250ec1b76c) @@ -43,6 +43,8 @@ private FailureMechanismMergeDataRow[] failureMechanismMergeDataRows; private bool assessmentSectionComboBoxUpdating; private bool isDataSelected; + private AssessmentSection selectedAssessmentSection; + private IEnumerable selectedFailureMechanisms; /// /// Creates a new instance of the . @@ -58,9 +60,6 @@ InitializeDataGridView(); } - public AssessmentSection SelectedAssessmentSection { get; private set; } - public IEnumerable SelectedFailureMechanisms { get; private set; } - public AssessmentSectionMergeData SelectData(IEnumerable assessmentSections) { if (assessmentSections == null) @@ -71,8 +70,8 @@ SetComboBoxData(assessmentSections); ShowDialog(); - return isDataSelected - ? new AssessmentSectionMergeData(SelectedAssessmentSection, SelectedFailureMechanisms) + return isDataSelected + ? new AssessmentSectionMergeData(selectedAssessmentSection, selectedFailureMechanisms) : null; } @@ -178,8 +177,8 @@ private void OnImportButtonClick(object sender, EventArgs eventArgs) { - SelectedAssessmentSection = (AssessmentSection) assessmentSectionComboBox.SelectedItem; - SelectedFailureMechanisms = failureMechanismMergeDataRows?.Where(row => row.IsSelected) + selectedAssessmentSection = (AssessmentSection) assessmentSectionComboBox.SelectedItem; + selectedFailureMechanisms = failureMechanismMergeDataRows?.Where(row => row.IsSelected) .Select(row => row.FailureMechanism) .ToArray(); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/IAssessmentSectionMergeDataProvider.cs =================================================================== diff -u -re0476d8c340b412a22c14d0869888a84e0e4fe5f -r9f96ab926e3b3738ea9b2f566b5682250ec1b76c --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/IAssessmentSectionMergeDataProvider.cs (.../IAssessmentSectionMergeDataProvider.cs) (revision e0476d8c340b412a22c14d0869888a84e0e4fe5f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/IAssessmentSectionMergeDataProvider.cs (.../IAssessmentSectionMergeDataProvider.cs) (revision 9f96ab926e3b3738ea9b2f566b5682250ec1b76c) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data; using Ringtoets.Integration.Data.Merge; @@ -33,16 +32,6 @@ public interface IAssessmentSectionMergeDataProvider { /// - /// Gets the selected . - /// - AssessmentSection SelectedAssessmentSection { get; } - - /// - /// Gets the collection of selected . - /// - IEnumerable SelectedFailureMechanisms { get; } - - /// /// Select the data to merge. /// /// The collection of assessment sections to select from.