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

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

Revision: 3574
          http://openutils.svn.sourceforge.net/openutils/?rev=3574&view=rev
Author:   fgiust
Date:     2011-07-03 15:35:14 +0000 (Sun, 03 Jul 2011)

Log Message:
-----------
MEDIA-245 Remove private functions from MediaEL

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-xspf.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	2011-07-03 15:26:14 UTC (rev 3573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-07-03 15:35:14 UTC (rev 3574)
@@ -30,7 +30,6 @@
 import info.magnolia.module.ModuleRegistry;
 
 import java.awt.Point;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -53,7 +52,6 @@
 import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
 import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
-import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistTrackExtensionContributor;
 import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils;
 import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils.MediaNodeAndEntryPath;
 
@@ -832,15 +830,6 @@
         return resolutions;
     }
 
-    public static void writePlaylistTrackExtension(Content media, PrintWriter writer)
-    {
-        for (Object item : module().getPlaylistTrackExtensionContributors())
-        {
-            PlaylistTrackExtensionContributor contributor = (PlaylistTrackExtensionContributor) item;
-            contributor.addMediaAttributes(media, writer);
-        }
-    }
-
     /**
      * @param obj
      * @return

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	2011-07-03 15:26:14 UTC (rev 3573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2011-07-03 15:35:14 UTC (rev 3574)
@@ -24,8 +24,10 @@
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -436,4 +438,14 @@
         return metas;
     }
 
+    public void writePlaylistTrackExtension(Content media, PrintWriter writer)
+    {
+        MediaModule module = (MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(MediaModule.NAME);
+        for (Object item : module.getPlaylistTrackExtensionContributors())
+        {
+            PlaylistTrackExtensionContributor contributor = (PlaylistTrackExtensionContributor) item;
+            contributor.addMediaAttributes(media, writer);
+        }
+    }
+
 }

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html	2011-07-03 15:26:14 UTC (rev 3573)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html	2011-07-03 15:35:14 UTC (rev 3574)
@@ -42,7 +42,7 @@
       [/#if]
       <extension application="http://www.openmindlab.com/media">
         <media:locale code="${mediaLocale}" />
-        ${mediaEl.writePlaylistTrackExtension(mediaNode, freemarkerEnv.getCurrentEnvironment().out)}
+        ${this.writePlaylistTrackExtension(mediaNode, freemarkerEnv.getCurrentEnvironment().out)}
       </extension>
     </track>
     [/#if]


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