Gif icons for the External image handler dramatically improved

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

diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index bb0ad5d..c8cb194 100755 (executable)
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package  mircoders.media;
@@ -32,9 +32,12 @@ package  mircoders.media;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import javax.servlet.ServletContext;
+
+import freemarker.template.SimpleList;
 
 import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
+import mir.config.MirPropertiesConfiguration$PropertiesConfigExc;
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
@@ -42,7 +45,6 @@ import mir.media.MediaFailure;
 import mir.media.MirMedia;
 import mir.misc.FileUtil;
 import mir.misc.StringUtil;
-import freemarker.template.SimpleList;
 
 
 /**
@@ -62,7 +64,7 @@ import freemarker.template.SimpleList;
  *
  * @see mir.media.MirMedia
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerGeneric.java,v 1.19 2003/04/21 12:42:48 idfx Exp $
+ * @version $Id: MediaHandlerGeneric.java,v 1.20 2003/04/29 02:36:50 zapata Exp $
  */
 
 public class MediaHandlerGeneric implements MirMedia
@@ -136,9 +138,16 @@ public class MediaHandlerGeneric implements MirMedia
     }
 
     public InputStream getIcon (Entity ent) throws MediaExc, MediaFailure {
-        return null;
+      return null;
     }
 
+    public String getIconMimeType (Entity aMediaEntity, Entity aMediaType) throws MediaExc, MediaFailure {
+      ServletContext servletContext = MirPropertiesConfiguration.getContext();
+      String fileName = aMediaEntity.getId()+"."+aMediaType.getValue("name");
+
+      return servletContext.getMimeType(fileName);
+    };
+
     public String getStoragePath()
     {
         return configuration.getString("Producer.Media.Path");