major cleanup:

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

diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java
index b332778..b28c5e0 100755 (executable)
--- a/source/mircoders/storage/DatabaseContent.java
+++ b/source/mircoders/storage/DatabaseContent.java
@@ -18,28 +18,25 @@
  * 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.
  */
 
 package mircoders.storage;
 
-import java.sql.Connection;
-import java.sql.Statement;
-
-import mir.entity.EntityList;
-import mir.entity.EntityRelation;
-import mir.log.LoggerWrapper;
-import mir.storage.Database;
-import mir.storage.StorageObject;
+import java.sql.Connection;\r
+import java.sql.Statement;\r
+\r
+import mir.log.LoggerWrapper;\r
+import mir.storage.Database;\r
+import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;
-import mircoders.entity.EntityContent;
 
 /**
  * <b>this class implements the access to the content-table</b>
@@ -50,19 +47,16 @@ import mircoders.entity.EntityContent;
 public class DatabaseContent extends Database implements StorageObject {
 
   private static DatabaseContent      instance;
-  private static EntityRelation       relationComments;
 
   // Contructors / Singleton
 
   // 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 DatabaseContent getInstance()
-    throws StorageObjectFailure {
+  public synchronized static DatabaseContent getInstance() {
 
     if (instance == null ) {
       instance = new DatabaseContent();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
@@ -74,8 +68,6 @@ public class DatabaseContent extends Database implements StorageObject {
     theCoreTable="media";
     logger = new LoggerWrapper("Database.Content");
 
-    relationComments =
-        new EntityRelation("id", "to_media", DatabaseComment.getInstance(), EntityRelation.TO_MANY);
     theEntityClass = mircoders.entity.EntityContent.class;
   }
 
@@ -104,14 +96,6 @@ public class DatabaseContent extends Database implements StorageObject {
   }
 
   /**
-   * returns the comments that belong to the article (via entityrelation)
-   * where db-flag is_published is true
-   */
-  public EntityList getComments(EntityContent entC) throws StorageObjectFailure {
-    return relationComments.getMany(entC,"webdb_create","is_published='1'");
-  }
-
-  /**
    *
    * @param id
    * @return
@@ -121,8 +105,10 @@ public class DatabaseContent extends Database implements StorageObject {
   public boolean delete(String id) throws StorageObjectFailure
   {
     DatabaseComment.getInstance().deleteByContentId(id);
-    super.delete(id);
-    return true;
+    DatabaseContentToTopics.getInstance().deleteByContentId(id);
+    DatabaseContentToMedia.getInstance().deleteByContentId(id);
+
+    return super.delete(id);
   }
 
 }