introduced AdapterEntityModel

[mir.git] / source / mir / entity / adapter / EntityAdapterDefinition.java

diff --git a/source/mir/entity/adapter/EntityAdapterDefinition.java b/source/mir/entity/adapter/EntityAdapterDefinition.java
index 01c8b1b..0405a40 100755 (executable)
--- a/source/mir/entity/adapter/EntityAdapterDefinition.java
+++ b/source/mir/entity/adapter/EntityAdapterDefinition.java
@@ -12,8 +12,8 @@ public class EntityAdapterDefinition {
     calculatedFields = new HashMap();
   }
 
-  public EntityAdapter makeEntityAdapter(Entity anEntity) {
-    return new EntityAdapter(anEntity, this);
+  public EntityAdapter makeEntityAdapter(Entity anEntity, EntityAdapterModel aModel) {
+    return new EntityAdapter(anEntity, this, aModel);
   }
 
   public CalculatedField getCalculatedField(String aFieldName) {
@@ -75,11 +75,8 @@ public class EntityAdapterDefinition {
           result=null;
         }
       }
-
       return result;
-
     }
-
   }
 
   private class DBDateField implements CalculatedField {
@@ -123,20 +120,6 @@ public class EntityAdapterDefinition {
       }
 
       return result;
-
-    }
-
-  }
-
-  static protected Object getRelation(StorageObject aStorageObject, String aWhereClause, String anOrderByClause, EntityAdapterDefinition aDefinition) {
-    try {
-      return
-          new CachingRewindableIterator( new EntityIteratorAdapter(
-              new EntityBrowser( aStorageObject, aWhereClause, anOrderByClause, -1),
-              aDefinition));
-    }
-    catch (Throwable t) {
-      throw new RuntimeException(t.getMessage());
     }
   }
 }