X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fstorage%2FDatabaseImageLayout.java;h=1fac5a32b1ea8f01468478d494d82c276a73733a;hb=1660e5268c5eba7a3fae476d62fa3af4ce8e23f6;hp=0f2bfc925da22d9decb73f8de6daef866aac8245;hpb=d90c1bbdd5e1823253436f24dce80de4f0abbfcb;p=mir.git

diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java
index 0f2bfc92..1fac5a32 100755
--- a/source/mircoders/storage/DatabaseImageLayout.java
+++ b/source/mircoders/storage/DatabaseImageLayout.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,19 +18,19 @@
  * 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.log.LoggerWrapper;
 import mir.storage.Database;
 import mir.storage.StorageObject;
 import mir.storage.StorageObjectFailure;
@@ -44,31 +44,29 @@ import freemarker.template.SimpleList;
 
 public class DatabaseImageLayout extends Database implements StorageObject{
 
-	private static DatabaseImageLayout instance;
-	private static SimpleList publisherPopupData;
+  private static DatabaseImageLayout 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 DatabaseImageLayout getInstance() 
-	  throws StorageObjectFailure
-	{
-		if (instance == null) {
-			instance = new DatabaseImageLayout();
-			instance.myselfDatabase = instance;
-		}
-		return 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 DatabaseImageLayout getInstance() {
+    if (instance == null) {
+      instance = new DatabaseImageLayout();
+    }
+    return instance;
+  }
 
-	private DatabaseImageLayout() throws StorageObjectFailure
-	{
-		super();
-		this.hasTimestamp = false;
-		this.theTable="img_layout";
-	}
+  private DatabaseImageLayout() {
+    super();
 
-	public SimpleList getPopupData()
-        throws StorageObjectFailure { return getPopupData("name",true); }
+    logger = new LoggerWrapper("Database.ImageLayout");
+    hasTimestamp = false;
+    theTable = "img_layout";
+  }
 
+  public SimpleList getPopupData() throws StorageObjectFailure {
+    return getPopupData("name", true);
+  }
 
 }