merged with 1.1

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

diff --git a/source/mircoders/storage/DatabaseComment.java b/source/mircoders/storage/DatabaseComment.java
index 439a6ba..56f3e33 100755 (executable)
--- a/source/mircoders/storage/DatabaseComment.java
+++ b/source/mircoders/storage/DatabaseComment.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;
@@ -35,7 +34,6 @@ import java.sql.Connection;
 import java.sql.SQLException;\r
 import java.sql.Statement;\r
 \r
-import freemarker.template.SimpleList;\r
 import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
@@ -52,14 +50,9 @@ public class DatabaseComment extends Database implements StorageObject{
 
   private static DatabaseComment instance;
 
-  public static DatabaseComment getInstance() {
+  public synchronized static DatabaseComment getInstance() {
     if (instance == null) {
-      synchronized (DatabaseComment.class) {
-        if (instance == null) {
-          instance = new DatabaseComment();
-          instance.myselfDatabase = instance;
-        }
-      }
+      instance = new DatabaseComment();
     }
     return instance;
   }
@@ -73,10 +66,6 @@ public class DatabaseComment extends Database implements StorageObject{
     this.theEntityClass = mircoders.entity.EntityComment.class;
   }
 
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("title", true);
-  }
-
   public boolean deleteByContentId(String id) throws StorageObjectFailure {
     Statement stmt = null;
     Connection con = null;