merged 1.1 branch into head

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

diff --git a/source/mir/producer/ProducerNodeDecorator.java b/source/mir/producer/ProducerNodeDecorator.java
index 747d9ee..14dbe56 100755 (executable)
--- a/source/mir/producer/ProducerNodeDecorator.java
+++ b/source/mir/producer/ProducerNodeDecorator.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.
  *
@@ -18,37 +18,31 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * 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 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * 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
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mir.producer;
 
-import java.util.Map;
-
-import mir.log.LoggerWrapper;
-
-public class ProducerNodeDecorator implements ProducerNode {
+public abstract class ProducerNodeDecorator implements ProducerNode {
   private ProducerNode slave;
 
   protected ProducerNodeDecorator(ProducerNode aSlave) {
     slave = aSlave;
   }
 
-  protected boolean isAborted(Map aValueMap) {
-    Object producerValue = aValueMap.get(NodedProducer.PRODUCER_KEY);
+  protected boolean isAborted(ProductionContext aProductionContext) {
     return (
-       (producerValue instanceof NodedProducer) &&
-      ((NodedProducer) producerValue).getIsAborted());
+       (aProductionContext.getProducer() instanceof NodedProducer) &&
+      ((NodedProducer) aProductionContext.getProducer()).getIsAborted());
   }
 
-  public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure, ProducerExc {
-    if (slave!=null)
-      slave.produce(aValueMap, aVerb, aLogger);
+  public void produce(ProductionContext aProductionContext) throws ProducerExc, ProducerFailure {
+    if (slave!=null) {
+      slave.produce(aProductionContext);
+    }
   }
 }
\ No newline at end of file