bufix media

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

diff --git a/source/mircoders/storage/DatabaseMediafolder.java b/source/mircoders/storage/DatabaseMediafolder.java
index 6cb5312..aaccbe4 100755 (executable)
--- a/source/mircoders/storage/DatabaseMediafolder.java
+++ b/source/mircoders/storage/DatabaseMediafolder.java
@@ -1,53 +1,59 @@
-package mircoders.storage;
-
-/**
- * Title:        Mir
- * Description:  Ihre Beschreibung
- * Copyright:    Copyright (c) 1999
- * Company:
- * @author
- * @version
- */
-
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
-
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
-
-
-
-public class DatabaseMediafolder extends Database implements StorageObject{
-
-  private static DatabaseMediafolder instance;
-
-  // 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 DatabaseMediafolder getInstance() 
-    throws StorageObjectException {
-    if (instance == null) {
-      instance = new DatabaseMediafolder();
-      instance.myselfDatabase = instance;
-    }
-    return instance;
-  }
-
-  private DatabaseMediafolder() throws StorageObjectException
-  {
-    super();
-    this.hasTimestamp = false;
-    //this.cache = new DatabaseCache(20);
-    this.theTable="media_folder";
-  }
-
-  public SimpleList getPopupData() throws StorageObjectException {
-    return getPopupData("name",true);
-  }
-
-}
+/*\r
+ * Copyright (C) 2001, 2002 The Mir-coders group\r
+ *\r
+ * This file is part of Mir.\r
+ *\r
+ * Mir is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Mir is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with Mir; if not, write to the Free Software\r
+ * 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  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
+/**\r
+ *\r
+ */\r
+\r
+import mir.log.LoggerWrapper;\r
+import mir.storage.Database;\r
+import mir.storage.StorageObject;\r
+\r
+public class DatabaseMediafolder extends Database implements StorageObject{\r
+  private static DatabaseMediafolder instance;\r
+\r
+  public synchronized static DatabaseMediafolder getInstance() {\r
+    if (instance == null) {\r
+      instance = new DatabaseMediafolder();\r
+    }\r
+    return instance;\r
+  }\r
+\r
+  private DatabaseMediafolder() {\r
+    super();\r
+\r
+    logger = new LoggerWrapper("Database.Mediafolder");\r
+\r
+    hasTimestamp = false;\r
+    theTable="media_folder";\r
+  }\r
+}\r