if the Media handler does not have a media description, use the mime-type as the...

diff --git a/source/mir/media/MirMedia.java b/source/mir/media/MirMedia.java
index e9535d2..d72871c 100755 (executable)
--- a/source/mir/media/MirMedia.java
+++ b/source/mir/media/MirMedia.java
@@ -206,7 +206,7 @@ public interface  MirMedia{
    * media type is.
    * @return String
    */
-  public abstract String getDescr ();
+  public abstract String getDescr (Entity mediaTypeEnt);
 
 }
 

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index a092489..5724e71 100755 (executable)
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -147,7 +147,7 @@ public class EntityUploadedMedia extends Entity {
     try {
       mediaType = getMediaType();
       mediaHandler = MediaHelper.getHandler(mediaType);
-      return mediaHandler.getDescr();
+      return mediaHandler.getDescr(mediaType);
     }
     catch (Exception ex) {
       theLog.printWarning("-- getDescr: could not fetch data "

diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index d75686b..7cb409e 100755 (executable)
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -161,9 +161,9 @@ public class MediaHandlerGeneric implements MirMedia
       return false;
     }
 
-    public String getDescr()
+    public String getDescr( Entity mediaType)
     {
-      return "";
+      return mediaType.getValue("mime_type");
     }
 
 }

diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java
index aa3fd0b..012c21e 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImages.java
+++ b/source/mircoders/media/MediaHandlerImages.java
@@ -171,7 +171,7 @@ public abstract class MediaHandlerImages implements MirMedia
     return true;
   } 
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "";
   }

diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java
index bc8e19c..497e1e7 100755 (executable)
--- a/source/mircoders/media/MediaHandlerMp3.java
+++ b/source/mircoders/media/MediaHandlerMp3.java
@@ -102,7 +102,7 @@ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
 
   }
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "Mp3 audio";
   }

diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java
index 6d442ad..bb330f8 100755 (executable)
--- a/source/mircoders/media/MediaHandlerRealAudio.java
+++ b/source/mircoders/media/MediaHandlerRealAudio.java
@@ -84,7 +84,7 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
     return MirConfig.getProp("Producer.RealMedia.Path");
   }
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "RealMedia Audio";
   }

diff --git a/source/mircoders/media/MediaHandlerRealVideo.java b/source/mircoders/media/MediaHandlerRealVideo.java
index 75d7435..27f8025 100755 (executable)
--- a/source/mircoders/media/MediaHandlerRealVideo.java
+++ b/source/mircoders/media/MediaHandlerRealVideo.java
@@ -84,7 +84,7 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements
     return MirConfig.getProp("Producer.RealMedia.Path");
   }
 
-  public String getDescr()
+  public String getDescr(Entity mediaType)
   {
     return "RealMedia Video";
   }