merged 1.1 branch into head

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

diff --git a/source/mir/entity/adapter/EntityAdapterEngine.java b/source/mir/entity/adapter/EntityAdapterEngine.java
index 2ef7c69..ea29caf 100755 (executable)
--- a/source/mir/entity/adapter/EntityAdapterEngine.java
+++ b/source/mir/entity/adapter/EntityAdapterEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2005 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,54 +18,38 @@
  * 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
+ * the code of this program with  any library licensed under the Apache Software License.
+ * 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.List;
-
 import mir.entity.EntityBrowser;
-import mir.storage.StorageObjectFailure;
+import mir.storage.DatabaseFailure;
 
-/**
- * <p>Title: </p>
- * <p>Description: </p>
- * <p>Copyright: Copyright (c) 2003</p>
- * <p>Company: </p>
- * @author not attributable
- * @version 1.0
- */
+import java.util.List;
 
 public class EntityAdapterEngine {
   private EntityAdapterEngine() {
   }
 
-  /**
-   *
-   * @param aStorage
-   * @param aDefinition
-   * @param aQualifier
-   * @param anOrder
-   * @param aLimit
-   * @param anOffset
-   * @return
-   */
-  static public List retrieveAdapterList(EntityAdapterModel aModel, String aDefinition, String aQualifier, String anOrder, int aLimit, int anOffset) {
+  public static List retrieveAdapterList(EntityAdapterModel aModel, String aDefinition,
+                                         String aQualifier, String anOrder, int aLimit, int anOffset) {
+    return retrieveAdapterList(aModel, aDefinition, "", null, aQualifier, anOrder, aLimit, anOffset);
+  }
+
+  public static List retrieveAdapterList(EntityAdapterModel aModel, String aDefinition, String aMainTablePrefix, List someExtraTables,
+                                         String aQualifier, String anOrder, int aLimit, int anOffset) {
     try {
-      EntityBrowser browser = new EntityBrowser(aModel.getMappingForName(aDefinition).getStorage(), aQualifier, anOrder, 30, aLimit, anOffset);
+      EntityBrowser browser = new EntityBrowser(aModel.getMappingForName(aDefinition).getDatabase(),
+          aMainTablePrefix, someExtraTables, aQualifier, anOrder, 30, aLimit, anOffset);
 
       return new EntityListAdapter(aModel, aDefinition, browser, aLimit);
     }
     catch (Throwable t) {
-      throw new StorageObjectFailure(t);
+      throw new DatabaseFailure(t);
     }
   }
 }
\ No newline at end of file