a few refactorings

Author: mehdy-karimpour

Signum.Engine.Extensions/Workflow/WorkflowNodeGraph.cs

@@ -224,21 +224,7 @@ public void Validate(List<WorkflowIssue> issuesContainer, Action<WorkflowGateway
 
             if (e.Type.IsTimer())
             {
-                if (e.Type == WorkflowEventType.BoundaryInterruptingTimer)
-                {
-                    var activity = Activities.GetOrThrow(e.BoundaryOf!);
-                    if (string.IsNullOrWhiteSpace(e.DecisionOptionName) && activity.Type == WorkflowActivityType.Decision)
-                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1ShouldHave2BecauseActivityIs3.NiceToString(e, activity, e.NicePropertyName(a => a.DecisionOptionName), WorkflowActivityType.Decision.NiceToString()));
-
-                    if (!string.IsNullOrWhiteSpace(e.DecisionOptionName) && activity.Type != WorkflowActivityType.Decision)
-                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1CanNotHave2BecauseActivityIsNot3.NiceToString(e, activity, e.NicePropertyName(a => a.DecisionOptionName), WorkflowActivityType.Decision.NiceToString()));
-
-                    if (!string.IsNullOrWhiteSpace(e.DecisionOptionName) && !activity.DecisionOptions.Any(a => a.Name == e.DecisionOptionName))
-                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1HasInvalid23.NiceToString(e, activity, e.NicePropertyName(a => a.DecisionOptionName), e.DecisionOptionName));
-                }
-
                 var boundaryOutput = NextConnections(e).Only();
-
                 if (boundaryOutput == null || boundaryOutput.Type != ConnectionType.Normal)
                 {
                     if (e.Type == WorkflowEventType.IntermediateTimer)
@@ -252,6 +238,19 @@ public void Validate(List<WorkflowIssue> issuesContainer, Action<WorkflowGateway
 
                 if (e.Type == WorkflowEventType.IntermediateTimer && !e.Name.HasText())
                     issues.AddError(e, WorkflowValidationMessage.IntermediateTimer0ShouldHaveName.NiceToString(e));
+
+                if (e.Type == WorkflowEventType.BoundaryInterruptingTimer)
+                {
+                    var parentActivity = Activities.Values.Where(a => a.BoundaryTimers.Contains(e)).SingleEx();
+                    if (string.IsNullOrWhiteSpace(e.DecisionOptionName) && parentActivity.Type == WorkflowActivityType.Decision)
+                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1ShouldHave2BecauseActivityIs3.NiceToString(e, parentActivity, e.NicePropertyName(a => a.DecisionOptionName), WorkflowActivityType.Decision.NiceToString()));
+
+                    if (!string.IsNullOrWhiteSpace(e.DecisionOptionName) && parentActivity.Type != WorkflowActivityType.Decision)
+                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1CanNotHave2BecauseActivityIsNot3.NiceToString(e, parentActivity, e.NicePropertyName(a => a.DecisionOptionName), WorkflowActivityType.Decision.NiceToString()));
+
+                    if (!string.IsNullOrWhiteSpace(e.DecisionOptionName) && !parentActivity.DecisionOptions.Any(a => a.Name == e.DecisionOptionName))
+                        issues.AddError(e, WorkflowValidationMessage.BoundaryTimer0OfActivity1HasInvalid23.NiceToString(e, parentActivity, e.NicePropertyName(a => a.DecisionOptionName), e.DecisionOptionName));
+                }
             }
         });