cleanup / abuse system fix / prepping for a release

[mir.git] / source / mir / producer / reader / ScriptedProducerNodeDefinition.java

diff --git a/source/mir/producer/reader/ScriptedProducerNodeDefinition.java b/source/mir/producer/reader/ScriptedProducerNodeDefinition.java
index 62a796d..cf2015b 100755 (executable)
--- a/source/mir/producer/reader/ScriptedProducerNodeDefinition.java
+++ b/source/mir/producer/reader/ScriptedProducerNodeDefinition.java
@@ -29,18 +29,9 @@
  */
 package mir.producer.reader;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-
-import mir.log.LoggerWrapper;
-import mir.producer.CompositeProducerNode;
-import mir.producer.ProducerExc;
-import mir.producer.ProducerFailure;
-import mir.producer.ProducerNode;
+import mir.producer.*;
+
+import java.util.*;
 
 public class ScriptedProducerNodeDefinition {
   private Map integerParameters;               // name -> default value
@@ -129,7 +120,6 @@ public class ScriptedProducerNodeDefinition {
     return result;
   }
 
-
   protected static class NodeParameterProducerNode implements ProducerNode {
     private String parameterName;
     private String definitionName;
@@ -139,16 +129,17 @@ public class ScriptedProducerNodeDefinition {
       parameterName = aParameterName;
     }
 
-    public void produce(Map aValues, String aVerb, LoggerWrapper aLogger) throws ProducerExc, ProducerFailure {
+    public void produce(ProductionContext aProductionContext) throws ProducerExc, ProducerFailure {
       ProducerNode producerNode;
 
-      Map runTimeData = (Map) ((Map) aValues.get(SCRIPTED_PRODUCERNODE_RUNTIMEDATA_KEY)).get(definitionName);
+      Map runTimeData = (Map) ((Map) aProductionContext.getValueSet().get(SCRIPTED_PRODUCERNODE_RUNTIMEDATA_KEY)).get(definitionName);
       Map parameters = (Map) ((Stack) runTimeData.get( SCRIPTED_PRODUCERNODE_RUNTIMESTACK_KEY )).peek();
 
       producerNode = (ProducerNode) parameters.get(parameterName);
 
-      if (producerNode != null)
-        producerNode.produce(aValues, aVerb, aLogger);
+      if (producerNode != null) {
+        producerNode.produce(aProductionContext);
+      }
     }
 
     public Set buildVerbSet() {