exception + misc. cleanup

[mir.git] / source / mircoders / media / MediaHandlerImagesExtern.java

diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java
index 3b8de9e..a885d2f 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesExtern.java
+++ b/source/mircoders/media/MediaHandlerImagesExtern.java
@@ -39,7 +39,8 @@ import java.io.InputStream;
 import mir.config.MirPropertiesConfiguration;\r
 import mir.entity.Entity;\r
 import mir.log.LoggerWrapper;\r
-import mir.media.MirMediaException;\r
+import mir.media.MediaExc;\r
+import mir.media.MediaFailure;\r
 import mir.misc.StringUtil;\r
 import mircoders.storage.DatabaseUploadedMedia;\r
 \r
@@ -57,8 +58,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
     logger = new LoggerWrapper("Media.Images.Extern");\r
   }\r
 \r
-  public void produce(Entity anImageEntity, Entity mediaTypeEnt) throws MirMediaException\r
-  {\r
+  public void produce(Entity anImageEntity, Entity mediaTypeEnt) throws MediaExc, MediaFailure {\r
     try {\r
       String date = anImageEntity.getValue("date");\r
       String datePath = StringUtil.webdbDate2path(date);\r
@@ -72,7 +72,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
       File iconFile = new File(iconFilePath);\r
 \r
       if (!imageFile.exists()) {\r
-        throw new MirMediaException("error in MediaHandlerImagesExtern.produce(): " + filePath + " does not exist!");\r
+        throw new MediaExc("error in MediaHandlerImagesExtern.produce(): " + filePath + " does not exist!");\r
       }\r
       else {\r
         ImageProcessor processor = new ImageProcessor(imageFile, "JPEG");\r
@@ -101,13 +101,12 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
     catch(Throwable t) {\r
       logger.error("MediaHandlerImagesExtern.produce: " + t.getMessage());\r
       t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
-      throw new MirMediaException(t.getMessage());\r
+      throw new MediaFailure(t.getMessage(), t);\r
     }\r
   }\r
 \r
 \r
-  public InputStream getIcon(Entity anImageEntity) throws MirMediaException\r
-  {\r
+  public InputStream getIcon(Entity anImageEntity) throws MediaExc, MediaFailure {\r
     try {\r
       Entity mediaType = DatabaseUploadedMedia.getInstance().getMediaType(\r
           anImageEntity);\r
@@ -121,7 +120,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
       return new FileInputStream(new File(filePath));\r
     }\r
     catch (Throwable t) {\r
-      throw new MirMediaException(t.getMessage());\r
+      throw new MediaFailure(t);\r
     }\r
   }\r
 \r