merged 1.1 branch into head

[mir.git] / source / mir / producer / CompositeProducerNode.java

diff --git a/source/mir/producer/CompositeProducerNode.java b/source/mir/producer/CompositeProducerNode.java
index 63fe79e..b50ca4e 100755 (executable)
--- a/source/mir/producer/CompositeProducerNode.java
+++ b/source/mir/producer/CompositeProducerNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -19,8 +19,6 @@
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
  * the code of this program with  any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
  * and distribute linked combinations including the two.  You must obey the
  * GNU General Public License in all respects for all of the code used other than
  * the above mentioned libraries.  If you modify this file, you may extend this
@@ -32,10 +30,11 @@ package mir.producer;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-
-import mir.log.LoggerWrapper;
 
+/**
+ * A <code>ProducerNode</code> that simply executes a
+ * list of <code>ProducerNode</code>s sequentially
+ */
 public class CompositeProducerNode implements ProducerNode {
   private List subNodes;
 
@@ -46,9 +45,7 @@ public class CompositeProducerNode implements ProducerNode {
   public CompositeProducerNode(ProducerNode[] aSubNodes) {
     this();
 
-    int i;
-
-    for (i=0; i<aSubNodes.length; i++) {
+    for (int i = 0; i<aSubNodes.length; i++) {
       addSubNode(aSubNodes[i]);
     }
   }
@@ -62,27 +59,26 @@ public class CompositeProducerNode implements ProducerNode {
   }
 
   public void addSubNode(ProducerNode aSubNode) {
-    if (aSubNode!=null)
+    if (aSubNode != null) {
       subNodes.add(aSubNode);
+    }
   }
 
   public void clear() {
     subNodes.clear();
   }
 
-  protected boolean isAborted(Map aValueMap) {
-    Object producerValue = aValueMap.get(NodedProducer.PRODUCER_KEY);
-    return (
-       (producerValue instanceof NodedProducer) &&
-      ((NodedProducer) producerValue).getIsAborted());
+  protected boolean isAborted(ProductionContext aProductionContext) {
+    return aProductionContext.getProducer() instanceof NodedProducer &&
+        ((NodedProducer) aProductionContext.getProducer()).getIsAborted();
   }
 
-  public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure, ProducerExc {
+  public void produce(ProductionContext aProductionContext) throws ProducerExc, ProducerFailure {
     Iterator i = subNodes.iterator();
 
-    while (i.hasNext() && !isAborted(aValueMap)) {
+    while (i.hasNext() && !isAborted(aProductionContext)) {
       ProducerNode node = (ProducerNode) i.next();
-      node.produce(aValueMap, aVerb, aLogger);
+      node.produce(aProductionContext);
     }
   }
 }
\ No newline at end of file