X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fstorage%2FDatabaseArticleType.java;h=832df27fce3687ce40f8960235ad42525c832772;hb=d90c1bbdd5e1823253436f24dce80de4f0abbfcb;hp=ffd0ec28c8a9459bf7ff03fe4fd9c43e665f8ecd;hpb=c6a2204d8d75293256fd17c07e54971d7672359a;p=mir.git

diff --git a/source/mircoders/storage/DatabaseArticleType.java b/source/mircoders/storage/DatabaseArticleType.java
index ffd0ec28..832df27f 100755
--- a/source/mircoders/storage/DatabaseArticleType.java
+++ b/source/mircoders/storage/DatabaseArticleType.java
@@ -1,49 +1,77 @@
-package mircoders.storage;
-
-/**
- * Title:
- * Description:
- * Copyright:    Copyright (c) 2001
- * Company:      Indymedia
- * @author
- * @version 1.0
- */
-
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
-
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
-
-
-public class DatabaseArticleType extends Database implements StorageObject{
-
-	private static DatabaseArticleType instance;
-	private static SimpleList articletypePopupData;
-
-	public static DatabaseArticleType getInstance() throws StorageObjectException
-	{
-		if (instance == null) {
-			instance = new DatabaseArticleType();
-			instance.myselfDatabase = instance;
-		}
-		return instance;
-	}
-
-	private DatabaseArticleType() throws StorageObjectException
-	{
-		super();
-		this.hasTimestamp = false;
-		this.theTable="article_type";
-	}
-
-	public SimpleList getPopupData()
-        throws StorageObjectException { return getPopupData("name",false); }
-
-
-}
+/*
+ * 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;
+
+/**
+ * Title:
+ * Description:
+ * Copyright:    Copyright (c) 2001
+ * Company:      Indymedia
+ * @author
+ * @version 1.0
+ */
+
+import mir.storage.Database;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectFailure;
+import freemarker.template.SimpleList;
+
+
+public class DatabaseArticleType extends Database implements StorageObject{
+
+  private static DatabaseArticleType instance;
+  private static SimpleList articletypePopupData;
+
+  // 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 DatabaseArticleType getInstance() throws
+      StorageObjectFailure {
+    if (instance == null) {
+      instance = new DatabaseArticleType();
+      instance.myselfDatabase = instance;
+    }
+    return instance;
+  }
+
+  private DatabaseArticleType() throws StorageObjectFailure {
+    super();
+    this.hasTimestamp = false;
+    this.theTable = "article_type";
+  }
+
+  public SimpleList getPopupData() throws StorageObjectFailure {
+    return getPopupData("name", false);
+  }
+
+
+}