merged 1.1 branch into head

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

diff --git a/source/mir/entity/StorableObjectEntity.java b/source/mir/entity/StorableObjectEntity.java
index b955d68..048d7ee 100755 (executable)
--- a/source/mir/entity/StorableObjectEntity.java
+++ b/source/mir/entity/StorableObjectEntity.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,26 +18,14 @@
  * 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.
  */
 package mir.entity;
 
-/**
- * Title:         StorableObjectEntity
- * Description:   Basic Container that can be handled by ObjectStore
- * Copyright:     Copyright (c) 2002
- * Company:       indy
- * @author        rk
- * @version       1.0
- */
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Set;
@@ -59,8 +47,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;
   }
 
@@ -68,15 +56,14 @@ public class StorableObjectEntity extends AbstractEntity
      Class theEntityClass, String theTable, String id) {
      if (id == null) {
         return null;
-     } else {
-        return new StoreIdentifier(theEntityClass, id + "@" + theTable);
      }
+               return new StoreIdentifier(theEntityClass, id + "@" + theTable);
   }
 
   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) {