fixed / clean ups

[mir.git] / source / mircoders / servlet / ServletModuleUploadedMedia.java

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 6005ef6..976d76a 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -49,8 +49,8 @@ import mir.entity.adapter.EntityAdapter;
 import mir.entity.adapter.EntityAdapterModel;
 import mir.entity.adapter.EntityIteratorAdapter;
 import mir.log.LoggerWrapper;
-import mir.media.MediaHelper;
-import mir.media.MirMedia;
+import mircoders.media.MediaHelper;
+import mir.media.MediaHandler;
 import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
@@ -441,17 +441,18 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
 
   public void getMedia(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
     String idParam = aRequest.getParameter("id");
+
     if (idParam!=null && !idParam.equals("")) {
       try {
-        EntityUploadedMedia ent = (EntityUploadedMedia)mainModule.getById(idParam);
-        Entity mediaType = ent.getMediaType();
-        MirMedia mediaHandler;
+        EntityUploadedMedia entity = (EntityUploadedMedia)mainModule.getById(idParam);
+        Entity mediaType = entity.getMediaType();
+        MediaHandler mediaHandler;
 
         ServletContext ctx = MirPropertiesConfiguration.getContext();
-        String fName = ent.getId()+"."+mediaType.getValue("name");
+        String fName = entity.getId()+"."+mediaType.getFieldValue("name");
 
         mediaHandler = MediaHelper.getHandler(mediaType);
-        InputStream in = mediaHandler.getMedia(ent, mediaType);
+        InputStream in = mediaHandler.getMedia(entity, mediaType);
 
         aResponse.setContentType(ctx.getMimeType(fName));
         //important that before calling this aResponse.getWriter was not called first
@@ -473,22 +474,41 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
     // no exception allowed
   }
 
-  public void getIcon(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
+
+  /**
+   * @obsolete
+   *
+   * @param aRequest
+   * @param aResponse
+   * @throws ServletModuleExc
+   */
+  public void getIcon(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    getThumbnail(aRequest, aResponse);
+
+  }
+
+  /**
+   *
+   * @param aRequest
+   * @param aResponse
+   * @throws ServletModuleExc
+   */
+  public void getThumbnail(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
   {
     String idParam = aRequest.getParameter("id");
     if (idParam!=null && !idParam.equals("")) {
       try {
         EntityUploadedMedia ent = (EntityUploadedMedia) mainModule.getById(idParam);
         Entity mediaType = ent.getMediaType();
-        MirMedia mediaHandler;
+        MediaHandler mediaHandler;
 
         mediaHandler = MediaHelper.getHandler(mediaType);
-        InputStream in = mediaHandler.getIcon(ent);
+        InputStream in = mediaHandler.getThumbnail(ent);
 
         if (in==null)
           throw new ServletModuleExc("no icon available");
 
-        aResponse.setContentType(mediaHandler.getIconMimeType(ent, mediaType));
+        aResponse.setContentType(mediaHandler.getThumbnailMimeType(ent, mediaType));
         //important that before calling this aResponse.getWriter was not called first
         ServletOutputStream out = aResponse.getOutputStream();
 
@@ -554,7 +574,6 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
         throw new ServletModuleFailure(t);
       }
     }
-    else logger.error("editObjects: id not specified.");
+    else logger.error("showcomments: id not specified.");
   }
-
 }
\ No newline at end of file