rebuilding head

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

diff --git a/source/mir/entity/StorableObjectEntity.java b/source/mir/entity/StorableObjectEntity.java
index 79dc3bd..b955d68 100755 (executable)
--- a/source/mir/entity/StorableObjectEntity.java
+++ b/source/mir/entity/StorableObjectEntity.java
@@ -18,13 +18,13 @@
  * 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 
- * exception to your version of the file, but you are not obligated to do so.  
+ * 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
+ * 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;
@@ -38,13 +38,16 @@ package mir.entity;
  * @version       1.0
  */
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Set;
 
+import mir.storage.Database;
 import mir.storage.store.StorableObject;
 import mir.storage.store.StoreIdentifier;
 
 
-public class StorableObjectEntity extends Entity
+public class StorableObjectEntity extends AbstractEntity
                implements StorableObject {
 
   /**
@@ -56,11 +59,34 @@ public class StorableObjectEntity extends Entity
    */
   public StoreIdentifier getStoreIdentifier() {
     String id = getId();
-    if ( id!=null && theStorageObject!= null )
-     return new StoreIdentifier(this, id+"@"+theStorageObject.getTableName());
+    if ( id!=null && storageObject!= null )
+     return new StoreIdentifier(this, id+"@"+storageObject.getTableName());
     return null;
   }
 
+  public static final StoreIdentifier getStoreIdentifier(
+     Class theEntityClass, String theTable, String id) {
+     if (id == null) {
+        return null;
+     } else {
+        return new StoreIdentifier(theEntityClass, id + "@" + theTable);
+     }
+  }
+
+  public static final StoreIdentifier getStoreIdentifier(Database theStorage,
+     Class theEntityClass, ResultSet rs) throws SQLException {
+
+        String idcol = theStorage.getIdName();
+        String idval = rs.getObject(idcol).toString();
+
+        if (idval != null) {
+           return getStoreIdentifier(theEntityClass,
+              theStorage.getTableName(), idval);
+        }
+
+     return null;
+  }
+
   /**
    *  Method:       getNotifyOnReleaseSet()
    *  Description:  returns empty Set, GenericContainer does not implement