fixed / clean ups

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

diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java
index 59ed478..f9c5fdf 100755 (executable)
--- a/source/mircoders/entity/EntityContent.java
+++ b/source/mircoders/entity/EntityContent.java
@@ -35,25 +35,23 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Map;
 
-import mir.entity.Entity;
+import mir.entity.AbstractEntity;
 import mir.log.LoggerWrapper;
 import mir.storage.StorageObject;
 import mir.storage.StorageObjectFailure;
-import mir.util.StringRoutines;
 import mircoders.storage.DatabaseContentToMedia;
 
 /**
  * this class implements mapping of one line of the database table content
  * to a java object
  *
- * @version $Id: EntityContent.java,v 1.19.2.4 2003/12/21 13:32:04 zapata Exp $
+ * @version $Id: EntityContent.java,v 1.19.2.5 2004/01/18 17:30:58 zapata Exp $
  * @author mir-coders group
  *
  */
 
 
-public class EntityContent extends Entity
-{
+public class EntityContent extends AbstractEntity {
   // constructors
 
   public EntityContent()
@@ -69,34 +67,30 @@ public class EntityContent extends Entity
     setStorage(theStorage);
   }
 
-  //
-  // methods
-
   /**
    * set is_produced flag for the article
    */
-
   public void setProduced(boolean yesno) throws StorageObjectFailure
   {
     String value = (yesno) ? "1":"0";
-    if (value.equals( getValue("is_produced") )) return;
+    if (value.equals( getFieldValue("is_produced") )) return;
 
     Connection con=null;Statement stmt=null;
     String sql = "update content set is_produced='" + value + "' where id='" + getId()+"'";
     try {
-      con = theStorageObject.getPooledCon();
-      /** @todo should be preparedStatement: faster!! */
+      con = storageObject.getPooledCon();
+      /** todo should be preparedStatement: faster!! */
       stmt = con.createStatement();
-      theStorageObject.executeUpdate(stmt,sql);
+      storageObject.executeUpdate(stmt,sql);
     }
     catch (StorageObjectFailure e) {
-      throwStorageObjectFailure(e, "\n -- set produced failed");
+      throw e;
     }
     catch (SQLException e) {
-      throwStorageObjectFailure(e, "\n -- set produced failed");
+      throw new StorageObjectFailure(e);
     }
     finally {
-      theStorageObject.freeConnection(con,stmt);
+      storageObject.freeConnection(con,stmt);
     }
   }
 
@@ -110,33 +104,20 @@ public class EntityContent extends Entity
   public void dettach(String anArticleId, String aMediaId) throws StorageObjectFailure
   {
     if (aMediaId!=null){
-      try{
-        DatabaseContentToMedia.getInstance().delete(anArticleId, aMediaId);
-      }
-      catch (Exception e){
-        throwStorageObjectFailure(e, "\n -- failed to get instance");
-      }
+      DatabaseContentToMedia.getInstance().delete(anArticleId, aMediaId);
 
       setProduced(false);
     }
   }
 
   /**
-   * Attaches media to an article
-   *
-   * @param mid
-   * @throws StorageObjectFailure
+   * Attaches media to the article
    */
 
   public void attach(String aMediaId) throws StorageObjectFailure
   {
     if (aMediaId!=null) {
-      try{
-        DatabaseContentToMedia.getInstance().addMedia(getId(),aMediaId);
-      }
-      catch(StorageObjectFailure e){
-        throwStorageObjectFailure(e, "attach: could not get the instance");
-      }
+      DatabaseContentToMedia.getInstance().addMedia(getId(),aMediaId);
       setProduced(false);
     }
     else {