some code cleanup. removed unnecessary semikolons, unused vars, etc.

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

diff --git a/source/mir/entity/adapter/EntityIteratorAdapter.java b/source/mir/entity/adapter/EntityIteratorAdapter.java
index dfa9ae7..967809b 100755 (executable)
--- a/source/mir/entity/adapter/EntityIteratorAdapter.java
+++ b/source/mir/entity/adapter/EntityIteratorAdapter.java
@@ -49,21 +49,21 @@ public class EntityIteratorAdapter implements RewindableIterator {
 
   public EntityIteratorAdapter(String aWhereClause, String anOrderByClause,
           int aBatchSize, EntityAdapterModel aModel, String aDefinitionName )
-          throws StorageObjectFailure, EntityAdapterExc {
-    this(new EntityBrowser(aModel.getMappingForName(aDefinitionName).getStorage(), aWhereClause, anOrderByClause, aBatchSize), aModel, aDefinitionName);
+          throws StorageObjectFailure {
+    this(new EntityBrowser(aModel.getMappingForName(aDefinitionName).getDatabase(), aWhereClause, anOrderByClause, aBatchSize), aModel, aDefinitionName);
   }
 
   public EntityIteratorAdapter(String aWhereClause, String anOrderByClause,
           int aBatchSize, EntityAdapterModel aModel, String aDefinitionName,
-          int aLimit, int aSkip) throws StorageObjectFailure, EntityAdapterExc {
-    this(new EntityBrowser(aModel.getMappingForName(aDefinitionName).getStorage(), aWhereClause, anOrderByClause, aBatchSize, aLimit, aSkip), aModel, aDefinitionName);
+          int aLimit, int aSkip) throws StorageObjectFailure {
+    this(new EntityBrowser(aModel.getMappingForName(aDefinitionName).getDatabase(), aWhereClause, anOrderByClause, aBatchSize, aLimit, aSkip), aModel, aDefinitionName);
   }
 
   public EntityIteratorAdapter(String aMainTablePrefix, List someExtraTables,
           String aWhereClause, String anOrderByClause,
           int aBatchSize, EntityAdapterModel aModel, String aDefinitionName,
-          int aLimit, int aSkip) throws StorageObjectFailure, EntityAdapterExc {
-    this(new EntityBrowser(aModel.getMappingForName(aDefinitionName).getStorage(), aMainTablePrefix, someExtraTables, aWhereClause, anOrderByClause, aBatchSize, aLimit, aSkip), aModel, aDefinitionName);
+          int aLimit, int aSkip) throws StorageObjectFailure {
+    this(new EntityBrowser(aModel.getMappingForName(aDefinitionName).getDatabase(), aMainTablePrefix, someExtraTables, aWhereClause, anOrderByClause, aBatchSize, aLimit, aSkip), aModel, aDefinitionName);
   }
 
 
@@ -72,12 +72,7 @@ public class EntityIteratorAdapter implements RewindableIterator {
   }
 
   public Object next() {
-    try {
-      return model.makeEntityAdapter(definitionName, (Entity) iterator.next());
-    }
-    catch (EntityAdapterExc e) {
-      return null;
-    }
+    return model.makeEntityAdapter(definitionName, (Entity) iterator.next());
   }
 
   public void remove() {
@@ -86,5 +81,5 @@ public class EntityIteratorAdapter implements RewindableIterator {
 
   public void rewind() {
     iterator.rewind();
-  };
+  }
 }