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=d1298659fe6f179d1cbbc8c89f108a0bbc5b4edf;hp=b3d92ae69aad4d9bf6ae605e56569ed512d79197;hpb=24d560ee846fda5d7954d44f83cb22ab449dbe61;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 b3d92ae69..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 + * 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,14 +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.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; @@ -29,23 +23,16 @@ import org.argeo.slc.execution.ExecutionContext; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionFlowDescriptorConverter; import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.execution.ExecutionProcess; -import org.argeo.slc.execution.ExecutionProcessNotifier; -import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.process.RealizedFlow; -import org.argeo.slc.process.SlcExecutionNotifier; +import org.argeo.slc.execution.RealizedFlow; /** Provides the base feature of an execution module manager. */ -@SuppressWarnings("deprecation") public abstract class AbstractExecutionModulesManager implements ExecutionModulesManager { private final static Log log = LogFactory .getLog(AbstractExecutionModulesManager.class); - private List slcExecutionNotifiers = new ArrayList(); - - private List filteredNotifiers = Collections - .synchronizedList(new ArrayList()); +// private List filteredNotifiers = Collections +// .synchronizedList(new ArrayList()); protected abstract ExecutionFlow findExecutionFlow(String moduleName, String moduleVersion, String flowName); @@ -83,107 +70,88 @@ public abstract class AbstractExecutionModulesManager implements // } - public void dispatchUpdateStatus(ExecutionProcess process, - String oldStatus, String newStatus) { - // generic notifiers (notified of everything) - for (Iterator it = getSlcExecutionNotifiers() - .iterator(); it.hasNext();) { - it.next().updateStatus(process, oldStatus, newStatus); - } - - // filtered notifiers - for (Iterator 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 steps) { - for (Iterator it = getSlcExecutionNotifiers() - .iterator(); it.hasNext();) { - it.next().addSteps(process, steps); - } - - for (Iterator it = filteredNotifiers.iterator(); it - .hasNext();) { - FilteredNotifier filteredNotifier = it.next(); - if (filteredNotifier.receiveFrom(process)) - filteredNotifier.getNotifier().addSteps(process, steps); - } - } - - public void registerProcessNotifier(ExecutionProcessNotifier notifier, - Map properties) { - filteredNotifiers.add(new FilteredNotifier(notifier, properties)); - } - - public void unregisterProcessNotifier(ExecutionProcessNotifier notifier, - Map properties) { - filteredNotifiers.remove(notifier); - } - - public void setSlcExecutionNotifiers( - List slcExecutionNotifiers) { - this.slcExecutionNotifiers = slcExecutionNotifiers; - } - - private List getSlcExecutionNotifiers() { - return slcExecutionNotifiers; - } - - protected class FilteredNotifier { - private final ExecutionProcessNotifier notifier; - private final String processId; - - public FilteredNotifier(ExecutionProcessNotifier notifier, - Map properties) { - super(); - this.notifier = notifier; - if (properties == null) - properties = new HashMap(); - 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; - } - - } +// public void dispatchUpdateStatus(ExecutionProcess process, +// String oldStatus, String newStatus) { +// // filtered notifiers +// for (Iterator 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 steps) { +// process.addSteps(steps); +// for (Iterator it = filteredNotifiers.iterator(); it +// .hasNext();) { +// FilteredNotifier filteredNotifier = it.next(); +// if (filteredNotifier.receiveFrom(process)) +// filteredNotifier.getNotifier().addSteps(process, steps); +// } +// } + +// public void registerProcessNotifier(ExecutionProcessNotifier notifier, +// Map properties) { +// filteredNotifiers.add(new FilteredNotifier(notifier, properties)); +// } +// +// public void unregisterProcessNotifier(ExecutionProcessNotifier notifier, +// Map properties) { +// filteredNotifiers.remove(notifier); +// } + +// protected class FilteredNotifier { +// private final ExecutionProcessNotifier notifier; +// private final String processId; +// +// public FilteredNotifier(ExecutionProcessNotifier notifier, +// Map properties) { +// super(); +// this.notifier = notifier; +// if (properties == null) +// properties = new HashMap(); +// 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; +// } +// +// } }