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

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

Revision: 2397
          http://openutils.svn.sourceforge.net/openutils/?rev=2397&view=rev
Author:   fgiust
Date:     2010-05-11 22:41:54 +0000 (Tue, 11 May 2010)

Log Message:
-----------
MEDIA-142 playlist xml view, cleanup

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/playlist/pages/PlaylistView.java
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html

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-05-11 21:50:04 UTC (rev 2396)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-05-11 22:41:54 UTC (rev 2397)
@@ -139,10 +139,12 @@
 
         if (content != null && !(content instanceof NodeMapWrapper))
         {
-            content = new NodeMapWrapper(new I18nContentWrapper(content), MgnlContext
-                .getAggregationState()
-                .getMainContent()
-                .getHandle());
+            Content currentpage = MgnlContext.getAggregationState().getMainContent();
+            if (currentpage == null)
+            {
+                currentpage = content;
+            }
+            content = new NodeMapWrapper(new I18nContentWrapper(content), currentpage.getHandle());
         }
 
         return content;

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-05-11 21:50:04 UTC (rev 2396)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-05-11 22:41:54 UTC (rev 2397)
@@ -72,8 +72,6 @@
 
     private List<Content> mediaContentList;
 
-    private Calendar dateRequest;
-
     /**
      *
      */
@@ -222,9 +220,6 @@
                 }
             }
 
-            // Set date
-            this.dateRequest = Calendar.getInstance();
-
             // Get locale
             if (StringUtils.isEmpty(locale))
             {
@@ -272,21 +267,4 @@
         this.mediaContentList = mediaContentList;
     }
 
-    /**
-     * Returns the dateRequest.
-     * @return the dateRequest
-     */
-    public Calendar getDateRequest()
-    {
-        return dateRequest;
-    }
-
-    /**
-     * Sets the dateRequest.
-     * @param dateRequest the dateRequest to set
-     */
-    public void setDateRequest(Calendar dateRequest)
-    {
-        this.dateRequest = dateRequest;
-    }
 }

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html	2010-05-11 21:50:04 UTC (rev 2396)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html	2010-05-11 22:41:54 UTC (rev 2397)
@@ -3,12 +3,13 @@
   [#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
   [#assign systemProperty = this.getStatic("info.magnolia.cms.core.SystemProperty")]
   [#assign dateUtils = this.getStatic("net.sourceforge.openutils.elfunctions.DateElUtils")]
+  [#assign cal = this.getStatic("java.util.Calendar")]
   [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
   <title><![CDATA[${this.playlist.title}]]></title>
   <meta rel="media:locale">${this.locale}</meta>
   <meta rel="media:playlist-id">${this.playlist.uuid}</meta>
   <location><![CDATA[${mgnlEl.baseUrl()}/playlists${this.playlist.handle}.xml?locale=${this.locale}]]></location>
-  <date>${dateUtils.getXsdDate(this.dateRequest)}</date> 
+  <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
   <trackList> 
   [#list this.mediaContentList as mediaDetail]
     [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]


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