X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.runtime%2Fsrc%2Forg%2Fargeo%2Fslc%2Fruntime%2FDefaultExecutionStack.java;h=fd0f1f76f214ea7b4170603d2200bcc40f0bd41f;hb=09c9e5093fe1353aaac344ac8a8caf2e1dcc0778;hp=9b5460bd995f8f9a1139fff110930147eba46663;hpb=fbde11e8a342318876a4744c4676d3618bdf8583;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java
index 9b5460bd9..fd0f1f76f 100644
--- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java
+++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java
@@ -5,30 +5,23 @@ import java.util.Map;
 import java.util.Stack;
 import java.util.UUID;
 
-import org.argeo.api.cms.CmsLog;
-import org.argeo.slc.SlcException;
-import org.argeo.slc.execution.ExecutionFlow;
-import org.argeo.slc.execution.ExecutionSpecAttribute;
-import org.argeo.slc.execution.ExecutionStack;
+import org.argeo.api.slc.SlcException;
+import org.argeo.api.slc.execution.ExecutionFlow;
+import org.argeo.api.slc.execution.ExecutionSpecAttribute;
+import org.argeo.api.slc.execution.ExecutionStack;
 
 /** Canonical implementation of an execution stack. */
 public class DefaultExecutionStack implements ExecutionStack {
-
-	private final static CmsLog log = CmsLog
-			.getLog(DefaultExecutionStack.class);
-
 	private final Stack<ExecutionFlowRuntime> stack = new Stack<ExecutionFlowRuntime>();
 
 	public synchronized void enterFlow(ExecutionFlow executionFlow) {
 		ExecutionFlowRuntime runtime = new ExecutionFlowRuntime(executionFlow);
 		stack.push(runtime);
 
-		Map<String, ExecutionSpecAttribute> specAttrs = executionFlow
-				.getExecutionSpec().getAttributes();
+		Map<String, ExecutionSpecAttribute> specAttrs = executionFlow.getExecutionSpec().getAttributes();
 		for (String key : specAttrs.keySet()) {
 			if (executionFlow.isSetAsParameter(key)) {
-				runtime.getLocalVariables().put(key,
-						executionFlow.getParameter(key));
+				runtime.getLocalVariables().put(key, executionFlow.getParameter(key));
 			}
 		}
 	}
@@ -60,10 +53,8 @@ public class DefaultExecutionStack implements ExecutionStack {
 	public synchronized void leaveFlow(ExecutionFlow executionFlow) {
 		ExecutionFlowRuntime leftEf = stack.pop();
 
-		if (!leftEf.getExecutionFlow().getName()
-				.equals(executionFlow.getName()))
-			throw new SlcException("Asked to leave " + executionFlow
-					+ " but last is " + leftEf);
+		if (!leftEf.getExecutionFlow().getName().equals(executionFlow.getName()))
+			throw new SlcException("Asked to leave " + executionFlow + " but last is " + leftEf);
 
 		leftEf.getScopedObjects().clear();
 		leftEf.getLocalVariables().clear();
@@ -72,12 +63,12 @@ public class DefaultExecutionStack implements ExecutionStack {
 	public synchronized void addScopedObject(String name, Object obj) {
 		ExecutionFlowRuntime runtime = stack.peek();
 		// TODO: check that the object is not set yet ?
-		if (log.isDebugEnabled()) {
-			Object existing = findScopedObject(name);
-			if (existing != null)
-				log.warn("Scoped object " + name + " of type " + obj.getClass()
-						+ " already registered in " + runtime);
-		}
+//		if (log.isDebugEnabled()) {
+//			Object existing = findScopedObject(name);
+//			if (existing != null)
+//				log.warn("Scoped object " + name + " of type " + obj.getClass()
+//						+ " already registered in " + runtime);
+//		}
 		runtime.getScopedObjects().put(name, obj);
 	}