bufix media

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

diff --git a/source/mircoders/storage/DatabaseImageType.java b/source/mircoders/storage/DatabaseImageType.java
index e3754fe..a924eb5 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageType.java
+++ b/source/mircoders/storage/DatabaseImageType.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,41 +18,37 @@
  * 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 mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
-import mir.storage.StorageObjectFailure;\r
-import freemarker.template.SimpleList;\r
 \r
 /**\r
- * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle\r
- *\r
  *\r
+ * <p>Title: </p>\r
+ * <p>Description: </p>\r
+ * <p>Copyright: Copyright (c) 2003</p>\r
+ * <p>Company: </p>\r
+ * @author not attributable\r
+ * @version 1.0\r
  */\r
 \r
 public class DatabaseImageType extends Database implements StorageObject{\r
   private static DatabaseImageType instance;\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 DatabaseImageType getInstance() {\r
     if (instance == null) {\r
       instance = new DatabaseImageType();\r
-      instance.myselfDatabase = instance;\r
     }\r
     return instance;\r
   }\r
@@ -64,9 +60,4 @@ public class DatabaseImageType extends Database implements StorageObject{
     hasTimestamp = false;\r
     theTable = "img_type";\r
   }\r
-\r
-  public SimpleList getPopupData() throws StorageObjectFailure {\r
-    return getPopupData("name", true);\r
-  }\r
-\r
 }\r