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=1f4601c840b361773510505362c8392647b456a7;hb=a75c0516aca20f9a8c8fdd32feee402257ff2b61;hp=afb6ddbd2b8c72f4e955ded044fb0726dbc9f22e;hpb=24d560ee846fda5d7954d44f83cb22ab449dbe61;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 afb6ddbd2..1f4601c84 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
@@ -24,14 +23,9 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
-import org.argeo.slc.structure.StructureAware;
-import org.argeo.slc.structure.StructureRegistry;
-import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.validation.MapBindingResult;
@@ -48,7 +42,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	private List<Runnable> executables = new ArrayList<Runnable>();
 
 	private String path;
-	private StructureRegistry<TreeSPath> registry = new TreeSRegistry();
 
 	private Boolean failOnError = true;
 
@@ -143,7 +136,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		runnable.run();
 	}
 
-	@SuppressWarnings(value = { "unchecked" })
 	public void afterPropertiesSet() throws Exception {
 		if (path == null) {
 			if (name.charAt(0) == '/') {
@@ -153,11 +145,7 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 
 		if (path != null) {
 			for (Runnable executable : executables) {
-				if (executable instanceof StructureAware
-						&& !(executable instanceof ScopedObject)) {
-					((StructureAware<TreeSPath>) executable).notifyCurrentPath(
-							registry, new TreeSPath(path));
-				} else if (executable instanceof DefaultExecutionFlow) {
+				if (executable instanceof DefaultExecutionFlow) {
 					// so we don't need to have DefaultExecutionFlow
 					// implementing StructureAware
 					// FIXME: probably has side effects
@@ -241,10 +229,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		this.path = path;
 	}
 
-	public void setRegistry(StructureRegistry<TreeSPath> registry) {
-		this.registry = registry;
-	}
-
 	public Boolean getFailOnError() {
 		return failOnError;
 	}