merged 1.1 branch into head

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

diff --git a/source/mir/producer/ConditionalProducerNode.java b/source/mir/producer/ConditionalProducerNode.java
index 20fb3f1..3c45ffb 100755 (executable)
--- a/source/mir/producer/ConditionalProducerNode.java
+++ b/source/mir/producer/ConditionalProducerNode.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,22 +18,24 @@
  * 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;
 
+/**
+ * <code>ProducerNode</code> for conditional constructs.
+ *
+ * <p>
+ * Based on an expression that will be evaluated as a boolean,
+ * one of 2 subnodes will be called.
+ */
 public class ConditionalProducerNode implements ProducerNode {
   private String condition;
   private ProducerNode trueNode;
@@ -45,15 +47,18 @@ public class ConditionalProducerNode implements ProducerNode {
     falseNode = aFalseNode;
   }
 
-  public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure {
+  /**
+   * {@inheritDoc}
+   */
+  public void produce(ProductionContext aProducerContext) throws ProducerExc, ProducerFailure {
     try {
-      if (ParameterExpander.evaluateBooleanExpression(aValueMap, condition)) {
+      if (ParameterExpander.evaluateBooleanExpression(aProducerContext.getValueSet(), condition)) {
         if (trueNode!=null)
-          trueNode.produce(aValueMap, aVerb, aLogger);
+          trueNode.produce(aProducerContext);
       }
       else {
         if (falseNode!=null)
-          falseNode.produce(aValueMap, aVerb, aLogger);
+          falseNode.produce(aProducerContext);
       }
     }
     catch (Exception e) {