Index: src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj
===================================================================
diff -u -r322d4b0df95dac67f7d5797dd9daf9ce9a19ea90 -r8702d012630646100a38f3e7f3e8ea3dd9749718
--- src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj (.../DelftTools.Shell.Core.csproj) (revision 322d4b0df95dac67f7d5797dd9daf9ce9a19ea90)
+++ src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj (.../DelftTools.Shell.Core.csproj) (revision 8702d012630646100a38f3e7f3e8ea3dd9749718)
@@ -155,7 +155,6 @@
-
Component
Index: src/Common/DelftTools.Shell.Core/Extensions/CompositeActivityExtensions.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r8702d012630646100a38f3e7f3e8ea3dd9749718
--- src/Common/DelftTools.Shell.Core/Extensions/CompositeActivityExtensions.cs (.../CompositeActivityExtensions.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Shell.Core/Extensions/CompositeActivityExtensions.cs (.../CompositeActivityExtensions.cs) (revision 8702d012630646100a38f3e7f3e8ea3dd9749718)
@@ -1,32 +1,10 @@
using System.Collections.Generic;
-using System.Linq;
using DelftTools.Shell.Core.Workflow;
namespace DelftTools.Shell.Core.Extensions
{
public static class CompositeActivityExtensions
{
- ///
- /// Get activities in this composition, that according to the currently selected workflow, run simultaneous with the given target activity.
- /// Note: Simultaneous = parallel
- ///
- ///
- ///
- ///
- public static IEnumerable GetActivitiesRunningSimultaneous(this ICompositeActivity compositeModel, IActivity targetActivity)
- {
- var workflow = compositeModel.CurrentWorkflow ?? compositeModel; //if compositeModel is already a workflow, this also works fine
-
- var parentActivity = GetParentActivity(workflow, targetActivity);
-
- //we make the assumption here that all other composite activities run parallel
- if (parentActivity != null && !(parentActivity is SequentialActivity))
- {
- return parentActivity.Activities.Select(UnwrapActivity).Where(a => a != targetActivity);
- }
- return new IActivity[0];
- }
-
public static IEnumerable GetAllActivitiesRecursive(this ICompositeActivity compositeModel) where T : IActivity
{
if (compositeModel is T)
@@ -58,26 +36,26 @@
{
var compositeWorkflow = workflow as ICompositeActivity;
if (compositeWorkflow == null)
+ {
return null;
+ }
foreach (var a in compositeWorkflow.Activities)
{
- var activity = UnwrapActivity(a);
-
- if (activity == targetActivity)
+ if (a == targetActivity)
+ {
return compositeWorkflow;
+ }
- var parent = GetParentActivity(activity, targetActivity);
+ var parent = GetParentActivity(a, targetActivity);
if (parent != null)
+ {
return parent;
+ }
}
+
return null;
}
-
- private static IActivity UnwrapActivity(IActivity activity)
- {
- return activity is ActivityWrapper ? ((ActivityWrapper) activity).Activity : activity;
- }
}
}
\ No newline at end of file
Fisheye: Tag 8702d012630646100a38f3e7f3e8ea3dd9749718 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Workflow/ActivityWrapper.cs'.
Fisheye: No comparison available. Pass `N' to diff?