introduced AdapterEntityModel

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

diff --git a/source/mir/producer/EntityEnumeratingProducerNode.java b/source/mir/producer/EntityEnumeratingProducerNode.java
index e40a58c..f3902e3 100755 (executable)
--- a/source/mir/producer/EntityEnumeratingProducerNode.java
+++ b/source/mir/producer/EntityEnumeratingProducerNode.java
@@ -11,22 +11,29 @@ public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
   private Map verbs;
   private EntityEnumeratingProducerNodeVerb defaultVerb;
   private String key;
-  private EntityAdapterDefinition definition;
-  private StorageObject storage;
+  private EntityAdapterModel model;
+  private String definition;
+
+  public EntityEnumeratingProducerNode(
+                String aKey,
+                EntityAdapterModel aModel, String aDefinition,
+                ProducerNode aSubNode) {
 
-  public EntityEnumeratingProducerNode(String aKey, StorageObject aStorage, EntityAdapterDefinition aDefinition, ProducerNode aSubNode) {
     super(aSubNode);
 
     defaultVerb = null;
     verbs = new HashMap();
-    storage = aStorage;
+    model = aModel;
     definition = aDefinition;
     key = aKey;
   }
 
-  public EntityEnumeratingProducerNode(String aKey, StorageObject aStorage, EntityAdapterDefinition aDefinition,
-          String aDefaultWhereClause, String aDefaultOrderByClause, ProducerNode aSubNode) {
-    this(aKey, aStorage, aDefinition, aSubNode);
+  public EntityEnumeratingProducerNode(
+              String aKey,
+              EntityAdapterModel aModel, String aDefinition,
+              String aDefaultWhereClause, String aDefaultOrderByClause,
+              ProducerNode aSubNode) {
+    this(aKey, aModel, aDefinition, aSubNode);
 
     defaultVerb = new EntityEnumeratingProducerNodeVerb(aDefaultWhereClause, aDefaultOrderByClause);
   }
@@ -43,10 +50,10 @@ public class EntityEnumeratingProducerNode extends ProducerNodeDecorator {
 
     try {
       browser = new EntityIteratorAdapter(
-          storage,
           ParameterExpander.expandExpression( aValueMap, verb.whereClause ),
           ParameterExpander.expandExpression( aValueMap, verb.orderByClause ),
           -1,
+          model,
           definition );
 
       while (browser.hasNext()) {