merged 1.1 branch into head

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

diff --git a/source/mircoders/storage/DatabaseArticleType.java b/source/mircoders/storage/DatabaseArticleType.java
index 20ea23d..b0858e8 100755 (executable)
--- a/source/mircoders/storage/DatabaseArticleType.java
+++ b/source/mircoders/storage/DatabaseArticleType.java
@@ -30,37 +30,25 @@
 
 package mircoders.storage;
 
-/**
- * Title:
- * Description:
- * Copyright:    Copyright (c) 2001
- * Company:      Indymedia
- * @author
- * @version 1.0
- */
-
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
-
-public class DatabaseArticleType extends Database implements StorageObject{
+import mir.storage.DatabaseFailure;
 
+public class DatabaseArticleType extends Database {
   private static DatabaseArticleType instance;
 
-  public synchronized static DatabaseArticleType getInstance() throws StorageObjectFailure {
-    if (instance == null) {
-      instance = new DatabaseArticleType();
-    }
-    return instance;
+  private DatabaseArticleType() throws DatabaseFailure {
+    logger = new LoggerWrapper("Database.ArticleType");
+    mainTable = "article_type";
   }
 
-  private DatabaseArticleType() throws StorageObjectFailure {
-    super();
+  public static DatabaseArticleType getInstance() throws DatabaseFailure {
+    synchronized (DatabaseArticleType.class) {
+      if (instance == null) {
+        instance = new DatabaseArticleType();
+      }
+    }
 
-    logger = new LoggerWrapper("Database.ArticleType");
-    this.hasTimestamp = false;
-    this.mainTable = "article_type";
+    return instance;
   }
-
 }