merged 1.1 branch into head

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

diff --git a/source/mir/entity/adapter/EntityAdapterModel.java b/source/mir/entity/adapter/EntityAdapterModel.java
index 0d4ea50..77ff428 100755 (executable)
--- a/source/mir/entity/adapter/EntityAdapterModel.java
+++ b/source/mir/entity/adapter/EntityAdapterModel.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,12 +18,9 @@
  * 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.
  */
@@ -33,7 +30,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import mir.entity.Entity;
-import mir.storage.StorageObject;
+import mir.storage.Database;
 
 public class EntityAdapterModel {
   private Map entityAdapterMappings;
@@ -42,7 +39,7 @@ public class EntityAdapterModel {
     entityAdapterMappings = new HashMap();
   }
 
-  public EntityAdapter makeEntityAdapter( String aName, Entity anEntity ) throws EntityAdapterExc {
+  public EntityAdapter makeEntityAdapter( String aName, Entity anEntity ) {
     Mapping mapping = getMappingForName( aName );
 
     return mapping.getDefinition().makeEntityAdapter( anEntity, this );
@@ -51,9 +48,7 @@ public class EntityAdapterModel {
   public EntityAdapter createNewEntity( String aName ) throws EntityAdapterExc {
     try {
       Mapping mapping = getMappingForName(aName);
-      StorageObject storage = mapping.storage;
-      Entity entity = (Entity) storage.getEntityClass().newInstance();
-      entity.setStorage(storage);
+      Entity entity = mapping.database.createNewEntity();
 
       return mapping.getDefinition().makeEntityAdapter(entity, this);
     }
@@ -62,28 +57,28 @@ public class EntityAdapterModel {
     }
   }
 
-  public void addMapping( String aName, StorageObject aStorage, EntityAdapterDefinition aDefinition ) {
-    entityAdapterMappings.put( aName, new Mapping( aStorage, aDefinition ) );
+  public void addMapping(String aName, Database aDatabase, EntityAdapterDefinition aDefinition ) {
+    entityAdapterMappings.put(aName, new Mapping(aDatabase, aDefinition));
   }
 
-  public Mapping getMappingForName( String aName ) throws EntityAdapterExc {
+  public Mapping getMappingForName( String aName ) {
     if (!entityAdapterMappings.containsKey(aName))
-      throw new EntityAdapterExc( "'" + aName + "' not present in model" );
+      throw new EntityAdapterFailure("'" + aName + "' not present in model", null);
 
     return (Mapping) entityAdapterMappings.get( aName );
   }
 
   public class Mapping {
-    private StorageObject storage;
+    private Database database;
     private EntityAdapterDefinition definition;
 
-    public Mapping( StorageObject aStorage, EntityAdapterDefinition aDefinition ) {
-      storage = aStorage;
+    public Mapping(Database aDatabase, EntityAdapterDefinition aDefinition ) {
+      database = aDatabase;
       definition = aDefinition;
     }
 
-    public StorageObject getStorage() {
-      return storage;
+    public Database getDatabase() {
+      return database;
     }
 
     public EntityAdapterDefinition getDefinition() {