X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fstorage%2FDatabaseMediafolder.java;h=aaccbe4c135493060c314edd6186fca60df37a68;hb=4451d4c8c25d46e9c405e966ff6bd016a1512f4f;hp=e5521413f9062e787e71f746f783e8e0bffe70a8;hpb=8563841098b6ab3e6233f61519e58b41dcc30266;p=mir.git

diff --git a/source/mircoders/storage/DatabaseMediafolder.java b/source/mircoders/storage/DatabaseMediafolder.java
index e5521413..aaccbe4c 100755
--- a/source/mircoders/storage/DatabaseMediafolder.java
+++ b/source/mircoders/storage/DatabaseMediafolder.java
@@ -1,84 +1,59 @@
-/*
- * Copyright (C) 2001, 2002  The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Mir is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mir; if not, write to the Free Software
- * 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 the com.oreilly.servlet library, 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;
-
-/**
- * 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);
-  }
-
-}
+/*
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * 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.
+ * If you do not wish to do so, delete this exception statement from your version.
+ */
+
+package mircoders.storage;
+
+/**
+ *
+ */
+
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
+import mir.storage.StorageObject;
+
+public class DatabaseMediafolder extends Database implements StorageObject{
+  private static DatabaseMediafolder instance;
+
+  public synchronized static DatabaseMediafolder getInstance() {
+    if (instance == null) {
+      instance = new DatabaseMediafolder();
+    }
+    return instance;
+  }
+
+  private DatabaseMediafolder() {
+    super();
+
+    logger = new LoggerWrapper("Database.Mediafolder");
+
+    hasTimestamp = false;
+    theTable="media_folder";
+  }
+}