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=9f2c9dbeabb5bf4c9717635f080f3ee1816153fa;hb=a050d4c27325c65fc04e7eed5b63b5f8ea117df0;hp=20c3c7c4a28ab312a268f7d4ac3dfe7401f31b3e;hpb=a0a151ee3a0aed29a3cb03d81e35d540ca9fdb03;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 20c3c7c4a..9f2c9dbea 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 @@ -27,12 +27,10 @@ import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionSpec; import org.argeo.slc.execution.ExecutionSpecAttribute; import org.springframework.beans.factory.BeanNameAware; -import org.springframework.beans.factory.InitializingBean; import org.springframework.validation.MapBindingResult; /** Default implementation of an execution flow. */ -public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, - BeanNameAware { +public class DefaultExecutionFlow implements ExecutionFlow, BeanNameAware { private final static Log log = LogFactory .getLog(DefaultExecutionFlow.class); @@ -41,8 +39,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, private Map parameters = new HashMap(); private List executables = new ArrayList(); - private String path; - private Boolean failOnError = true; public DefaultExecutionFlow() { @@ -136,28 +132,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, runnable.run(); } - public void afterPropertiesSet() throws Exception { - if (path == null) { - if (name.charAt(0) == '/') { - path = name.substring(0, name.lastIndexOf('/')); - } - } - - if (path != null) { - for (Runnable executable : executables) { - if (executable instanceof DefaultExecutionFlow) { - // so we don't need to have DefaultExecutionFlow - // implementing StructureAware - // FIXME: probably has side effects - DefaultExecutionFlow flow = (DefaultExecutionFlow) executable; - String newPath = path + '/' + flow.getName(); - flow.setPath(newPath); - log.warn(newPath + " was forcibly set on " + flow); - } - } - } - } - public void setBeanName(String name) { this.name = name; } @@ -221,12 +195,9 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, return name.hashCode(); } - public String getPath() { - return path; - } - + /** @deprecated does nothing */ + @Deprecated public void setPath(String path) { - this.path = path; } public Boolean getFailOnError() {