various fixes/cleanup: old producers are now completely gone, old logfile class too

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

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index ef9d3a7..6b33578 100755 (executable)
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -31,6 +31,8 @@
 
 package mircoders.entity;
 
+import java.util.HashMap;
+
 import freemarker.template.SimpleList;
 import freemarker.template.SimpleScalar;
 import freemarker.template.TemplateModel;
@@ -40,20 +42,19 @@ import mir.entity.Entity;
 import mir.entity.EntityList;
 import mir.media.MediaHelper;
 import mir.media.MirMedia;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectException;
 import mir.misc.NumberUtils;
-import mircoders.storage.DatabaseUploadedMedia;
-import mircoders.storage.DatabaseContentToMedia;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectExc;
+import mir.storage.StorageObjectFailure;
+import mir.log.LoggerWrapper;
 
-import java.sql.SQLException;
-import java.util.HashMap;
+import mircoders.storage.DatabaseContentToMedia;
+import mircoders.storage.DatabaseUploadedMedia;
 
 /**
- * Diese Klasse enthält die Daten eines MetaObjekts
  *
  * @author mh, mir-coders group
- * @version $Id: EntityUploadedMedia.java,v 1.16 2002/12/06 08:09:51 mh Exp $
+ * @version $Id: EntityUploadedMedia.java,v 1.19 2003/02/23 05:00:13 zapata Exp $
  */
 
 
@@ -62,6 +63,8 @@ public class EntityUploadedMedia extends Entity {
 
   public EntityUploadedMedia() {
     super();
+
+    logger = new LoggerWrapper("Entity.UploadedMedia");
   }
 
   public EntityUploadedMedia(StorageObject theStorage) {
@@ -69,7 +72,7 @@ public class EntityUploadedMedia extends Entity {
     setStorage(theStorage);
   }
 
-  public void update() throws StorageObjectException {
+  public void update() throws StorageObjectFailure {
     super.update();
     EntityList contentList = DatabaseContentToMedia.getInstance().getContent(this);
     if (contentList!=null && contentList.size()>0) {
@@ -94,13 +97,13 @@ public class EntityUploadedMedia extends Entity {
    *
    * @return mir.entity.Entity
    */
-  public Entity getMediaType() throws StorageObjectException {
+  public Entity getMediaType() throws StorageObjectFailure {
     Entity ent = null;
     try {
       ent = DatabaseUploadedMedia.getInstance().getMediaType(this);
     }
-    catch (StorageObjectException e) {
-      throwStorageObjectException(e, "get MediaType failed -- ");
+    catch (StorageObjectFailure e) {
+      throwStorageObjectFailure(e, "get MediaType failed -- ");
     }
     return ent;
   }
@@ -154,8 +157,7 @@ public class EntityUploadedMedia extends Entity {
         return "other";
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getMediaTypeString: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getMediaTypeString: could not fetch data: " + ex.toString());
     }
     return null;
   }
@@ -170,8 +172,7 @@ public class EntityUploadedMedia extends Entity {
       return mediaHandler.getBigIconName();
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getBigIconName: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getBigIconName: could not fetch data: " + ex.toString());
     }
     return null;
   }
@@ -186,8 +187,7 @@ public class EntityUploadedMedia extends Entity {
       return mediaHandler.getURL(this, mediaType);
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getUrl: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getUrl: could not fetch data: " + ex.toString());
     }
     return null;
   }
@@ -202,8 +202,7 @@ public class EntityUploadedMedia extends Entity {
       return mediaHandler.getDescr(mediaType);
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getDescr: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getDescr: could not fetch data: " + ex.toString());
     }
     return null;
   }
@@ -215,8 +214,7 @@ public class EntityUploadedMedia extends Entity {
       return mediaType.getValue("mime_type");
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getBigIconName: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getBigIconName: could not fetch data: " + ex.toString());
     }
     return null;
   }