Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj =================================================================== diff -u -r231804c353b32db8e1421cfb776801a9b0677541 -ra670d0895ffaba9ace8c0c6e5f9a10103e61a205 --- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 231804c353b32db8e1421cfb776801a9b0677541) +++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision a670d0895ffaba9ace8c0c6e5f9a10103e61a205) @@ -129,6 +129,7 @@ Properties\GlobalAssembly.cs + Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs =================================================================== diff -u --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs (revision 0) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs (revision a670d0895ffaba9ace8c0c6e5f9a10103e61a205) @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using Core.Common.Base.Workflow; +using Core.Common.Controls.Swf; + +namespace Core.Common.Gui.Forms.ProgressDialog +{ + public static class ActivityProgressDialogRunner + { + public static void Run(IActivity activity) + { + Run(new[] { activity }); + } + + public static void Run(IEnumerable activities) + { + ModalHelper.ShowModal(new ActivityProgressDialog(activities)); + } + } +} Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs =================================================================== diff -u -reb7f8fe1e85f00faf16a1cddef014728d60a2b19 -ra670d0895ffaba9ace8c0c6e5f9a10103e61a205 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision eb7f8fe1e85f00faf16a1cddef014728d60a2b19) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision a670d0895ffaba9ace8c0c6e5f9a10103e61a205) @@ -31,9 +31,9 @@ public IContextMenuBuilderProvider ContextMenuBuilderProvider { get; set; } /// - /// Injection points for a method to cause an to be scheduled for execution. + /// Injection points for a method to cause a collection of to be scheduled for execution. /// - public Action RunActivityAction { private get; set; } + public Action> RunActivitiesAction { private get; set; } protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, PipingFailureMechanism nodeData) { @@ -116,10 +116,7 @@ private void CalculateAll(PipingFailureMechanism failureMechanism) { - foreach (PipingCalculation calc in GetAllPipingCalculationsResursively(failureMechanism)) - { - RunActivityAction(new PipingCalculationActivity(calc)); - } + RunActivitiesAction(GetAllPipingCalculationsResursively(failureMechanism).Select(calc => new PipingCalculationActivity(calc))); } private static void AddCalculationGroup(PipingFailureMechanism failureMechanism) Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -reb7f8fe1e85f00faf16a1cddef014728d60a2b19 -ra670d0895ffaba9ace8c0c6e5f9a10103e61a205 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision eb7f8fe1e85f00faf16a1cddef014728d60a2b19) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision a670d0895ffaba9ace8c0c6e5f9a10103e61a205) @@ -2,7 +2,7 @@ using Core.Common.Controls; using Core.Common.Gui; using Core.Common.Gui.Forms; - +using Core.Common.Gui.Forms.ProgressDialog; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.NodePresenters; @@ -35,13 +35,13 @@ { yield return new PipingCalculationContextNodePresenter { - RunActivityAction = Gui.ActivityRunner.Enqueue + RunActivityAction = ActivityProgressDialogRunner.Run }; yield return new PipingCalculationGroupContextNodePresenter(); yield return new PipingInputContextNodePresenter(); - yield return new PipingFailureMechanismNodePresenter() + yield return new PipingFailureMechanismNodePresenter { - RunActivityAction = Gui.ActivityRunner.Enqueue, + RunActivitiesAction = ActivityProgressDialogRunner.Run, ContextMenuBuilderProvider = Gui.ContextMenuProvider }; yield return new PipingSurfaceLineCollectionNodePresenter