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

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

Revision: 4314
          http://openutils.svn.sourceforge.net/openutils/?rev=4314&view=rev
Author:   fgiust
Date:     2013-09-15 20:34:53 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
rimosse funzioni deprecate

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

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-09-15 19:39:07 UTC (rev 4313)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-09-15 20:34:53 UTC (rev 4314)
@@ -579,272 +579,6 @@
         return url;
     }
 
-    //
-    //
-    // DEPRECATED FUNCTION
-    //
-    //
-
-    /**
-     * @deprecated, use node(Object)
-     */
-    @Deprecated
-    public static Content getNode(Object obj)
-    {
-        log.warn("\"getNode()\" has been deprecated, please use \"node()\"");
-        return node(obj);
-    }
-
-    /**
-     * @deprecated, use descLoc(Content, Locale)
-     */
-    @Deprecated
-    public static String getDescription(Content media, Locale locale)
-    {
-        log.warn("\"getDescription()\" has been deprecated, please use \"descLoc()\"");
-        return descLoc(media, locale);
-    }
-
-    /**
-     * @deprecated, use desc(Content)
-     */
-    @Deprecated
-    public static String getDescription(Content media)
-    {
-        log.warn("\"getDescription()\" has been deprecated, please use \"desc()\"");
-        return desc(media);
-    }
-
-    /**
-     * @deprecated, use titleLoc(Content, Locale)
-     */
-    @Deprecated
-    public static String getTitle(Content media, Locale locale)
-    {
-        log.warn("\"getTitle()\" has been deprecated, please use \"titleLoc()\"");
-        return titleLoc(media, locale);
-    }
-
-    /**
-     * @deprecated, use title(Content)
-     */
-    @Deprecated
-    public static String getTitle(Content media)
-    {
-        log.warn("\"getTitle()\" has been deprecated, please use \"title()\"");
-        return title(media);
-    }
-
-    /**
-     * @deprecated, use url(Content)
-     */
-    @Deprecated
-    public static String getUrl(Content media)
-    {
-        log.warn("\"getUrl()\" has been deprecated, please use \"url()\"");
-        return url(media);
-    }
-
-    /**
-     * @deprecated, use urlParams(Content, Map)
-     */
-    @Deprecated
-    public static String getUrl2(Content media, Map<String, String> options)
-    {
-        log.warn("\"url2()\" has been deprecated, please use \"urlParams()\"");
-        return urlParams(media, options);
-    }
-
-    /**
-     * @deprecated, use urlres(Content, String)
-     */
-    @Deprecated
-    public static String getResolutionUrl(Content media, String resolution)
-    {
-        log.warn("\"getResolutionUrl()\" has been deprecated, please use \"urlres()\"");
-        return urlres(media, resolution);
-    }
-
-    /**
-     * @deprecated, use resolutions(Content)
-     */
-    @Deprecated
-    public static String[] listResolutions(Content media)
-    {
-        log.warn("\"listResolutions()\" has been deprecated, please use \"resolutions()\"");
-        return resolutions(media);
-    }
-
-    /**
-     * @deprecated, use thumbnail(Content)
-     */
-    @Deprecated
-    public static String getThumbnail(Content media)
-    {
-        log.warn("\"getThumbnail()\" has been deprecated, please use \"thumbnail()\"");
-        return thumbnail(media);
-    }
-
-    /**
-     * @deprecated, use preview(Content)
-     */
-    @Deprecated
-    public static String getPreview(Content media)
-    {
-        log.warn("\"getPreview()\" has been deprecated, please use \"preview()\"");
-        return preview(media);
-    }
-
-    /**
-     * @deprecated, use type(Content)
-     */
-    @Deprecated
-    public static String getType(Content media)
-    {
-        log.warn("\"getType()\" has been deprecated, please use \"type()\"");
-        return type(media);
-    }
-
-    /**
-     * @deprecated, use size(Content, String)
-     */
-    @Deprecated
-    public static int[] getSize(Content media, String resolution)
-    {
-        log.warn("\"getSize()\" has been deprecated, please use \"size()\"");
-        return size(media, resolution);
-    }
-
-    /**
-     * @deprecated, use usedInWebPages(Content)
-     */
-    @Deprecated
-    public static String[] findMediaUsedInWebPages(Content media)
-    {
-        log.warn("\"findMediaUsedInWebPages()\" has been deprecated, please use \"usedInWebPages()\"");
-        return usedInWebPages(media);
-    }
-
-    /**
-     * @deprecated, use ${media.description} in templates
-     */
-    @Deprecated
-    public static String descLoc(Content media, Locale locale)
-    {
-        log.warn("\"descLoc()\" has been deprecated, please check javadocs");
-
-        if (media == null)
-        {
-            return null;
-        }
-        if (locale != null)
-        {
-            MgnlContext.setLocale(locale);
-        }
-        MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
-        if (mtc == null || mtc.getHandler() == null)
-        {
-            return null;
-        }
-        return mtc.getHandler().getDescription(media);
-    }
-
-    /**
-     * @deprecated, use ${media.title} in templates
-     */
-    @Deprecated
-    public static String titleLoc(Content media, Locale locale)
-    {
-        log.warn("\"titleLoc()\" has been deprecated, please check javadocs");
-
-        if (media == null)
-        {
-            return null;
-        }
-        if (locale != null)
-        {
-            MgnlContext.setLocale(locale);
-        }
-        MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
-        if (mtc == null || mtc.getHandler() == null)
-        {
-            return null;
-        }
-        return mtc.getHandler().getTitle(media);
-    }
-
-    /**
-     * @deprecated, use ${media.tags} in templates
-     */
-    @Deprecated
-    public static String[] tagsLoc(Content media, Locale locale)
-    {
-        log.warn("\"tagsLoc()\" has been deprecated, please check javadocs");
-
-        if (media == null)
-        {
-            return null;
-        }
-        if (locale != null)
-        {
-            MgnlContext.setLocale(locale);
-        }
-        MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
-        if (mtc == null || mtc.getHandler() == null)
-        {
-            return null;
-        }
-        String tags = mtc.getHandler().getTags(media);
-        if (tags == null)
-        {
-            return null;
-
-        }
-        return StringUtils.split(tags, ",");
-    }
-
-    /**
-     * Get description for a media for the current locale.
-     * @param media media
-     * @return description
-     * @deprecated use media.getNodeData("description") or ${media.description}
-     */
-    @Deprecated
-    public static String desc(Content media)
-    {
-        log.warn("\"desc()\" has been deprecated, please check javadocs");
-
-        return descLoc(media, null);
-    }
-
-    /**
-     * Get title for a media for the current locale.
-     * @param media media
-     * @return title
-     * @deprecated use media.getNodeData("title") or ${media.title}
-     */
-    @Deprecated
-    public static String title(Content media)
-    {
-        log.warn("\"title()\" has been deprecated, please check javadocs");
-
-        return titleLoc(media, null);
-    }
-
-    /**
-     * Get tags for a media
-     * @param media media
-     * @return tags
-     * @deprecated use media.getNodeData("tags") or ${media.tags}
-     */
-    @Deprecated
-    public static String[] tags(Content media)
-    {
-        log.warn("\"tags()\" has been deprecated, please check javadocs");
-
-        return tagsLoc(media, null);
-    }
-
     private static String appendBaseUrl(String url)
     {
         String baseurl = module().getBaseurl();

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2013-09-15 19:39:07 UTC (rev 4313)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2013-09-15 20:34:53 UTC (rev 4314)
@@ -78,88 +78,6 @@
     </example>
   </function>
   <function>
-    <description>Get the description from a media, given the media node itself.</description>
-    <display-name>desc</display-name>
-    <name>desc</name>
-    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String desc(info.magnolia.cms.core.Content)</function-signature>
-    <example>
-      <![CDATA[
-      <c:set var="mediaNode" value="${media:node(content.image)}" />
-      <c:out value="${media:desc(mediaNode)}" />
-      ]]>
-    </example>
-  </function>
-  <function>
-    <description>Get the description from a media, given the media node itself and a locale. Try to get the value from nodedata "description-{locale}"; if not found get the value from "description-en"; if not found again, get the value from "description".</description>
-    <display-name>descLoc</display-name>
-    <name>descLoc</name>
-    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String descLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
-    <example>
-      <![CDATA[
-      <c:set var="mediaNode" value="${media:node(content.image)}" />
-      <c:out value="${media:descLoc(mediaNode, pageContext.request.locale)}" />
-      ]]>
-    </example>
-  </function>
-  <function>
-    <description>Get the title from a media, given the media node itself.</description>
-    <display-name>title</display-name>
-    <name>title</name>
-    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String title(info.magnolia.cms.core.Content)</function-signature>
-    <example>
-      <![CDATA[
-      <c:set var="mediaNode" value="${media:node(content.image)}" />
-      <c:out value="${media:title(mediaNode)}" />
-      ]]>
-    </example>
-  </function>
-  <function>
-    <description>Get the title from a media, given the media node itself and a locale. Try to get the value from nodedata "title-{locale}"; if not found get the value from "title-en"; if not found again, get the value from "title".</description>
-    <display-name>titleLoc</display-name>
-    <name>titleLoc</name>
-    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String titleLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
-    <example>
-      <![CDATA[
-      <c:set var="mediaNode" value="${media:node(content.image)}" />
-      <c:out value="${media:titleLoc(mediaNode, pageContext.request.locale)}" />
-      ]]>
-    </example>
-  </function>
-  <function>
-    <description>Get the tags from a media, given the media node itself.</description>
-    <display-name>tags</display-name>
-    <name>tags</name>
-    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String[] tags(info.magnolia.cms.core.Content)</function-signature>
-    <example>
-      <![CDATA[
-      <c:set var="mediaNode" value="${media:node(content.image)}" />
-      <c:forEach var="tag" items="${media:tags(mediaNode)}">
-        <c:out value="${tag}" />
-      </c:forEach>
-      ]]>
-    </example>
-  </function>
-  <function>
-    <description>Get the tags from a media, given the media node itself and a locale. Try to get the value from nodedata "tags-{locale}"; if not found get the value from "tags-en"; if not found again, get the value from "tags".</description>
-    <display-name>tagsLoc</display-name>
-    <name>tagsLoc</name>
-    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <function-signature>java.lang.String[] tagsLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
-    <example>
-      <![CDATA[
-      <c:set var="mediaNode" value="${media:node(content.image)}" />
-      <c:forEach var="tag" items="${media:tagsLoc(mediaNode, pageContext.request.locale)}">
-        <c:out value="${tag}" />
-      </c:forEach>
-      ]]>
-    </example>
-  </function>
-  <function>
     <description>Get the url to the media, given the media node itself or its UUID</description>
     <display-name>url</display-name>
     <name>url</name>
@@ -173,15 +91,8 @@
     </example>
   </function>
   <function>
-    <description>@deprecated use urlParams()</description>
-    <display-name>url2</display-name>
-    <name>url2</name>
-    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
-    <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 or its UUID and a Map of options</description>
-    <display-name>url2</display-name>
+    <display-name>urlParams</display-name>
     <name>urlParams</name>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
     <function-signature>java.lang.String urlParams(java.lang.Object, java.util.Map)</function-signature>

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