X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionSpec.java;h=203a12430478d7c225429eccd2b3f4370cdacf72;hb=53146ebdda3a7c0c217c44d395d270a7e9d045be;hp=6c46248419f0f801540be2c0ce027910713ba62b;hpb=9b2cc129a29b7446e2aa429a562ecb4e0f2142b7;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java index 6c4624841..203a12430 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java @@ -2,6 +2,7 @@ package org.argeo.slc.core.execution; import java.util.HashMap; import java.util.Map; +import java.util.Stack; import java.util.UUID; import org.apache.commons.logging.Log; @@ -15,8 +16,8 @@ import org.springframework.beans.factory.BeanNameAware; public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware { private final static Log log = LogFactory .getLog(DefaultExecutionSpec.class); - - private final static ThreadLocal initializingFlow = new ThreadLocal(); + +// private final static ThreadLocal > flowStack = new ThreadLocal >(); private Map attributes = new HashMap(); @@ -30,25 +31,6 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware { this.attributes = attributes; } - public Object createRef(String name) { - ExecutionFlow flow = initializingFlow.get(); - if (flow == null) - throw new SlcException("No flow is currently initializing." - + " Declare flow refs as inner beans or prototypes."); - /* - * RefSpecAttribute refSpecAttribute = (RefSpecAttribute) attributes - * .get(name); Class targetClass = refSpecAttribute.getTargetClass(); - * ExecutionTargetSource targetSource = new ExecutionTargetSource(flow, - * targetClass, name); ProxyFactory proxyFactory = new ProxyFactory(); - * proxyFactory.setTargetClass(targetClass); - * proxyFactory.setProxyTargetClass(true); - * proxyFactory.setTargetSource(targetSource); - * - * return proxyFactory.getProxy(); - */ - return flow.getParameter(name); - } - public void setBeanName(String name) { this.name = name; } @@ -57,37 +39,6 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware { return name; } - // FLOWS INITIALIZATION SUPPORT - - public static void flowInitializationStarted(ExecutionFlow flow) { - if (log.isTraceEnabled()) - log.trace("Start initialization of " + flow.hashCode() + " (" - + flow + " - " + flow.getClass() + ")"); - initializingFlow.set(flow); - } - - public static void flowInitializationFinished(ExecutionFlow flow) { - if (log.isTraceEnabled()) - log.trace("Finish initialization of " + flow.hashCode() + " (" - + flow + " - " + flow.getClass() + ")"); - ExecutionFlow registeredFlow = initializingFlow.get(); - if (registeredFlow != null) { - if (!flow.getName().equals(registeredFlow.getName())) - throw new SlcException("Current flow is " + flow); - initializingFlow.set(null); - } - } - - public static Object getInitializingFlowParameter(String key) { - if (initializingFlow.get() == null) - throw new SlcException("No initializing flow available."); - return initializingFlow.get().getParameter(key); - } - - public static Boolean isInFlowInitialization() { - return initializingFlow.get() != null; - } - public boolean equals(Object obj) { return ((ExecutionSpec) obj).getName().equals(name); }