media handling fixes, gotten rid of StorageObject, set the default method for blots...

[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 598596b..0c0a094 100755 (executable)
--- a/source/mir/entity/adapter/EntityAdapterModel.java
+++ b/source/mir/entity/adapter/EntityAdapterModel.java
@@ -29,12 +29,12 @@
  */
 package mir.entity.adapter;
 
+import mir.entity.Entity;
+import mir.storage.Database;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import mir.entity.Entity;
-import mir.storage.StorageObject;
-
 public class EntityAdapterModel {
   private Map entityAdapterMappings;
 
@@ -51,7 +51,7 @@ public class EntityAdapterModel {
   public EntityAdapter createNewEntity( String aName ) throws EntityAdapterExc {
     try {
       Mapping mapping = getMappingForName(aName);
-      Entity entity = mapping.storage.createNewEntity();
+      Entity entity = mapping.database.createNewEntity();
 
       return mapping.getDefinition().makeEntityAdapter(entity, this);
     }
@@ -60,8 +60,8 @@ 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 ) {
@@ -72,16 +72,16 @@ public class EntityAdapterModel {
   }
 
   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() {