Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -rc079bc0587f6e2b6ff9bddfe5a713623655876d7 -r4c0cc92421b1790567779ec2ece30570a3a36ec5 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision c079bc0587f6e2b6ff9bddfe5a713623655876d7) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 4c0cc92421b1790567779ec2ece30570a3a36ec5) @@ -83,7 +83,8 @@ #region HydraulicBoundaryLocationCalculations - private static IEnumerable MergeHydraulicBoundaryLocations(IAssessmentSection targetAssessmentSection, IAssessmentSection sourceAssessmentSection) + private static IEnumerable MergeHydraulicBoundaryLocations(IAssessmentSection targetAssessmentSection, + IAssessmentSection sourceAssessmentSection) { var changedObjects = new List(); @@ -106,9 +107,10 @@ return changedObjects; } - private static IEnumerable MergeUserDefinedHydraulicBoundaryLocations(ObservableList targetProbabilities, - IEnumerable sourceProbabilities, - IEnumerable hydraulicBoundaryLocations) + private static IEnumerable MergeUserDefinedHydraulicBoundaryLocations( + ObservableList targetProbabilities, + IEnumerable sourceProbabilities, + IEnumerable hydraulicBoundaryLocations) { HydraulicBoundaryLocationCalculationsForTargetProbability[] probabilitiesToMerge = sourceProbabilities.Where(stp => targetProbabilities .Select(c => c.TargetProbability) @@ -129,8 +131,9 @@ return changedObjects; } - private static IEnumerable MergeProbabilities(IEnumerable targetProbabilities, - IEnumerable probabilitiesToMerge) + private static IEnumerable MergeProbabilities( + IEnumerable targetProbabilities, + IEnumerable probabilitiesToMerge) { var changedObjects = new List(); @@ -139,8 +142,9 @@ HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability = targetProbabilities.First( c => c.TargetProbability.Equals(probabilityToMerge.TargetProbability)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetProbability.HydraulicBoundaryLocationCalculations, - probabilityToMerge.HydraulicBoundaryLocationCalculations)); + changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations( + targetProbability.HydraulicBoundaryLocationCalculations, + probabilityToMerge.HydraulicBoundaryLocationCalculations)); } return changedObjects; @@ -156,8 +160,9 @@ newTargetProbability.HydraulicBoundaryLocationCalculations.AddRange( sourceProbability.HydraulicBoundaryLocationCalculations - .Select(calculation => new HydraulicBoundaryLocationCalculation(GetHydraulicBoundaryLocation( - calculation.HydraulicBoundaryLocation, hydraulicBoundaryLocations))) + .Select(calculation => new HydraulicBoundaryLocationCalculation( + GetHydraulicBoundaryLocation( + calculation.HydraulicBoundaryLocation, hydraulicBoundaryLocations))) .ToArray()); targetProbabilities.Add(newTargetProbability); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -ra1e63adb0817654dc4c342f94a28b3d260be08ef -r4c0cc92421b1790567779ec2ece30570a3a36ec5 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision a1e63adb0817654dc4c342f94a28b3d260be08ef) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 4c0cc92421b1790567779ec2ece30570a3a36ec5) @@ -428,6 +428,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()).Repeat.Twice(); mocks.ReplayAll(); + var handler = new AssessmentSectionMergeHandler(); var targetLocations = new[]