code cleaning, new config

[mir.git] / source / mircoders / storage / DatabaseArticleType.java

diff --git a/source/mircoders/storage/DatabaseArticleType.java b/source/mircoders/storage/DatabaseArticleType.java
index ffd0ec2..832df27 100755 (executable)
--- 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); }
-
-
-}
+/*\r
+ * Copyright (C) 2001, 2002  The Mir-coders group\r
+ *\r
+ * This file is part of Mir.\r
+ *\r
+ * Mir is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Mir is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with Mir; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ *\r
+ * In addition, as a special exception, The Mir-coders gives permission to link\r
+ * the code of this program with the com.oreilly.servlet library, any library\r
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
+ * the above that use the same license as the above), and distribute linked\r
+ * combinations including the two.  You must obey the GNU General Public\r
+ * License in all respects for all of the code used other than the above\r
+ * mentioned libraries.  If you modify this file, you may extend this exception\r
+ * to your version of the file, but you are not obligated to do so.  If you do\r
+ * not wish to do so, delete this exception statement from your version.\r
+ */\r
+\r
+package mircoders.storage;\r
+\r
+/**\r
+ * Title:\r
+ * Description:\r
+ * Copyright:    Copyright (c) 2001\r
+ * Company:      Indymedia\r
+ * @author\r
+ * @version 1.0\r
+ */\r
+\r
+import mir.storage.Database;\r
+import mir.storage.StorageObject;\r
+import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
+\r
+\r
+public class DatabaseArticleType extends Database implements StorageObject{\r
+\r
+  private static DatabaseArticleType instance;\r
+  private static SimpleList articletypePopupData;\r
+\r
+  // the following *has* to be sychronized cause this static method\r
+  // could get preemted and we could end up with 2 instances of DatabaseFoo..\r
+  // see the "Singletons with needles and thread" article at JavaWorld -mh\r
+  public synchronized static DatabaseArticleType getInstance() throws\r
+      StorageObjectFailure {\r
+    if (instance == null) {\r
+      instance = new DatabaseArticleType();\r
+      instance.myselfDatabase = instance;\r
+    }\r
+    return instance;\r
+  }\r
+\r
+  private DatabaseArticleType() throws StorageObjectFailure {\r
+    super();\r
+    this.hasTimestamp = false;\r
+    this.theTable = "article_type";\r
+  }\r
+\r
+  public SimpleList getPopupData() throws StorageObjectFailure {\r
+    return getPopupData("name", false);\r
+  }\r
+\r
+\r
+}\r