Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs
===================================================================
diff -u -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -125,15 +125,6 @@
}
///
- /// Looks up a localized string similar to Opschonen van {0} is mislukt..
- ///
- internal static string ActivityRunner_RunActivity_Clean_up_of_0_has_failed {
- get {
- return ResourceManager.GetString("ActivityRunner_RunActivity_Clean_up_of_0_has_failed", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Uitvoering van {0} is geannuleerd..
///
internal static string ActivityRunner_RunActivity_Execution_of_0_has_been_canceled {
Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx
===================================================================
diff -u -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -150,9 +150,6 @@
Afronden van {0} is mislukt.
-
- Opschonen van {0} is mislukt.
-
Stap {0} van {1} | {2}
Index: Core/Common/src/Core.Common.Base/Workflow/Activity.cs
===================================================================
diff -u -r6917dbadda57c0b4b3e4f679e229585b584c8579 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Core/Common/src/Core.Common.Base/Workflow/Activity.cs (.../Activity.cs) (revision 6917dbadda57c0b4b3e4f679e229585b584c8579)
+++ Core/Common/src/Core.Common.Base/Workflow/Activity.cs (.../Activity.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -75,50 +75,26 @@
throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Execution_of_0_has_failed, Name));
}
}
-
- if (Status != ActivityStatus.Cancelled)
- {
- Finish();
-
- if (Status == ActivityStatus.Failed)
- {
- throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Finishing_of_0_has_failed, Name));
- }
- }
-
- Cleanup();
-
- if (Status == ActivityStatus.Failed)
- {
- throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Clean_up_of_0_has_failed, Name));
- }
}
catch (Exception exception)
{
- Console.WriteLine(exception.Message); //for build server debugging
log.Error(exception.Message);
}
- finally
- {
- try
- {
- if (Status != ActivityStatus.Cleaned)
- {
- Cleanup();
- }
- }
- catch (Exception)
- {
- log.ErrorFormat(Resources.ActivityRunner_RunActivity_Clean_up_of_0_has_failed, Name);
- }
- }
}
public void Cancel()
{
ChangeState(OnCancel, ActivityStatus.Cancelling, ActivityStatus.Cancelled);
}
+ public void Finish()
+ {
+ if (Status != ActivityStatus.Failed && Status != ActivityStatus.Cancelled)
+ {
+ ChangeState(OnFinish, ActivityStatus.Finishing, ActivityStatus.Finished);
+ }
+ }
+
protected void Initialize()
{
ChangeState(OnInitialize, ActivityStatus.Initializing, ActivityStatus.Initialized);
@@ -161,23 +137,6 @@
Status = ActivityStatus.Executed;
}
- protected void Cleanup()
- {
- if (Status != ActivityStatus.Cancelled || Status != ActivityStatus.Failed)
- {
- ChangeState(OnCleanUp, ActivityStatus.Cleaning, ActivityStatus.Cleaned);
- }
- else
- {
- ChangeState(OnCleanUp, Status, Status);
- }
- }
-
- protected void Finish()
- {
- ChangeState(OnFinish, ActivityStatus.Finishing, ActivityStatus.Finished);
- }
-
protected void OnProgressChanged()
{
if (ProgressChanged != null)
@@ -220,11 +179,6 @@
///
protected abstract void OnCancel();
- ///
- /// Performs clean-up of all internal resources.
- ///
- protected abstract void OnCleanUp();
-
private void ChangeState(Action transitionAction, ActivityStatus statusBefore, ActivityStatus statusAfter)
{
try
Index: Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs
===================================================================
diff -u -rce2e304f83d6a176ca073257ddc95c293e2c2ea7 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision ce2e304f83d6a176ca073257ddc95c293e2c2ea7)
+++ Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -63,8 +63,6 @@
importer.ShouldCancel = true;
}
- protected override void OnCleanUp() {}
-
protected override void OnFinish() {}
public override string Name
Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs
===================================================================
diff -u -r6917dbadda57c0b4b3e4f679e229585b584c8579 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 6917dbadda57c0b4b3e4f679e229585b584c8579)
+++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -85,8 +85,18 @@
}
}, cancellationToken);
- // Close the dialog when all activities are ran
- progressReporter.RegisterContinuation(task, Close);
+ // Afterwards, perform actions that (might) affect the UI thread
+ progressReporter.RegisterContinuation(task, () =>
+ {
+ // Finish all activities
+ foreach (var activity in activities)
+ {
+ activity.Finish();
+ }
+
+ // Close the dialog
+ Close();
+ });
}
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs
===================================================================
diff -u -r6917dbadda57c0b4b3e4f679e229585b584c8579 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs (.../ActivityTest.cs) (revision 6917dbadda57c0b4b3e4f679e229585b584c8579)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs (.../ActivityTest.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -60,11 +60,6 @@
OnCancelInjection();
}
- protected override void OnCleanUp()
- {
- throw new NotImplementedException();
- }
-
protected override void OnFinish()
{
throw new NotImplementedException();
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -re62cceb52b0c086a17e685690a44ec02185bac86 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision e62cceb52b0c086a17e685690a44ec02185bac86)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -183,8 +183,6 @@
protected override void OnCancel() {}
- protected override void OnCleanUp() {}
-
protected override void OnFinish() {}
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs
===================================================================
diff -u -r6917dbadda57c0b4b3e4f679e229585b584c8579 -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision 6917dbadda57c0b4b3e4f679e229585b584c8579)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -50,11 +50,6 @@
// Unable to cancel a running kernel, so nothing can be done.
}
- protected override void OnCleanUp()
- {
- // Nothing to clean up.
- }
-
protected override void OnFinish()
{
calculation.NotifyObservers();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs
===================================================================
diff -u -rb1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision b1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -626,7 +626,11 @@
var nodePresenter = new PipingCalculationContextNodePresenter
{
- RunActivityAction = activity => activity.Run(),
+ RunActivityAction = activity =>
+ {
+ activity.Run();
+ activity.Finish();
+ },
ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mockRepository, treeNodeMock, true)
};
@@ -743,7 +747,11 @@
var contextMenuAdapter = nodePresenter.GetContextMenu(treeNodeMock, new PipingCalculationContext(calculation,
Enumerable.Empty(),
Enumerable.Empty()));
- nodePresenter.RunActivityAction = activity => activity.Run();
+ nodePresenter.RunActivityAction = activity =>
+ {
+ activity.Run();
+ activity.Finish();
+ };
// When
Action action = () =>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r5353e1a879e548055b8d20e357617f90b9289e6a -rb459e67e645683509bed0eb854c2157e1ca12bba
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 5353e1a879e548055b8d20e357617f90b9289e6a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision b459e67e645683509bed0eb854c2157e1ca12bba)
@@ -130,7 +130,7 @@
activity.PerformExecute();
// Call
- activity.PerformFinish();
+ activity.Finish();
// Assert
mocks.VerifyAll();
@@ -149,11 +149,6 @@
{
Execute();
}
-
- public void PerformFinish()
- {
- Finish();
- }
}
}
}
\ No newline at end of file