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

[<die...@us...>]

Revision: 2092
          http://openutils.svn.sourceforge.net/openutils/?rev=2092&view=rev
Author:   diego_schivo
Date:     2010-03-05 08:34:45 +0000 (Fri, 05 Mar 2010)

Log Message:
-----------
MEDIA-105 do not ignore playlist-entries referencing unexisting media: show a broken entry instead

Modified Paths:
--------------
    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.html

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-03-03 23:04:18 UTC (rev 2091)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-03-05 08:34:45 UTC (rev 2092)
@@ -122,19 +122,18 @@
                 List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>();
                 for (Content subNode : node.getChildren(PlaylistConstants.PLAYLIST_ENTRY))
                 {
+                    PlaylistEntryBean entry = new PlaylistEntryBean();
+                    entry.setHandle(subNode.getHandle());
                     String mediaUUID = NodeDataUtil.getString(subNode, "media");
                     Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
                     if (media != null)
                     {
-                        PlaylistEntryBean entry = new PlaylistEntryBean();
-                        entry.setHandle(subNode.getHandle());
                         entry.setMedia(media.getUUID());
                         entry.setThumbnail(MediaEl.thumbnail(media));
                         entry.setType(NodeDataUtil.getString(media, "type"));
                         entry.setTitle(MediaEl.title(media));
                         entry.setDescription(MediaEl.desc(media));
                         entry.setTags(StringUtils.join(MediaEl.tags(media), ", "));
-                        entries.add(entry);
                     }
                     else
                     {
@@ -144,6 +143,7 @@
                                 mediaUUID, subNode.getName(), playlist.getHandle()
                             });
                     }
+                    entries.add(entry);
                 }
                 playlist.setEntries(entries);
             }

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2010-03-03 23:04:18 UTC (rev 2091)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2010-03-05 08:34:45 UTC (rev 2092)
@@ -21,8 +21,8 @@
     entries: [
       [#list this.playlist.entries as entry]
       [
-        '${entry.thumbnail!''}',
-        '${entry.type!''}',
+        '${entry.thumbnail!'/.resources/media/icons/thumb-broken.png'}',
+        '${entry.type!'[not found]'}',
         '${(entry.title!'')?js_string}',
         '${(entry.description!'')?js_string}',
         '${(entry.tags!'')?js_string}',


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