X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fstorage%2FDatabaseComment.java;h=8561eb451b8a091595a9fb7893a3dae809e5eb8f;hb=d06e23e638f2538f263af76bd32da6b140f20ac6;hp=d9ceef923ced201cb55daf48be9258764691925f;hpb=a459f111d85598df56c6ab711cec11632676b39c;p=mir.git

diff --git a/source/mircoders/storage/DatabaseComment.java b/source/mircoders/storage/DatabaseComment.java
index d9ceef92..8561eb45 100755
--- a/source/mircoders/storage/DatabaseComment.java
+++ b/source/mircoders/storage/DatabaseComment.java
@@ -18,13 +18,13 @@
  * 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  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.  
+ * 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.
  */
 
@@ -36,63 +36,43 @@ import java.sql.Statement;
 
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
-import freemarker.template.SimpleList;
+import mir.storage.DatabaseFailure;
 
-/**
- * <b>This class implements the access to the comment-table for the
- *    media table.
- *
- *
- */
-
-public class DatabaseComment extends Database implements StorageObject{
+public class DatabaseComment extends Database {
 
   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;
   }
 
   private DatabaseComment() {
     super();
-    hasTimestamp = false;
-    theTable = "comment";
+    mainTable = "comment";
     logger = new LoggerWrapper("Database.Comment");
 
-    this.theEntityClass = mircoders.entity.EntityComment.class;
-  }
-
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("title", true);
+    entityClass = mircoders.entity.EntityComment.class;
   }
 
-  public boolean deleteByContentId(String id) throws StorageObjectFailure {
+  public boolean deleteByContentId(String id) throws DatabaseFailure {
     Statement stmt = null;
     Connection con = null;
     String sql;
-    int res = 0;
 
-    /** @todo comments and topics should be deleted */
-    sql = "delete from " + theTable + " where to_media=" + id;
+    /** todo comments and topics should be deleted */
+    sql = "delete from " + mainTable + " where to_media=" + id;
     logger.info("DELETE "+ sql);
 
     try {
-      con = getPooledCon();
+      con = obtainConnection();
       stmt = con.createStatement();
-      res = stmt.executeUpdate(sql);
+      stmt.executeUpdate(sql);
     }
     catch (SQLException sqe) {
-      new StorageObjectFailure(sqe);
+      new DatabaseFailure(sqe);
       return false;
     }
     finally {