cleanup / abuse system fix / prepping for a release

[mir.git] / source / mir / entity / EntityBrowser.java

diff --git a/source/mir/entity/EntityBrowser.java b/source/mir/entity/EntityBrowser.java
index 8ce7a6e..03855fd 100755 (executable)
--- a/source/mir/entity/EntityBrowser.java
+++ b/source/mir/entity/EntityBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,30 +18,34 @@
  * 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 the com.oreilly.servlet library, 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.
+ * 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;
 
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
+import java.util.List;
+
+import mir.storage.Database;
+import mir.storage.DatabaseFailure;
+import mir.storage.DatabaseExc;
 import mir.util.RewindableIterator;
+import multex.Failure;
 
 public class EntityBrowser implements RewindableIterator {
 
-  private StorageObject storage;
+  private Database database;
+  private String mainTablePrefix;
+  private List extraTables;
   private String whereClause;
   private String orderByClause;
   private int batchSize;
-  private int toFetch;
   private EntityList currentBatch;
 
   private int skip;
@@ -50,10 +54,13 @@ public class EntityBrowser implements RewindableIterator {
   private int batchPosition;
   private int positionInBatch;
 
-  public EntityBrowser(StorageObject aStorage, String aWhereClause, String anOrderByClause,
-                       int aBatchSize, int aLimit, int aSkip) throws StorageObjectFailure {
+  public EntityBrowser(Database aDatabase, String aMainTablePrefix, List someExtraTables,
+     String aWhereClause, String anOrderByClause,
+     int aBatchSize, int aLimit, int aSkip) throws DatabaseFailure {
 
-    storage=aStorage;
+    database=aDatabase;
+    mainTablePrefix=aMainTablePrefix;
+    extraTables=someExtraTables;
     whereClause=aWhereClause;
     orderByClause=anOrderByClause;
     batchSize=aBatchSize;
@@ -63,14 +70,20 @@ public class EntityBrowser implements RewindableIterator {
     rewind();
   }
 
-  public EntityBrowser(StorageObject aStorage,
+  public EntityBrowser(Database aDatabase, String aWhereClause, String anOrderByClause,
+                       int aBatchSize, int aLimit, int aSkip) throws DatabaseFailure {
+    this(aDatabase, "", null, aWhereClause, anOrderByClause, aBatchSize, aLimit, aSkip);
+  }
+
+  public EntityBrowser(Database aDatabase,
           String aWhereClause, String anOrderByClause,
-          int aBatchSize) throws StorageObjectFailure {
-    this(aStorage, aWhereClause, anOrderByClause, aBatchSize, -1, 0);
+          int aBatchSize) throws DatabaseFailure {
+    this(aDatabase, aWhereClause, anOrderByClause, aBatchSize, -1, 0);
   }
 
-  public void readCurrentBatch(int aSkip) throws StorageObjectFailure {
-    currentBatch = storage.selectByWhereClause(whereClause, orderByClause, aSkip, batchSize);
+  public void readCurrentBatch(int aSkip) throws DatabaseExc, DatabaseFailure {
+    currentBatch = database.selectByWhereClause(mainTablePrefix, extraTables,
+        whereClause, orderByClause, aSkip, batchSize);
     batchPosition = aSkip;
     positionInBatch = 0;
   }
@@ -80,7 +93,7 @@ public class EntityBrowser implements RewindableIterator {
       readCurrentBatch(skip);
     }
     catch (Throwable t) {
-      throw new RuntimeException(t.getMessage());
+      throw new Failure("Error while rewinding", t);
     }
   }
 
@@ -108,9 +121,7 @@ public class EntityBrowser implements RewindableIterator {
 
         return result;
       }
-      else {
-        return null;
-      }
+                       return null;
     }
     catch (Throwable t) {
       throw new RuntimeException(t.getMessage());