[Openutils-svn] SF.net SVN: openutils:[4245] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/playlist

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

Revision: 4245
          http://openutils.svn.sourceforge.net/openutils/?rev=4245&view=rev
Author:   fgiust
Date:     2013-05-19 17:38:18 +0000 (Sun, 19 May 2013)
Log Message:
-----------
compiling

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 17:34:46 UTC (rev 4244)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 17:38:18 UTC (rev 4245)
@@ -40,6 +40,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -194,7 +195,7 @@
                     .hasNext();)
                 {
                     MediaNodeAndEntryPath item = iterator.next();
-                    AdvancedResultItem media = item.getMediaNode();
+                    Node media = item.getMediaNode();
                     if (media == null)
                     {
                         continue;
@@ -203,7 +204,7 @@
                     PlaylistEntryBean entry = new PlaylistEntryBean();
                     entry.setHandle(item.getPlaylistEntryPath());
                     entry.setMedia(NodeUtil.getNodeIdentifierIfPossible(media));
-                    entry.setMediaHandle(media.getHandle());
+                    entry.setMediaHandle(NodeUtil.getPathIfPossible(media));
                     MediaTypeConfiguration typeConf = MediaConfigurationManager
                         .getInstance()
                         .getMediaTypeConfigurationFromMedia(media);

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 17:34:46 UTC (rev 4244)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 17:38:18 UTC (rev 4245)
@@ -148,13 +148,13 @@
                 // playlistNode.getChildren(PlaylistConstants.PLAYLIST_ENTRY).iterator(),
                 Iterable<Node> nodes = NodeUtil.getNodes(playlistNode, PlaylistConstants.MGNL_PLAYLIST_ENTRY_TYPE);
 
-                return Iterators.transform(nodes.iterator(), new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
+                return Iterators.transform(nodes.iterator(), new Function<Node, MediaNodeAndEntryPath>()
                 {
 
                     /**
                      * {@inheritDoc}
                      */
-                    public MediaNodeAndEntryPath apply(AdvancedResultItem playlistEntry)
+                    public MediaNodeAndEntryPath apply(Node playlistEntry)
                     {
                         String mediaUUID = PropertyUtil.getString(playlistEntry, "media");
                         Content mediaNode = MediaEl.node(mediaUUID);
@@ -162,10 +162,14 @@
                         {
                             log.warn(
                                 "Node {} referenced by entry {} of playlist {} does not exist in media repository",
-                                new Object[]{mediaUUID, playlistEntry.getName(), playlistNode.getPath() });
+                                new Object[]{
+                                    mediaUUID,
+                                    NodeUtil.getName(playlistEntry),
+                                    NodeUtil.getPathIfPossible(playlistNode) });
                         }
 
-                        return new MediaNodeAndEntryPath(mediaNode.getJCRNode(), playlistEntry.getPath());
+                        return new MediaNodeAndEntryPath(mediaNode.getJCRNode(), NodeUtil
+                            .getPathIfPossible(playlistEntry));
                     }
                 });
             }

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