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

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

diff --git a/source/mir/entity/StorableObjectEntity.java b/source/mir/entity/StorableObjectEntity.java
index b955d68..8749bc2 100755 (executable)
--- a/source/mir/entity/StorableObjectEntity.java
+++ b/source/mir/entity/StorableObjectEntity.java
@@ -59,8 +59,8 @@ public class StorableObjectEntity extends AbstractEntity
    */
   public StoreIdentifier getStoreIdentifier() {
     String id = getId();
-    if ( id!=null && storageObject!= null )
-     return new StoreIdentifier(this, id+"@"+storageObject.getTableName());
+    if ( id!=null && database!= null )
+     return new StoreIdentifier(this, id+"@"+database.getTableName());
     return null;
   }
 
@@ -76,7 +76,7 @@ public class StorableObjectEntity extends AbstractEntity
   public static final StoreIdentifier getStoreIdentifier(Database theStorage,
      Class theEntityClass, ResultSet rs) throws SQLException {
 
-        String idcol = theStorage.getIdName();
+        String idcol = theStorage.getIdFieldName();
         String idval = rs.getObject(idcol).toString();
 
         if (idval != null) {