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

[<fg...@us...>]

Revision: 3573
          http://openutils.svn.sourceforge.net/openutils/?rev=3573&view=rev
Author:   fgiust
Date:     2011-07-03 15:26:14 +0000 (Sun, 03 Jul 2011)

Log Message:
-----------
MEDIA-244 Make EL functions also accept a media UUID and not only a media node

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-07-03 14:46:43 UTC (rev 3572)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-07-03 15:26:14 UTC (rev 3573)
@@ -313,9 +313,9 @@
      * @param media media
      * @return url
      */
-    public static String url(Content media)
+    public static String url(Object media)
     {
-        return urlParams(media, Collections.<String, String> emptyMap());
+        return urlParams(node(media), Collections.<String, String> emptyMap());
     }
 
     /**
@@ -324,8 +324,9 @@
      * @param options optional parameters
      * @return url
      */
-    public static String urlParams(Content media, Map<String, String> options)
+    public static String urlParams(Object mediaref, Map<String, String> options)
     {
+        Content media = node(mediaref);
         if (media == null)
         {
             return null;
@@ -343,8 +344,11 @@
      * @param media media to get the url for
      * @return the thumbnail url for this media, null otherwise
      */
-    public static String thumbnail(Content media)
+    public static String thumbnail(Object mediaref)
     {
+
+        Content media = node(mediaref);
+
         if (media == null)
         {
             return null;
@@ -362,13 +366,13 @@
      * @param media media to get the type
      * @return the type of this media if existing, null otherwise
      */
-    public static String type(Content media)
+    public static String type(Object media)
     {
         if (media == null)
         {
             return null;
         }
-        return NodeDataUtil.getString(media, "type");
+        return NodeDataUtil.getString(node(media), "type");
     }
 
     /**
@@ -376,9 +380,11 @@
      * @param media media to get the resolutions
      * @return all resolution strings
      */
-    public static String[] resolutions(Content media)
+    public static String[] resolutions(Object mediaref)
     {
 
+        Content media = node(mediaref);
+
         List<String> res = new ArrayList<String>();
 
         Content resolutions = getResolutionsNode(media);
@@ -410,9 +416,11 @@
      * @param resolution resolution
      * @return url
      */
-    public static String urlres(Content media, String resolution)
+    public static String urlres(Object mediaref, String resolution)
     {
 
+        Content media = node(mediaref);
+
         if (media == null)
         {
             return null;
@@ -462,8 +470,11 @@
      * @param resolution resolution for witch calculate size
      * @return size of an image
      */
-    public static int[] size(Content media, String resolution)
+    public static int[] size(Object mediaref, String resolution)
     {
+
+        Content media = node(mediaref);
+
         if (media != null)
         {
 
@@ -519,8 +530,11 @@
      * @param media media
      * @return the preview url for this media if existing, null otherwise
      */
-    public static String preview(Content media)
+    public static String preview(Object mediaref)
     {
+
+        Content media = node(mediaref);
+
         if (media == null)
         {
             return null;
@@ -538,8 +552,11 @@
      * @param media media to search in web pages
      * @return an array of String(s) containing a list of web pages where this media is used, an empty array otherwise
      */
-    public static String[] usedInWebPages(Content media)
+    public static String[] usedInWebPages(Object mediaref)
     {
+
+        Content media = node(mediaref);
+
         if (media == null)
         {
             log.warn("findMediaUsedInWebPages called with a null media");
@@ -569,8 +586,11 @@
      * @param property property name
      * @return the value of the given nodedata or null if not found
      */
-    public static Object property(Content media, String property)
+    public static Object property(Object mediaref, String property)
     {
+
+        Content media = node(mediaref);
+
         try
         {
             if (media == null || !media.hasNodeData(property))
@@ -592,7 +612,7 @@
      * @param media media Content
      * @return width of the original media, if available
      */
-    public static Integer width(Content media)
+    public static Integer width(Object media)
     {
         Number longproperty = (Number) property(media, MediaTypeHandler.METADATA_WIDTH);
         if (longproperty != null)
@@ -607,7 +627,7 @@
      * @param media media Content
      * @return height of the original media, if available
      */
-    public static Integer height(Content media)
+    public static Integer height(Object media)
     {
         Number longproperty = (Number) property(media, MediaTypeHandler.METADATA_HEIGHT);
         if (longproperty != null)

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2011-07-03 14:46:43 UTC (rev 3572)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2011-07-03 15:26:14 UTC (rev 3573)
@@ -160,11 +160,11 @@
     </example>
   </function>
   <function>
-    <description>Get the url to the media, given the media node itself</description>
+    <description>Get the url to the media, given the media node itself or its UUID</description>
     <display-name>url</display-name>
     <name>url</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String url(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.String url(java.lang.Object)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -180,11 +180,11 @@
     <function-signature>java.lang.String getUrl2(info.magnolia.cms.core.Content, java.util.Map)</function-signature>
   </function>
   <function>
-    <description>Get the url to the media, given the media node itself and an options map</description>
+    <description>Get the url to the media, given the media node itself or its UUID and a Map of options</description>
     <display-name>url2</display-name>
     <name>urlParams</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String urlParams(info.magnolia.cms.core.Content, java.util.Map)</function-signature>
+    <function-signature>java.lang.String urlParams(java.lang.Object, java.util.Map)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -223,7 +223,7 @@
     <display-name>urlres</display-name>
     <name>urlres</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String urlres(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
+    <function-signature>java.lang.String urlres(java.lang.Object, java.lang.String)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -236,7 +236,7 @@
     <display-name>resolutions</display-name>
     <name>resolutions</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String[] resolutions(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.String[] resolutions(java.lang.Object)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -251,7 +251,7 @@
     <display-name>thumbnail</display-name>
     <name>thumbnail</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String thumbnail(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.String thumbnail(java.lang.Object)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -264,7 +264,7 @@
     <display-name>preview</display-name>
     <name>preview</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String preview(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.String preview(java.lang.Object)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -277,7 +277,7 @@
     <display-name>type</display-name>
     <name>type</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String type(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.String type(java.lang.Object)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -293,7 +293,7 @@
     <display-name>size</display-name>
     <name>size</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>int[] size(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
+    <function-signature>int[] size(java.lang.Object, java.lang.String)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -307,7 +307,7 @@
     <display-name>usedInWebPages</display-name>
     <name>usedInWebPages</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String[] usedInWebPages(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.String[] usedInWebPages(java.lang.Object)</function-signature>
     <example>
       <![CDATA[
       <c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -322,21 +322,21 @@
     <display-name>width</display-name>
     <name>width</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.Integer width(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.Integer width(java.lang.Object)</function-signature>
   </function>
   <function>
     <description>Returns the height of the *original* media, if available</description>
     <display-name>height</display-name>
     <name>height</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.Integer height(info.magnolia.cms.core.Content)</function-signature>
+    <function-signature>java.lang.Integer height(java.lang.Object)</function-signature>
   </function>
   <function>
     <description>Returns a property (nodeData) of the media, given the media Content and the property name</description>
     <display-name>property</display-name>
     <name>property</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.Object property(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
+    <function-signature>java.lang.Object property(java.lang.Object, java.lang.String)</function-signature>
   </function>
   <function>
     <description></description>


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