Index: Core/Common/src/Core.Common.Base/ApplicationCore.cs =================================================================== diff -u -r74cd6b0f11758d33e1cb86f971dbc0ab59d89221 -r1a47b9ae4db84a33676a0147fca0ec810e6320ef --- Core/Common/src/Core.Common.Base/ApplicationCore.cs (.../ApplicationCore.cs) (revision 74cd6b0f11758d33e1cb86f971dbc0ab59d89221) +++ Core/Common/src/Core.Common.Base/ApplicationCore.cs (.../ApplicationCore.cs) (revision 1a47b9ae4db84a33676a0147fca0ec810e6320ef) @@ -14,8 +14,6 @@ private readonly ActivityRunner activityRunner; private readonly List plugins; - public Action WaitMethod; - private ApplicationCoreSettings userSettings; public ApplicationCore() @@ -120,11 +118,6 @@ applicationPlugin.Deactivate(); } - public void SaveProjectAs(string path) - { - // TODO: implement - } - public void Exit() { if (userSettings.IsDirty) @@ -133,43 +126,6 @@ } } - public bool IsActivityRunning() - { - return ActivityRunner.IsRunning; - } - - public void RunActivity(IActivity activity) - { - if (WaitMethod == null) //typically in console - { - Workflow.ActivityRunner.RunActivity(activity); //run sync - return; - } - - RunActivityInBackground(activity); - while (ActivityRunner.IsRunningActivity(activity)) - { - WaitMethod(); - } - } - - public void RunActivityInBackground(IActivity activity) - { - ActivityRunner.Enqueue(activity); - } - - public void StopActivity(IActivity activity) - { - ActivityRunner.Cancel(activity); - //CurrentActivities.Abort(activity); - activity.Cancel(); - } - - public bool IsActivityRunningOrWaiting(IActivity activity) - { - return ActivityRunner.Activities.Contains(activity); - } - public void Dispose() { foreach (var plugin in Plugins.ToList()) Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -r96ade40e5e48006c1969093078e9b43f1b210db3 -r1a47b9ae4db84a33676a0147fca0ec810e6320ef --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 96ade40e5e48006c1969093078e9b43f1b210db3) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 1a47b9ae4db84a33676a0147fca0ec810e6320ef) @@ -651,7 +651,7 @@ } var appHasProject = Gui.Project != null; - var isActivityRunning = Gui.ApplicationCore.IsActivityRunning(); + var isActivityRunning = Gui.ApplicationCore.ActivityRunner.IsRunning; // filemenu items dependent on existence of project and if processes are running /* Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs =================================================================== diff -u -r74cd6b0f11758d33e1cb86f971dbc0ab59d89221 -r1a47b9ae4db84a33676a0147fca0ec810e6320ef --- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 74cd6b0f11758d33e1cb86f971dbc0ab59d89221) +++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 1a47b9ae4db84a33676a0147fca0ec810e6320ef) @@ -544,7 +544,7 @@ return; } - if (!ApplicationCore.IsActivityRunning()) + if (!ApplicationCore.ActivityRunner.IsRunning) { ResumeUI(); } @@ -587,7 +587,7 @@ ApplicationCore.ActivityRunner.CancelAll(); // wait until all import activities are finished - while (ApplicationCore.IsActivityRunning()) + while (ApplicationCore.ActivityRunner.IsRunning) { System.Windows.Forms.Application.DoEvents(); } Index: Core/Common/test/Core.Common.Integration.Tests/Core.Common.Integration.Tests.csproj =================================================================== diff -u -r8ed458d0460c2bab956a7c3a75c2cdb5c1aae3e6 -r1a47b9ae4db84a33676a0147fca0ec810e6320ef --- Core/Common/test/Core.Common.Integration.Tests/Core.Common.Integration.Tests.csproj (.../Core.Common.Integration.Tests.csproj) (revision 8ed458d0460c2bab956a7c3a75c2cdb5c1aae3e6) +++ Core/Common/test/Core.Common.Integration.Tests/Core.Common.Integration.Tests.csproj (.../Core.Common.Integration.Tests.csproj) (revision 1a47b9ae4db84a33676a0147fca0ec810e6320ef) @@ -85,7 +85,6 @@ - Index: Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs =================================================================== diff -u -rd121feba5299c86d7ac04a366ee869b163e43ec7 -r1a47b9ae4db84a33676a0147fca0ec810e6320ef --- Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision d121feba5299c86d7ac04a366ee869b163e43ec7) +++ Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision 1a47b9ae4db84a33676a0147fca0ec810e6320ef) @@ -173,7 +173,6 @@ gui.Project.Items.Add(map); gui.CommandHandler.OpenView(map); } - applicationCore.SaveProjectAs(TestHelper.GetCurrentMethodName() + ".dsproj"); TestHelper.AssertIsFasterThan(200, gui.Exit); } Fisheye: Tag 1a47b9ae4db84a33676a0147fca0ec810e6320ef refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Common.Core/ApplicationCoreIntegrationTest.cs'. Fisheye: No comparison available. Pass `N' to diff?