X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fstorage%2FDatabaseComment.java;h=56f3e336d694a6cf1ca7fb9c5b2d766685bbdf60;hb=4451d4c8c25d46e9c405e966ff6bd016a1512f4f;hp=439a6ba1a7da8c31fbd8742f2bc7b03a71d63ecd;hpb=3d6d6279b8ad710d4ec72ddec1976894ef8099a4;p=mir.git

diff --git a/source/mircoders/storage/DatabaseComment.java b/source/mircoders/storage/DatabaseComment.java
index 439a6ba1..56f3e336 100755
--- 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;
 import java.sql.Statement;
 
-import freemarker.template.SimpleList;
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
 import mir.storage.StorageObject;
@@ -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;