merged with 1.1

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

diff --git a/source/mircoders/storage/DatabaseArticleType.java b/source/mircoders/storage/DatabaseArticleType.java
index 81f621f..d6ed182 100755 (executable)
--- a/source/mircoders/storage/DatabaseArticleType.java
+++ b/source/mircoders/storage/DatabaseArticleType.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,15 +18,14 @@
  * 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;
@@ -40,45 +39,30 @@ package mircoders.storage;
  * @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.*;
-
+import java.util.List;\r
+\r
+import mir.log.LoggerWrapper;\r
+import mir.storage.Database;\r
+import mir.storage.StorageObject;\r
+import mir.storage.StorageObjectFailure;
 
 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 StorageObjectException
-       {
-               if (instance == null) {
-                       instance = new DatabaseArticleType();
-                       instance.myselfDatabase = instance;
-               }
-               return instance;
-       }
-
-       private DatabaseArticleType() throws StorageObjectException
-       {
-               super();
-               this.hasTimestamp = false;
-               this.theTable="article_type";
-       }
+  private static DatabaseArticleType instance;
+  private static List articletypePopupData;
 
-       public SimpleList getPopupData()
-        throws StorageObjectException { return getPopupData("name",false); }
+  public synchronized static DatabaseArticleType getInstance() throws StorageObjectFailure {
+    if (instance == null) {
+      instance = new DatabaseArticleType();
+    }
+    return instance;
+  }
 
+  private DatabaseArticleType() throws StorageObjectFailure {
+    super();
+    logger = new LoggerWrapper("Database.ArticleType");
+    this.hasTimestamp = false;
+    this.theTable = "article_type";
+  }
 
 }