fixing scaling images -> nullpointer, patch by yossarian

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

diff --git a/source/mircoders/storage/DatabaseAudio.java b/source/mircoders/storage/DatabaseAudio.java
index fbe24e3..0f7ce74 100755 (executable)
--- a/source/mircoders/storage/DatabaseAudio.java
+++ b/source/mircoders/storage/DatabaseAudio.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 mircoders.storage;
@@ -35,58 +35,51 @@ 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 freemarker.template.SimpleList;
+import mir.storage.DatabaseFailure;
 
-public class DatabaseAudio extends Database implements StorageObject{
+public class DatabaseAudio extends Database {
 
   private static DatabaseAudio instance;
-  private static SimpleList publisherPopupData;
 
   // the following *has* to be sychronized cause this static method
   // could get preemted and we could end up with 2 instances of DatabaseFoo..
   // see the "Singletons with needles and thread" article at JavaWorld -mh
-  public synchronized static DatabaseAudio getInstance() throws
-      StorageObjectFailure {
+  public synchronized static DatabaseAudio getInstance() {
     if (instance == null) {
       instance = new DatabaseAudio();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
 
-  private DatabaseAudio() throws StorageObjectFailure {
+  private DatabaseAudio() throws DatabaseFailure {
     super();
     logger = new LoggerWrapper("Database.Audio");
 
-    hasTimestamp = true;
-    theTable = "audio";
-    theCoreTable = "media";
-    theEntityClass = mircoders.entity.EntityAudio.class;
-  }
+    mainTable = "audio";
 
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("title", true);
+    entityClass = mircoders.entity.EntityAudio.class;
   }
 
-  public void update(Entity theEntity) throws StorageObjectFailure {
-    String date = theEntity.getValue("date");
+  public void update(Entity theEntity) throws DatabaseFailure {
+    String date = theEntity.getFieldValue("date");
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
-      theEntity.setValueForProperty("date", date);
+      theEntity.setFieldValue("date", date);
     }
 
     super.update(theEntity);
   }
 
-  public String insert(Entity theEntity) throws StorageObjectFailure {
-    String date = theEntity.getValue("date");
+  public String insert(Entity theEntity) throws DatabaseFailure {
+    String date = theEntity.getFieldValue("date");
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
-      theEntity.setValueForProperty("date", date);
+      theEntity.setFieldValue("date", date);
     }
     return super.insert(theEntity);
   }
 
+  protected String getPrimaryKeySequence() {
+    return "media_id_seq";
+  }
 }