- redid part of the media handling

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

diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index e7946f0..0f76167 100755 (executable)
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -43,7 +43,7 @@ import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
 import mir.media.MediaFailure;
-import mir.media.MirMedia;
+import mir.media.MediaHandler;
 import mir.misc.FileUtil;
 import mir.misc.StringUtil;
 
@@ -61,14 +61,14 @@ import mir.misc.StringUtil;
  * we don't have entered in the media_type table, (like RTF documents,
  * PS, PDF, etc..)
  * <p>
- * Of course it implements the MirMedia interface.
+ * Of course it implements the MirMediaHandler interface.
  *
- * @see mir.media.MirMedia
+ * @see mir.media.MirMediaHandler
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerGeneric.java,v 1.20.2.4 2003/11/28 16:46:36 rk Exp $
+ * @version $Id: MediaHandlerGeneric.java,v 1.20.2.5 2003/12/14 16:37:07 zapata Exp $
  */
 
-public class MediaHandlerGeneric implements MirMedia
+public class MediaHandlerGeneric implements MediaHandler
 {
     protected static MirPropertiesConfiguration configuration;
     protected static String imageHost;
@@ -90,7 +90,7 @@ public class MediaHandlerGeneric implements MirMedia
       logger = new LoggerWrapper("Media.Generic");
     }
 
-    public void set (InputStream in, Entity ent, Entity mediaTypeEnt ) throws MediaExc, MediaFailure {
+    public void store (InputStream in, Entity ent, Entity mediaTypeEnt ) throws MediaExc, MediaFailure {
       String ext = mediaTypeEnt.getValue("name");
       String mediaFname = ent.getId() + "." + ext;
       String date = ent.getValue("date");
@@ -117,7 +117,7 @@ public class MediaHandlerGeneric implements MirMedia
       String relPath = datePath+ent.getId()+"."+mediaTypeEnt.getValue("name");
       String fname = getStoragePath()+relPath;
       if(! new File(fname).exists())
-        throw new MediaExc("error in MirMedia.produce(): " + relPath + " does not exist!");
+        throw new MediaExc("error in MirMediaHandler.produce(): " + relPath + " does not exist!");
     }
 
     public InputStream getMedia (Entity ent, Entity mediaTypeEnt) throws MediaExc, MediaFailure {
@@ -125,7 +125,7 @@ public class MediaHandlerGeneric implements MirMedia
       String fname = getStoragePath()+publishPath;
       File f = new File(fname);
       if(! f.exists())
-        throw new MediaExc("error in MirMedia.getMedia(): " + fname + " does not exist!");
+        throw new MediaExc("error in MirMediaHandler.getMedia(): " + fname + " does not exist!");
 
       BufferedInputStream inputStream;
       try {
@@ -138,11 +138,11 @@ public class MediaHandlerGeneric implements MirMedia
       return inputStream;
     }
 
-    public InputStream getIcon (Entity ent) throws MediaExc, MediaFailure {
+    public InputStream getThumbnail (Entity ent) throws MediaExc, MediaFailure {
       return null;
     }
 
-    public String getIconMimeType (Entity aMediaEntity, Entity aMediaType) throws MediaExc, MediaFailure {
+    public String getThumbnailMimeType (Entity aMediaEntity, Entity aMediaType) throws MediaExc, MediaFailure {
       ServletContext servletContext = MirPropertiesConfiguration.getContext();
       String fileName = aMediaEntity.getId()+"."+aMediaType.getValue("name");
 
@@ -186,21 +186,6 @@ public class MediaHandlerGeneric implements MirMedia
       return theList;
     }
 
-    public boolean isVideo()
-    {
-      return false;
-    }
-
-    public boolean isAudio()
-    {
-      return false;
-    }
-
-    public boolean isImage()
-    {
-      return false;
-    }
-
     public String getDescr( Entity mediaType)
     {
       return mediaType.getValue("mime_type");