X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FAbstractExecutionModulesManager.java;h=1a07313f002273ff234f39c888760e9e1d685b6b;hb=8c588d3128b3885ac4fe0a0d2fbd358640d336a5;hp=f471d65ca4dea76c2688e9e5984b5c49a217ed60;hpb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
index f471d65ca..1a07313f0 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.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,11 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.core.execution;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -25,21 +22,17 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.execution.ExecutionContext;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionFlowDescriptorConverter;
-import org.argeo.slc.execution.ExecutionModulesListener;
 import org.argeo.slc.execution.ExecutionModulesManager;
-import org.argeo.slc.process.RealizedFlow;
-import org.argeo.slc.process.SlcExecution;
-import org.argeo.slc.process.SlcExecutionNotifier;
+import org.argeo.slc.execution.RealizedFlow;
 
+/** Provides the base feature of an execution module manager. */
 public abstract class AbstractExecutionModulesManager implements
 		ExecutionModulesManager {
 	private final static Log log = LogFactory
 			.getLog(AbstractExecutionModulesManager.class);
 
-	private List<SlcExecutionNotifier> slcExecutionNotifiers = new ArrayList<SlcExecutionNotifier>();
-	private List<ExecutionModulesListener> executionModulesListeners = new ArrayList<ExecutionModulesListener>();
-
-	private ThreadGroup processesThreadGroup = new ThreadGroup("Processes");
+//	private List<FilteredNotifier> filteredNotifiers = Collections
+//			.synchronizedList(new ArrayList<FilteredNotifier>());
 
 	protected abstract ExecutionFlow findExecutionFlow(String moduleName,
 			String moduleVersion, String flowName);
@@ -50,10 +43,6 @@ public abstract class AbstractExecutionModulesManager implements
 	protected abstract ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter(
 			String moduleName, String moduleVersion);
 
-	public void process(SlcExecution slcExecution) {
-		new ProcessThread(this, slcExecution).start();
-	}
-
 	public void execute(RealizedFlow realizedFlow) {
 		if (log.isTraceEnabled())
 			log.trace("Executing " + realizedFlow);
@@ -81,26 +70,88 @@ public abstract class AbstractExecutionModulesManager implements
 		//
 	}
 
-	public void setSlcExecutionNotifiers(
-			List<SlcExecutionNotifier> slcExecutionNotifiers) {
-		this.slcExecutionNotifiers = slcExecutionNotifiers;
-	}
-
-	public List<SlcExecutionNotifier> getSlcExecutionNotifiers() {
-		return slcExecutionNotifiers;
-	}
-
-	public ThreadGroup getProcessesThreadGroup() {
-		return processesThreadGroup;
-	}
-
-	public List<ExecutionModulesListener> getExecutionModulesListeners() {
-		return executionModulesListeners;
-	}
-
-	public void setExecutionModulesListeners(
-			List<ExecutionModulesListener> executionModulesListeners) {
-		this.executionModulesListeners = executionModulesListeners;
-	}
-
+//	public void dispatchUpdateStatus(ExecutionProcess process,
+//			String oldStatus, String newStatus) {
+//		// filtered notifiers
+//		for (Iterator<FilteredNotifier> it = filteredNotifiers.iterator(); it
+//				.hasNext();) {
+//			FilteredNotifier filteredNotifier = it.next();
+//			if (filteredNotifier.receiveFrom(process))
+//				filteredNotifier.getNotifier().updateStatus(process, oldStatus,
+//						newStatus);
+//		}
+//
+//	}
+
+//	public void dispatchAddSteps(ExecutionProcess process,
+//			List<ExecutionStep> steps) {
+//		process.addSteps(steps);
+//		for (Iterator<FilteredNotifier> it = filteredNotifiers.iterator(); it
+//				.hasNext();) {
+//			FilteredNotifier filteredNotifier = it.next();
+//			if (filteredNotifier.receiveFrom(process))
+//				filteredNotifier.getNotifier().addSteps(process, steps);
+//		}
+//	}
+
+//	public void registerProcessNotifier(ExecutionProcessNotifier notifier,
+//			Map<String, String> properties) {
+//		filteredNotifiers.add(new FilteredNotifier(notifier, properties));
+//	}
+//
+//	public void unregisterProcessNotifier(ExecutionProcessNotifier notifier,
+//			Map<String, String> properties) {
+//		filteredNotifiers.remove(notifier);
+//	}
+
+//	protected class FilteredNotifier {
+//		private final ExecutionProcessNotifier notifier;
+//		private final String processId;
+//
+//		public FilteredNotifier(ExecutionProcessNotifier notifier,
+//				Map<String, String> properties) {
+//			super();
+//			this.notifier = notifier;
+//			if (properties == null)
+//				properties = new HashMap<String, String>();
+//			if (properties.containsKey(SLC_PROCESS_ID))
+//				processId = properties.get(SLC_PROCESS_ID);
+//			else
+//				processId = null;
+//		}
+//
+//		/**
+//		 * Whether event from this process should be received by this listener.
+//		 */
+//		public Boolean receiveFrom(ExecutionProcess process) {
+//			if (processId != null)
+//				if (process.getUuid().equals(processId))
+//					return true;
+//				else
+//					return false;
+//			return true;
+//		}
+//
+//		@Override
+//		public int hashCode() {
+//			return notifier.hashCode();
+//		}
+//
+//		@Override
+//		public boolean equals(Object obj) {
+//			if (obj instanceof FilteredNotifier) {
+//				FilteredNotifier fn = (FilteredNotifier) obj;
+//				return notifier.equals(fn.notifier);
+//			} else if (obj instanceof ExecutionProcessNotifier) {
+//				ExecutionProcessNotifier epn = (ExecutionProcessNotifier) obj;
+//				return notifier.equals(epn);
+//			} else
+//				return false;
+//		}
+//
+//		public ExecutionProcessNotifier getNotifier() {
+//			return notifier;
+//		}
+//
+//	}
 }