Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1915] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media
|
From: <fg...@us...> - 2010-02-13 19:39:43
|
Revision: 1915
http://openutils.svn.sourceforge.net/openutils/?rev=1915&view=rev
Author: fgiust
Date: 2010-02-13 19:39:37 +0000 (Sat, 13 Feb 2010)
Log Message:
-----------
MEDIA-93 Static methods in MediaEL must have the same name used for EL functions, for jsp/freemarker similarity
Modified Paths:
--------------
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/uri/MediaURI2RepositoryMapping.java
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 2010-02-13 19:12:05 UTC (rev 1914)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-02-13 19:39:37 UTC (rev 1915)
@@ -23,7 +23,6 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.util.DateUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
@@ -31,7 +30,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -66,7 +64,7 @@
private static MediaConfigurationManager mcm = MediaConfigurationManager.getInstance();
- private static final Logger log = LoggerFactory.getLogger(MediaEl.class);
+ private static Logger log = LoggerFactory.getLogger(MediaEl.class);
private static final String[] EMPTY_STRING_ARRAY = new String[]{};
@@ -79,7 +77,7 @@
* Get the media module instance
* @return media module instance
*/
- public static MediaModule getModule()
+ public static MediaModule module()
{
return MediaModule.getInstance();
}
@@ -89,7 +87,7 @@
* @param obj content node or node UUID
* @return content node
*/
- public static Content getNode(Object obj)
+ public static Content node(Object obj)
{
if (obj == null)
{
@@ -132,7 +130,7 @@
* @param locale language
* @return description
*/
- public static String getDescription(Content media, Locale locale)
+ public static String descLoc(Content media, Locale locale)
{
if (media == null)
{
@@ -155,9 +153,9 @@
* @param media media
* @return description
*/
- public static String getDescription(Content media)
+ public static String desc(Content media)
{
- return getDescription(media, null);
+ return descLoc(media, null);
}
/**
@@ -167,7 +165,7 @@
* @param locale language
* @return title
*/
- public static String getTitle(Content media, Locale locale)
+ public static String titleLoc(Content media, Locale locale)
{
if (media == null)
{
@@ -190,9 +188,9 @@
* @param media media
* @return title
*/
- public static String getTitle(Content media)
+ public static String title(Content media)
{
- return getTitle(media, null);
+ return titleLoc(media, null);
}
/**
@@ -202,7 +200,7 @@
* @param locale language
* @return tags
*/
- public static String[] getTags(Content media, Locale locale)
+ public static String[] tagsLoc(Content media, Locale locale)
{
if (media == null)
{
@@ -226,9 +224,9 @@
* @param media media
* @return tags
*/
- public static String[] getTags(Content media)
+ public static String[] tags(Content media)
{
- return getTags(media, null);
+ return tagsLoc(media, null);
}
/**
@@ -236,9 +234,9 @@
* @param media media
* @return url
*/
- public static String getUrl(Content media)
+ public static String url(Content media)
{
- return getUrl2(media, Collections.<String, String> emptyMap());
+ return urlParams(media, Collections.<String, String> emptyMap());
}
/**
@@ -247,7 +245,7 @@
* @param options optional parameters
* @return url
*/
- public static String getUrl2(Content media, Map<String, String> options)
+ public static String urlParams(Content media, Map<String, String> options)
{
if (media == null)
{
@@ -266,7 +264,7 @@
* @param media media to get the url for
* @return the thumbnail url for this media, null otherwise
*/
- public static String getThumbnail(Content media)
+ public static String thumbnail(Content media)
{
if (media == null)
{
@@ -281,7 +279,7 @@
* @param media media to get the type
* @return the type of this media if existing, null otherwise
*/
- public static String getType(Content media)
+ public static String type(Content media)
{
if (media == null)
{
@@ -295,15 +293,14 @@
* @param media media to get the resolutions
* @return all resolution strings
*/
- @SuppressWarnings("unchecked")
- public static String[] listResolutions(Content media)
+ public static String[] resolutions(Content media)
{
List<String> res = new ArrayList<String>();
Content resolutions = media.getChildByName("resolutions");
- for (NodeData item : (Collection<NodeData>) resolutions.getNodeDataCollection())
+ for (NodeData item : resolutions.getNodeDataCollection())
{
if (item.getName().startsWith("res-"))
{
@@ -328,7 +325,7 @@
* @param resolution resolution
* @return url
*/
- public static String getResolutionUrl(Content media, String resolution)
+ public static String urlres(Content media, String resolution)
{
// MEDIA-90 may be simply a url
@@ -375,7 +372,7 @@
* @param resolution resolution for witch calculate size
* @return size of an image
*/
- public static int[] getSize(Content media, String resolution)
+ public static int[] size(Content media, String resolution)
{
if (media != null)
{
@@ -420,7 +417,7 @@
* @param media media
* @return the preview url for this media if existing, null otherwise
*/
- public static String getPreview(Content media)
+ public static String preview(Content media)
{
if (media == null)
{
@@ -435,7 +432,7 @@
* @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[] findMediaUsedInWebPages(Content media)
+ public static String[] usedInWebPages(Content media)
{
if (media == null)
{
@@ -546,4 +543,144 @@
return null;
}
+ /**
+ * @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);
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2010-02-13 19:12:05 UTC (rev 1914)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2010-02-13 19:39:37 UTC (rev 1915)
@@ -55,7 +55,7 @@
String uri;
try
{
- uri = MediaEl.getUrl(MgnlContext.getHierarchyManager(getRepository()).getContent(urisimple));
+ uri = MediaEl.url(MgnlContext.getHierarchyManager(getRepository()).getContent(urisimple));
}
catch (RepositoryException e)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
