introduced AdapterEntityModel

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

diff --git a/source/mir/producer/EntityListProducerNode.java b/source/mir/producer/EntityListProducerNode.java
index 39e3c1a..ed7fe37 100755 (executable)
--- a/source/mir/producer/EntityListProducerNode.java
+++ b/source/mir/producer/EntityListProducerNode.java
@@ -12,17 +12,18 @@ public class EntityListProducerNode extends ProducerNodeDecorator {
   private String whereClause;
   private String orderByClause;
   private int batchSize;
-  private EntityAdapterDefinition definition;
-  private StorageObject storage;
+  private EntityAdapterModel model;
+  private String definition;
   private int limit;
   private int skip;
 
-  public EntityListProducerNode(String aKey, StorageObject aStorage,
-      EntityAdapterDefinition aDefinition, String aWhereClause, String anOrderByClause,
+  public EntityListProducerNode(String aKey,
+      EntityAdapterModel aModel, String aDefinition,
+      String aWhereClause, String anOrderByClause,
       int aLimit, int aSkip, ProducerNode aSubNode) {
     super(aSubNode);
 
-    storage = aStorage;
+    model = aModel;
     definition = aDefinition;
     key = aKey;
     whereClause = aWhereClause;
@@ -36,10 +37,10 @@ public class EntityListProducerNode extends ProducerNodeDecorator {
       aValueMap.put(key,
         new CachingRewindableIterator(
           new EntityIteratorAdapter(
-            storage,
             ParameterExpander.expandExpression( aValueMap, whereClause ),
             ParameterExpander.expandExpression( aValueMap, orderByClause ),
             20,
+            model,
             definition,
             limit,
             skip )