X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fstorage%2FDatabaseImageLayout.java;h=54cdf46b59dde509efb41fc1d0b1ebe3844f5b87;hb=bcd0c64b09ce0e8f3e6260f76f3a253863c74e60;hp=3151bcc6750dec2b67b357de4c1d04cf2a5e86ef;hpb=635db236fe78484b5f7f0158ad8054b189bf7a79;p=mir.git

diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java
index 3151bcc6..54cdf46b 100755
--- a/source/mircoders/storage/DatabaseImageLayout.java
+++ b/source/mircoders/storage/DatabaseImageLayout.java
@@ -1,3 +1,34 @@
+/*
+ * 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;
 
 import java.lang.*;
@@ -7,9 +38,9 @@ import java.util.*;
 
 import freemarker.template.*;
 
-import webdb.storage.*;
-import webdb.entity.*;
-import webdb.misc.*;
+import mir.storage.*;
+import mir.entity.*;
+import mir.misc.*;
 
 /**
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
@@ -22,7 +53,11 @@ public class DatabaseImageLayout extends Database implements StorageObject{
 	private static DatabaseImageLayout instance;
 	private static SimpleList publisherPopupData;
 
-	public static DatabaseImageLayout getInstance() throws StorageObjectException
+	// 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 StorageObjectException
 	{
 		if (instance == null) {
 			instance = new DatabaseImageLayout();
@@ -36,11 +71,10 @@ public class DatabaseImageLayout extends Database implements StorageObject{
 		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); }
+	public SimpleList getPopupData()
+        throws StorageObjectException { return getPopupData("name",true); }
 
 
 }