merged 1.1 branch into head

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

diff --git a/source/mircoders/media/URLMediaHandler.java b/source/mircoders/media/URLMediaHandler.java
index 8343c54..c5604c7 100755 (executable)
--- a/source/mircoders/media/URLMediaHandler.java
+++ b/source/mircoders/media/URLMediaHandler.java
@@ -1,16 +1,14 @@
 package mircoders.media;
 
+import java.io.File;
+import java.io.InputStream;
+
 import mir.entity.Entity;
 import mir.media.MediaExc;
 import mir.media.MediaFailure;
 import mir.media.MediaHandler;
 import mir.session.UploadedFile;
 
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * <p>URLMediaHandler</p>
  * <p>Description:
@@ -53,16 +51,6 @@ public class URLMediaHandler implements MediaHandler {
 
   /**
    * {@inheritDoc}
-   *
-   * Since this media handler assumes the media is stored on a wholly different
-   * server, this operation is not applicable
-   */
-  public void store(File aFile, Entity aMedia, Entity aMediaType) throws MediaExc, MediaFailure {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * {@inheritDoc}
    */
   public void produce(Entity anEntity, Entity aMediaTypeEntity) throws MediaExc, MediaFailure {
     // nothing to do here
@@ -80,22 +68,11 @@ public class URLMediaHandler implements MediaHandler {
     return "application/octetstream";
   }
 
-  public List getURL(Entity aMediaEntity, Entity aMediaTypeEntity) throws MediaExc, MediaFailure {
-    List result = new ArrayList();
-    result.add(aMediaTypeEntity.getFieldValue("publish_server")+aMediaTypeEntity.getFieldValue("publish_path"));
-
-    return result;
-  }
-
-  public Object getURLs(Entity ent, Entity mediaTypeEnt) throws MediaExc, MediaFailure {
-    return null;
-  }
-
-  public String getStoragePath () throws MediaExc, MediaFailure {
+  public String getBaseStoragePath () throws MediaExc, MediaFailure {
     throw new UnsupportedOperationException();
   }
 
-  public String getIconStoragePath () throws MediaExc, MediaFailure {
+  public String getBaseIconStoragePath () throws MediaExc, MediaFailure {
     throw new UnsupportedOperationException();
   }