merged with 1.1

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

diff --git a/source/mircoders/storage/DatabaseAudio.java b/source/mircoders/storage/DatabaseAudio.java
index fa98493..24d6b06 100755 (executable)
--- a/source/mircoders/storage/DatabaseAudio.java
+++ b/source/mircoders/storage/DatabaseAudio.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (C) 2001, 2002  The Mir-coders group\r
+ * Copyright (C) 2001, 2002 The Mir-coders group\r
  *\r
  * This file is part of Mir.\r
  *\r
@@ -18,17 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
  *\r
  * In addition, as a special exception, The Mir-coders gives permission to link\r
- * the code of this program with the com.oreilly.servlet library, any library\r
- * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
- * the above that use the same license as the above), and distribute linked\r
- * combinations including the two.  You must obey the GNU General Public\r
- * License in all respects for all of the code used other than the above\r
- * mentioned libraries.  If you modify this file, you may extend this exception\r
- * to your version of the file, but you are not obligated to do so.  If you do\r
- * not wish to do so, delete this exception statement from your version.\r
+ * the code of this program with  any library licensed under the Apache Software License,\r
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library\r
+ * (or with modified versions of the above that use the same license as the above),\r
+ * and distribute linked combinations including the two.  You must obey the\r
+ * GNU General Public License in all respects for all of the code used other than\r
+ * the above mentioned libraries.  If you modify this file, you may extend this\r
+ * exception to your version of the file, but you are not obligated to do so.\r
+ * If you do not wish to do so, delete this exception statement from your version.\r
  */\r
-\r
 package mircoders.storage;\r
 \r
 import java.util.GregorianCalendar;\r
@@ -39,21 +37,17 @@ import mir.misc.StringUtil;
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
-import freemarker.template.SimpleList;\r
 \r
 public class DatabaseAudio extends Database implements StorageObject{\r
 \r
   private static DatabaseAudio instance;\r
-  private static SimpleList publisherPopupData;\r
 \r
   // the following *has* to be sychronized cause this static method\r
   // could get preemted and we could end up with 2 instances of DatabaseFoo..\r
   // see the "Singletons with needles and thread" article at JavaWorld -mh\r
-  public synchronized static DatabaseAudio getInstance() throws\r
-      StorageObjectFailure {\r
+  public synchronized static DatabaseAudio getInstance() {\r
     if (instance == null) {\r
       instance = new DatabaseAudio();\r
-      instance.myselfDatabase = instance;\r
     }\r
     return instance;\r
   }\r
@@ -68,10 +62,6 @@ public class DatabaseAudio extends Database implements StorageObject{
     theEntityClass = mircoders.entity.EntityAudio.class;\r
   }\r
 \r
-  public SimpleList getPopupData() throws StorageObjectFailure {\r
-    return getPopupData("title", true);\r
-  }\r
-\r
   public void update(Entity theEntity) throws StorageObjectFailure {\r
     String date = theEntity.getValue("date");\r
     if (date == null) {\r