X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionFlow.java;h=a25034e347a3e4dee381b9a2f0819102e91212f7;hb=2e5b26763f0e44d4be7c302aebcb759726de4d1f;hp=7fd07fe770ff32c1d28a94be1c21500cd067be4d;hpb=08aa02f96eb32a6e1f0cc001113df9311a618eb9;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
index 7fd07fe77..a25034e34 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
@@ -18,7 +18,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.validation.MapBindingResult;
 
 public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
-		BeanNameAware, StructureAware<TreeSPath> {
+		BeanNameAware {
 
 	private final ExecutionSpec executionSpec;
 	private String name = null;
@@ -95,6 +95,11 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 				if (executable instanceof StructureAware) {
 					((StructureAware<TreeSPath>) executable).notifyCurrentPath(
 							registry, new TreeSPath(path));
+				} else if (executable instanceof DefaultExecutionFlow) {
+					// so we don't need to have DefaultExecutionFlow
+					// implementing StructureAware
+					DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
+					flow.setPath(path + '/' + flow.getName());
 				}
 			}
 		}
@@ -168,11 +173,4 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		this.registry = registry;
 	}
 
-	public void notifyCurrentPath(StructureRegistry<TreeSPath> registry,
-			TreeSPath path) {
-		if (this.path == null) {
-			this.path = path.toString();
-		}
-	}
-
 }