[Openutils-svn] SF.net SVN: openutils:[1854] trunk/openutils-mgnlmedia/src/main

[<die...@us...>]

Revision: 1854
          http://openutils.svn.sourceforge.net/openutils/?rev=1854&view=rev
Author:   diego_schivo
Date:     2010-02-08 13:42:39 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
MEDIA-79 Download action should not be available for "externals" media type (and not only for youtube)

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2010-02-07 19:55:31 UTC (rev 1853)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2010-02-08 13:42:39 UTC (rev 1854)
@@ -59,6 +59,8 @@
 
     private Map<String, String> mediaInfo;
 
+    private boolean external;
+
     /**
      * Returns the metaData.
      * @return the metaData
@@ -275,4 +277,13 @@
         this.mediaInfo = mediaInfo;
     }
 
+    public boolean isExternal()
+    {
+        return external;
+    }
+
+    public void setExternal(boolean external)
+    {
+        this.external = external;
+    }
 }
\ No newline at end of file

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-02-07 19:55:31 UTC (rev 1853)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-02-08 13:42:39 UTC (rev 1854)
@@ -277,6 +277,7 @@
                     }
 
                     mb.setMediaInfo(mtc.getHandler().getMediaInfo(media));
+                    mb.setExternal(mtc.getHandler().isExternal(media));
 
                     return mb;
                 }

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java	2010-02-07 19:55:31 UTC (rev 1853)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java	2010-02-08 13:42:39 UTC (rev 1854)
@@ -59,6 +59,13 @@
     void init(Content typeDefinitionNode);
 
     /**
+     * return true if media has no binary-data
+     * @param media media
+     * @return true if media has no binary-data
+     */
+    boolean isExternal(Content media);
+
+    /**
      * return thumbnail absolute url
      * @param media media
      * @return url

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-07 19:55:31 UTC (rev 1853)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-08 13:42:39 UTC (rev 1854)
@@ -177,6 +177,19 @@
         return media.getNodeData(ORGINAL_NODEDATA_NAME);
     }
 
+    public boolean isExternal(Content media)
+    {
+        try
+        {
+            return !media.hasNodeData(ORGINAL_NODEDATA_NAME);
+        }
+        catch (RepositoryException e)
+        {
+            log.warn("Error testing for external media", e);
+            return true;
+        }
+    }
+
     /**
      * {@inheritDoc}
      */

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-02-07 19:55:31 UTC (rev 1853)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-02-08 13:42:39 UTC (rev 1854)
@@ -217,7 +217,7 @@
                 </a>
               </li>
               [/#if]
-              [#if this.type != 'youtube']
+              [#if !media.external]
               <li>
                 <a href="?command=download&path=${media.handle}">
                   <img src="${this.request.contextPath}/.resources/media/icons/download.gif" border="0" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.