jai removed from license part 1

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

diff --git a/source/mir/entity/adapter/EntityListAdapter.java b/source/mir/entity/adapter/EntityListAdapter.java
index f3dcbee..95fbd3a 100755 (executable)
--- a/source/mir/entity/adapter/EntityListAdapter.java
+++ b/source/mir/entity/adapter/EntityListAdapter.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,47 +18,47 @@
  * 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.
+ * 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.AbstractList;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
+import mir.entity.Entity;
 import mir.entity.EntityBrowser;
 
 public class EntityListAdapter extends AbstractList {
   private int skip;
   private int maximumLength;
   private EntityBrowser browser;
+  private EntityAdapterModel model;
+  private String definition;
   private boolean exhausted = false;
   private boolean skipped = false;
 
   private List cache;
 
-  protected EntityListAdapter(EntityBrowser aBrowser, int aSkip, int aMaximumLength) {
+  protected EntityListAdapter(EntityAdapterModel aModel, String aDefinition, EntityBrowser aBrowser, int aSkip, int aMaximumLength) {
+    model = aModel;
+    definition = aDefinition;
     browser = aBrowser;
     skip = aSkip;
     maximumLength = aMaximumLength;
-    cache = new Vector();
+    cache = new ArrayList();
   }
 
-  protected EntityListAdapter(EntityBrowser aBrowser, int aMaximumLength) {
-    this(aBrowser, 0, aMaximumLength);
+  protected EntityListAdapter(EntityAdapterModel aModel, String aDefinition, EntityBrowser aBrowser, int aMaximumLength) {
+    this(aModel, aDefinition, aBrowser, 0, aMaximumLength);
   }
 
-  protected EntityListAdapter(EntityBrowser aBrowser) {
-    this(aBrowser, 0, -1);
+  protected EntityListAdapter(EntityAdapterModel aModel, String  aDefinition, EntityBrowser aBrowser) {
+    this(aModel, aDefinition, aBrowser, 0, -1);
   }
 
   private void skip() {
@@ -81,7 +81,7 @@ public class EntityListAdapter extends AbstractList {
     try {
       if (!exhausted) {
         if (browser.hasNext())
-          cache.add(browser.next());
+          cache.add(model.makeEntityAdapter(definition, (Entity) browser.next()));
 
         exhausted = !browser.hasNext() || (maximumLength>0 && cache.size()>=maximumLength) ;
       }