Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs =================================================================== diff -u -reb2f156193e39ce90df50f89ce017bd8aea521b2 -rcd6511acc2571c1198114922a440d5bb1bcb8e35 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision eb2f156193e39ce90df50f89ce017bd8aea521b2) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision cd6511acc2571c1198114922a440d5bb1bcb8e35) @@ -36,13 +36,6 @@ /// public partial class DuneLocationCalculationsView : DuneLocationCalculationsViewBase { - private readonly Observer failureMechanismObserver; - private readonly Observer duneLocationCalculationsObserver; - private readonly IObservableEnumerable calculations; - private readonly Func getTargetProbabilityFunc; - private readonly Func getCalculationIdentifierFunc; - private readonly RecursiveObserver, DuneLocationCalculation> duneLocationCalculationObserver; - /// /// Creates a new instance of . /// @@ -59,18 +52,8 @@ Func getCalculationIdentifierFunc) : base(calculations, failureMechanism, assessmentSection, getTargetProbabilityFunc, getCalculationIdentifierFunc) { InitializeComponent(); - UpdateDataGridViewDataSource(); } public override object Data { get; set; } - - protected override void Dispose(bool disposing) - { - duneLocationCalculationsObserver.Dispose(); - duneLocationCalculationObserver.Dispose(); - failureMechanismObserver.Dispose(); - - base.Dispose(disposing); - } } } \ No newline at end of file Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.cs =================================================================== diff -u -reb2f156193e39ce90df50f89ce017bd8aea521b2 -rcd6511acc2571c1198114922a440d5bb1bcb8e35 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.cs (.../DuneLocationCalculationsViewBase.cs) (revision eb2f156193e39ce90df50f89ce017bd8aea521b2) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.cs (.../DuneLocationCalculationsViewBase.cs) (revision cd6511acc2571c1198114922a440d5bb1bcb8e35) @@ -101,7 +101,8 @@ Observable = calculations }; - duneLocationCalculationObserver = new RecursiveObserver, DuneLocationCalculation>(() => dataGridViewControl.RefreshDataGridView(), list => list) + duneLocationCalculationObserver = new RecursiveObserver, DuneLocationCalculation>( + () => dataGridViewControl.RefreshDataGridView(), list => list) { Observable = calculations }; @@ -163,10 +164,7 @@ base.Dispose(disposing); } - /// - /// Updates the data source of the data table based on the . - /// - protected void UpdateDataGridViewDataSource() + private void UpdateDataGridViewDataSource() { updatingDataSource = true; SetDataSource(); @@ -202,29 +200,19 @@ Resources.DuneLocationCalculationOutput_TideSurgePhaseDifference_DisplayName); } - /// - /// Gets all the row items from the . - /// - protected IEnumerable GetCalculatableRows() + private IEnumerable GetCalculatableRows() { return dataGridViewControl.Rows .Cast() .Select(row => (DuneLocationCalculationRow) row.DataBoundItem); } - /// - /// Gets all the selected calculatable objects. - /// - protected IEnumerable GetSelectedCalculatableObjects() + private IEnumerable GetSelectedCalculatableObjects() { return GetCalculatableRows().Where(r => r.ShouldCalculate) .Select(r => r.CalculatableObject); } - /// - /// Validates the calculatable objects. - /// - /// A validation message in case no calculations can be performed, null otherwise. private string ValidateCalculatableObjects() { if (!GetCalculatableRows().Any(r => r.ShouldCalculate)) @@ -234,10 +222,7 @@ return null; } - - /// - /// Updates the state of the calculation button and the corresponding error provider. - /// + private void UpdateCalculateForSelectedButton() { string validationText = ValidateCalculatableObjects();