fixed / clean ups

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

diff --git a/source/mir/entity/adapter/EntityAdapter.java b/source/mir/entity/adapter/EntityAdapter.java
index 4abc774..e223981 100755 (executable)
--- a/source/mir/entity/adapter/EntityAdapter.java
+++ b/source/mir/entity/adapter/EntityAdapter.java
@@ -1,8 +1,43 @@
+/*
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * 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.
+ * If you do not wish to do so, delete this exception statement from your version.
+ */
 package mir.entity.adapter;
 
-import java.util.*;
-import mir.entity.*;
-import mir.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import mir.entity.Entity;
+import mir.util.CachingRewindableIterator;
 
 public class EntityAdapter implements Map {
   private Entity entity;
@@ -20,9 +55,8 @@ public class EntityAdapter implements Map {
   public boolean containsKey(Object aKey) {
     try {
       if (aKey instanceof String)
-        return     entity.hasValueForField((String) aKey)
-                || definition.hasCalculatedField((String) aKey)
-                || entity.getFields().contains(aKey);
+        return     entity.hasField((String) aKey)
+                || definition.hasCalculatedField((String) aKey);
     }
     catch (Throwable t) {
     }
@@ -60,7 +94,7 @@ public class EntityAdapter implements Map {
       return result;
     }
     else if (aKey instanceof String) {
-      return entity.getValue((String) aKey);
+      return entity.getFieldValue((String) aKey);
     }
     else {
       return null;
@@ -68,7 +102,7 @@ public class EntityAdapter implements Map {
   }
 
   public boolean isEmpty() {
-    throw new UnsupportedOperationException("EntityAdapter.isEmpty()");
+    return false;
   }
 
   public Set keySet() {
@@ -107,6 +141,22 @@ public class EntityAdapter implements Map {
     throw new UnsupportedOperationException("EntityAdapter.entrySet()");
   }
 
+  public Object getComplexRelation(String aMainTablePrefix, List someExtraTables,
+    String aWhereClause, String anOrderByClause, String aDefinition) {
+    try {
+      return
+          new CachingRewindableIterator(
+            new EntityIteratorAdapter(aMainTablePrefix, someExtraTables,
+                aWhereClause, anOrderByClause,
+                -1, getModel(), aDefinition, -1, 0)
+            );
+    }
+    catch (Throwable t) {
+      throw new RuntimeException(t.getMessage());
+    }
+  }
+
+
   public Object getRelation(String aWhereClause, String anOrderByClause, String aDefinition) {
     try {
       return
@@ -119,4 +169,17 @@ public class EntityAdapter implements Map {
     }
   }
 
+  public EntityAdapter getToOneRelation(String aWhereClause, String anOrderByClause, String aDefinition) {
+    try {
+      Iterator i = new EntityIteratorAdapter(aWhereClause, anOrderByClause, -1, getModel(), aDefinition);
+
+      if (i.hasNext())
+        return (EntityAdapter) i.next();
+      else
+        return null;
+    }
+    catch (Throwable t) {
+      throw new RuntimeException(t.getMessage());
+    }
+  }
 }
\ No newline at end of file