X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fstorage%2FDatabaseImageFormat.java;h=26f2a8d8d0c633313902c8b73cad2c7831fbf682;hb=4451d4c8c25d46e9c405e966ff6bd016a1512f4f;hp=349390d9349a595122767c15b8db7321060e38e2;hpb=d90c1bbdd5e1823253436f24dce80de4f0abbfcb;p=mir.git

diff --git a/source/mircoders/storage/DatabaseImageFormat.java b/source/mircoders/storage/DatabaseImageFormat.java
index 349390d9..26f2a8d8 100755
--- a/source/mircoders/storage/DatabaseImageFormat.java
+++ b/source/mircoders/storage/DatabaseImageFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,23 +18,21 @@
  * 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.
+ * 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.storage.Database;
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
 import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
-import freemarker.template.SimpleList;
 
 /**
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
@@ -44,31 +42,22 @@ import freemarker.template.SimpleList;
 
 public class DatabaseImageFormat extends Database implements StorageObject{
 
-	private static DatabaseImageFormat 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 DatabaseImageFormat getInstance() 
-	  throws StorageObjectFailure
-	{
-		if (instance == null) {
-			instance = new DatabaseImageFormat();
-			instance.myselfDatabase = instance;
-		}
-		return instance;
-	}
-
-	private DatabaseImageFormat() throws StorageObjectFailure
-	{
-		super();
-		this.hasTimestamp = false;
-		this.theTable="img_format";
-	}
-
-	public SimpleList getPopupData()
-        throws StorageObjectFailure { return getPopupData("name",true); }
-
-
+  private static DatabaseImageFormat 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 DatabaseImageFormat getInstance() {
+    if (instance == null) {
+      instance = new DatabaseImageFormat();
+    }
+    return instance;
+  }
+
+  private DatabaseImageFormat() {
+    super();
+    logger = new LoggerWrapper("Database.ImageFormat");
+    hasTimestamp = false;
+    theTable = "img_format";
+  }
 }