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

diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java
index cb2a736e..1fac5a32 100755
--- a/source/mircoders/storage/DatabaseImageLayout.java
+++ b/source/mircoders/storage/DatabaseImageLayout.java
@@ -1,15 +1,40 @@
-package mircoders.storage;
-
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
+/*
+ * 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.
+ */
 
-import freemarker.template.*;
+package mircoders.storage;
 
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
+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
@@ -19,28 +44,29 @@ import mir.misc.*;
 
 public class DatabaseImageLayout extends Database implements StorageObject{
 
-	private static DatabaseImageLayout instance;
-	private static SimpleList publisherPopupData;
-
-	public static DatabaseImageLayout getInstance() throws StorageObjectException
-	{
-		if (instance == null) {
-			instance = new DatabaseImageLayout();
-			instance.myselfDatabase = instance;
-		}
-		return instance;
-	}
-
-	private DatabaseImageLayout() throws StorageObjectException
-	{
-		super();
-		this.hasTimestamp = false;
-		this.theTable="img_layout";
-		try { this.theEntityClass = Class.forName("mir.entity.EntityImageLayout");	}
-		catch (Exception e) { throw new StorageObjectException(e.toString());	}
-	}
-
-	public SimpleList getPopupData() { return getPopupData("name",true); }
+  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() {
+    if (instance == null) {
+      instance = new DatabaseImageLayout();
+    }
+    return instance;
+  }
+
+  private DatabaseImageLayout() {
+    super();
+
+    logger = new LoggerWrapper("Database.ImageLayout");
+    hasTimestamp = false;
+    theTable = "img_layout";
+  }
 
+  public SimpleList getPopupData() throws StorageObjectFailure {
+    return getPopupData("name", true);
+  }
 
 }