cleanup / abuse system fix / prepping for a release

[mir.git] / source / mir / media / MediaHandler.java

diff --git a/source/mir/media/MediaHandler.java b/source/mir/media/MediaHandler.java
index a957c45..7b5b7e8 100755 (executable)
--- a/source/mir/media/MediaHandler.java
+++ b/source/mir/media/MediaHandler.java
@@ -32,7 +32,6 @@ package  mir.media;
 import mir.entity.Entity;
 import mir.session.UploadedFile;
 
-import java.io.File;
 import java.io.InputStream;
 
 /**
@@ -80,7 +79,7 @@ import java.io.InputStream;
  * ) and just override the things that need to be specific. see MediaHandlerAudio
  *
  * @author <mh@nadir.org>, the Mir-coders group
- * @version $Id: MediaHandler.java,v 1.1.2.6 2005/03/26 11:26:24 zapata Exp $
+ * @version $Id: MediaHandler.java,v 1.1.2.7 2005/08/21 17:09:19 zapata Exp $
  */
 
 public interface MediaHandler {
@@ -95,11 +94,6 @@ public interface MediaHandler {
   public void store(InputStream anInputStream, Entity aMedia, Entity aMediaType) throws MediaExc, MediaFailure;
 
   /**
-   * Store the media content from a file.
-   */
-  public void store(File aFile, Entity aMedia, Entity aMediaType) throws MediaExc, MediaFailure;
-
-  /**
    * Perform production related tasks for this media.  
    */
   public void produce(Entity aMedia, Entity aMediaType ) throws MediaExc, MediaFailure;
@@ -118,7 +112,6 @@ public interface MediaHandler {
    */
   public InputStream getThumbnail(Entity aMedia) throws MediaExc, MediaFailure;
 
-
   /**
    * Returns the mime-type of the media's thumbnail
    */
@@ -130,19 +123,19 @@ public interface MediaHandler {
    * in the configuration wich is accessible through the MirConfig
    * class.
    */
-  public String getStoragePath () throws MediaExc, MediaFailure;
+  public String getBaseStoragePath () throws MediaExc, MediaFailure;
 
   /**
    * Returns the *relative* filesystem path to where the media
    * icon content should be stored. It is relative to the path
-   * returned by getStoragePath()
+   * returned by getBaseStoragePath()
    * This path is usually defined
    * in the configuration wich is accessible through the MirConfig
    * class.
    */
-  public String getIconStoragePath () throws MediaExc, MediaFailure;
+  public String getBaseIconStoragePath () throws MediaExc, MediaFailure;
 
-        /**
+  /**
    * Returns the base URL to that the media is accessible from
    * to the end user. This could be a URL to another host.
    * This is used in the Metadata stored in the DB and later on
@@ -153,7 +146,7 @@ public interface MediaHandler {
    */
   public String getPublishHost () throws MediaExc, MediaFailure;
 
-        /**
+  /**
    * Returns the file name of the Icon representing the media type.
    * It is used in the summary view.
    * It is usually defined
@@ -162,7 +155,7 @@ public interface MediaHandler {
    */
   public String getBigIconName ();
 
-        /**
+  /**
    * Returns the file name of the small Icon representing
    * the media type.
    * It is used in the right hand newswire list of the startpage.