merged 1.1 branch into head

[mir.git] / source / mircoders / storage / DatabaseAudio.java

diff --git a/source/mircoders/storage/DatabaseAudio.java b/source/mircoders/storage/DatabaseAudio.java
index c8c316a..0f7ce74 100755 (executable)
--- a/source/mircoders/storage/DatabaseAudio.java
+++ b/source/mircoders/storage/DatabaseAudio.java
@@ -35,10 +35,9 @@ import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
 import mir.storage.Database;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
+import mir.storage.DatabaseFailure;
 
-public class DatabaseAudio extends Database implements StorageObject{
+public class DatabaseAudio extends Database {
 
   private static DatabaseAudio instance;
 
@@ -52,17 +51,16 @@ public class DatabaseAudio extends Database implements StorageObject{
     return instance;
   }
 
-  private DatabaseAudio() throws StorageObjectFailure {
+  private DatabaseAudio() throws DatabaseFailure {
     super();
     logger = new LoggerWrapper("Database.Audio");
 
-    hasTimestamp = true;
     mainTable = "audio";
-    primaryKeySequence = "media_id_seq";
-    theEntityClass = mircoders.entity.EntityAudio.class;
+
+    entityClass = mircoders.entity.EntityAudio.class;
   }
 
-  public void update(Entity theEntity) throws StorageObjectFailure {
+  public void update(Entity theEntity) throws DatabaseFailure {
     String date = theEntity.getFieldValue("date");
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
@@ -72,7 +70,7 @@ public class DatabaseAudio extends Database implements StorageObject{
     super.update(theEntity);
   }
 
-  public String insert(Entity theEntity) throws StorageObjectFailure {
+  public String insert(Entity theEntity) throws DatabaseFailure {
     String date = theEntity.getFieldValue("date");
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
@@ -81,4 +79,7 @@ public class DatabaseAudio extends Database implements StorageObject{
     return super.insert(theEntity);
   }
 
+  protected String getPrimaryKeySequence() {
+    return "media_id_seq";
+  }
 }