merge media InputStream changes from MIR_1_0 branch

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

diff --git a/source/mir/entity/EntityList.java b/source/mir/entity/EntityList.java
index 9aca5c7..81e64fd 100755 (executable)
--- a/source/mir/entity/EntityList.java
+++ b/source/mir/entity/EntityList.java
@@ -1,10 +1,34 @@
 /*
- * The former (German) documentation of this classe
- * stated that this class is an abstract one. There is,
- * however, not a single abstract method in this class.
+ * 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 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.
  */
 
-
 package  mir.entity;
 
 import  java.lang.*;
@@ -13,9 +37,9 @@ import  java.util.*;
 import  freemarker.template.*;
 
 import  mir.misc.*;
+import  mir.storage.*;
 import  mir.storage.store.*;
 
-
 /**
  *
  * Container class for lists of Entities.
@@ -32,7 +56,7 @@ public class EntityList implements TemplateListModel, StorableObject {
   private static Logfile      theLog;
   private ArrayList           theEntityArrayList = new ArrayList();
   private String              whereClause, orderClause;
-  private Class               theEntityClass;
+  private StorageObject       theStorage;
   private int                 count, offset, limit;
   private int                 offsetnext = -1, offsetprev = -1;
   private int                 freemarkerListPointer=-1;
@@ -48,8 +72,8 @@ public class EntityList implements TemplateListModel, StorableObject {
   public EntityList(){         }
 
   /* get/set EntityClass of Objects stored in EntityList */
-  public void setEntityClass(Class theEntityClass) { this.theEntityClass=theEntityClass; }
-  public Class getEntityClass() { return theEntityClass; }
+  public void setStorage(StorageObject storage) { this.theStorage=storage; }
+  public StorageObject getStorage() { return theStorage; }
 
   public void setLimit(int limit) { this.limit = limit; }
 
@@ -261,10 +285,11 @@ public class EntityList implements TemplateListModel, StorableObject {
   public Set getNotifyOnReleaseSet() { return null; }
 
   public StoreIdentifier getStoreIdentifier() {
-    if ( theEntityClass!=null ) {
+    if ( theStorage!=null ) {
       return
         new StoreIdentifier( this, StoreContainerType.STOC_TYPE_ENTITYLIST,
-            StoreUtil.getEntityListUniqueIdentifierFor( whereClause, orderClause, offset, limit ));
+            StoreUtil.getEntityListUniqueIdentifierFor( theStorage.getTableName(),
+                       whereClause, orderClause, offset, limit ));
     }
     theLog.printWarning("EntityList could not return StoreIdentifier");
     return null;