merged 1.1 branch into head

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

diff --git a/source/mir/producer/LoopProducerNode.java b/source/mir/producer/LoopProducerNode.java
index 43dcbff..c30d374 100755 (executable)
--- a/source/mir/producer/LoopProducerNode.java
+++ b/source/mir/producer/LoopProducerNode.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,20 +18,15 @@
  * 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;
 import mir.util.ParameterExpander;
 
 
@@ -49,23 +44,22 @@ public class LoopProducerNode extends ProducerNodeDecorator {
     condition = aCondition;
   }
 
-
-  public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure {
+  public void produce(ProductionContext aProductionContext) throws ProducerFailure {
     int loopNr;
     int maxNrLoops;
 
     try {
       loopNr = 0;
-      maxNrLoops = ParameterExpander.evaluateIntegerExpressionWithDefault(aValueMap, limit, 1000);
-      while (ParameterExpander.evaluateBooleanExpression(aValueMap, condition) &&
-             (loopNr<maxNrLoops) &&
-             !isAborted(aValueMap)) {
-        super.produce(aValueMap, aVerb, aLogger);
+      maxNrLoops = ParameterExpander.evaluateIntegerExpressionWithDefault(aProductionContext.getValueSet(), limit, 1000);
+      while (ParameterExpander.evaluateBooleanExpression(aProductionContext.getValueSet(), condition) &&
+             (loopNr<maxNrLoops) && !isAborted(aProductionContext)) {
+        super.produce(aProductionContext);
+
         loopNr++;
       }
     }
     catch (Throwable t) {
-      aLogger.error("LoopProducerNode raised an exception: " + t.getMessage());
+      aProductionContext.getLogger().warn("LoopProducerNode raised an exception", t);
     }
-  };
+  }
 }
\ No newline at end of file