Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r8befeafa1ad200d03bd0591ca3429dd6c5a435a1 -r38a39d562c3703d25a983334c64e07964a7a002e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 8befeafa1ad200d03bd0591ca3429dd6c5a435a1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 38a39d562c3703d25a983334c64e07964a7a002e) @@ -94,7 +94,6 @@ using Ringtoets.Integration.Plugin.Properties; using Ringtoets.Integration.Service; using Ringtoets.Integration.Service.Comparers; -using Ringtoets.Integration.Service.Merge; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.Piping.Data; @@ -103,7 +102,6 @@ using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; -using Ringtoets.Storage.Core; using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects; using RingtoetsDataResources = Ringtoets.Integration.Data.Properties.Resources; @@ -280,13 +278,7 @@ assessmentSectionFromFileCommandHandler = new AssessmentSectionFromFileCommandHandler(Gui.MainWindow, Gui, Gui.DocumentViewController); hydraulicBoundaryLocationCalculationGuiService = new HydraulicBoundaryLocationCalculationGuiService(Gui.MainWindow); assessmentSectionMerger = new AssessmentSectionMerger(new AssessmentSectionMergeFilePathProvider(new DialogBasedInquiryHelper(Gui.MainWindow)), - (filePath, assessmentSectionOwner) => - { - ActivityProgressDialogRunner.Run(Gui.MainWindow, - LoadAssessmentSectionsActivityFactory.CreateLoadAssessmentSectionsActivity( - assessmentSectionOwner, new LoadAssessmentSectionService(new StorageSqLite()), - filePath)); - }, + new AssessmentSectionProvider(Gui.MainWindow), new AssessmentSectionMergeComparer(), new AssessmentSectionMergeDataProviderDialog(Gui.MainWindow), new AssessmentSectionMergeHandlerStub());