merged 1.1 branch into head

[mir.git] / source / mircoders / entity / EntityComment.java

diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java
index c7c5d55..b86c2f1 100755 (executable)
--- a/source/mircoders/entity/EntityComment.java
+++ b/source/mircoders/entity/EntityComment.java
@@ -33,8 +33,7 @@ package mircoders.entity;
 import java.util.Map;
 
 import mir.entity.AbstractEntity;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
+import mir.storage.DatabaseFailure;
 import mircoders.storage.DatabaseCommentToMedia;
 import mircoders.storage.DatabaseContent;
 
@@ -42,7 +41,7 @@ import mircoders.storage.DatabaseContent;
  * This class maps one line of the comment-table to a java-object.
  *
  * @author $Author: idfx $
- * @version $Revision: 1.18 $ $Date: 2004/11/06 19:56:13 $
+ * @version $Revision: 1.19 $ $Date: 2007/04/08 21:46:43 $
  */
 
 
@@ -53,12 +52,6 @@ public class EntityComment extends AbstractEntity {
     super();
   }
 
-  public EntityComment(StorageObject theStorage) {
-    this();
-    setStorage(theStorage);
-  }
-
-
   /**
    * overridden method setFieldValues to patch creator_main_url
    */
@@ -81,13 +74,8 @@ public class EntityComment extends AbstractEntity {
 
   /**
    * Deattaches media from a comment
-   *
-   * @param aCommentId
-   * @param aMediaId
-   * @throws StorageObjectFailure
    */
-  public void dettach(String aCommentId,String aMediaId) throws StorageObjectFailure
-  {
+  public void dettach(String aCommentId,String aMediaId) throws DatabaseFailure {
     if (aMediaId!=null){
       DatabaseCommentToMedia.getInstance().delete(aCommentId, aMediaId);
       DatabaseContent.getInstance().setUnproduced("id="+getFieldValue("to_media"));
@@ -95,19 +83,17 @@ public class EntityComment extends AbstractEntity {
   }
 
   /**
-   *
-   * @param aMediaId
-   * @throws StorageObjectFailure
+   * Attaches media to a comment
    */
 
-  public void attach(String aMediaId) throws StorageObjectFailure
+  public void attach(String aMediaId) throws DatabaseFailure
   {
     if (aMediaId!=null) {
       DatabaseCommentToMedia.getInstance().addMedia(getId(), aMediaId);
       DatabaseContent.getInstance().setUnproduced("id="+getFieldValue("to_media"));
     }
     else {
-      logger.error("EntityContent: attach without mid");
+      getLogger().error("EntityContent: attach without mid");
     }
   }
 }