refactor and clean of the distribution view model.

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / AbstractExecutionModulesManager.java

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 cf44981cdb51c7b74f68c801e577e117378559ef..1a07313f002273ff234f39c888760e9e1d685b6b 100644 (file)
--- 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
@@ -15,11 +15,6 @@
  */
 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;
@@ -28,9 +23,6 @@ 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.execution.RealizedFlow;
 
 /** Provides the base feature of an execution module manager. */
@@ -39,8 +31,8 @@ public abstract class AbstractExecutionModulesManager implements
        private final static Log log = LogFactory
                        .getLog(AbstractExecutionModulesManager.class);
 
-       private List<FilteredNotifier> filteredNotifiers = Collections
-                       .synchronizedList(new ArrayList<FilteredNotifier>());
+//     private List<FilteredNotifier> filteredNotifiers = Collections
+//                     .synchronizedList(new ArrayList<FilteredNotifier>());
 
        protected abstract ExecutionFlow findExecutionFlow(String moduleName,
                        String moduleVersion, String flowName);
@@ -78,88 +70,88 @@ public abstract class AbstractExecutionModulesManager implements
                //
        }
 
-       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;
-               }
-
-       }
+//     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;
+//             }
+//
+//     }
 }