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

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

Revision: 2404
          http://openutils.svn.sourceforge.net/openutils/?rev=2404&view=rev
Author:   diego_schivo
Date:     2010-05-12 09:37:09 +0000 (Wed, 12 May 2010)

Log Message:
-----------
MEDIA-92 usedInUris instead of usedInWebPages

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2010-05-12 09:06:47 UTC (rev 2403)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2010-05-12 09:37:09 UTC (rev 2404)
@@ -55,6 +55,8 @@
 
     private List<String> usedInWebPages = new ArrayList<String>();
 
+    private List<String> usedInUris = new ArrayList<String>();
+
     private boolean canPublish;
 
     private boolean writable;
@@ -226,6 +228,24 @@
     }
 
     /**
+     * Returns the usedInUris.
+     * @return the usedInUris
+     */
+    public List<String> getUsedInUris()
+    {
+        return usedInUris;
+    }
+
+    /**
+     * Sets the usedInUris.
+     * @param usedInUris the usedInUris to set
+     */
+    public void setUsedInUris(List<String> usedInUris)
+    {
+        this.usedInUris = usedInUris;
+    }
+
+    /**
      * Returns the canPublish.
      * @return the canPublish
      */

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-05-12 09:06:47 UTC (rev 2403)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-05-12 09:37:09 UTC (rev 2404)
@@ -19,6 +19,8 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.pages;
 
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.ItemType;
@@ -38,6 +40,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.jcr.RepositoryException;
@@ -48,6 +51,7 @@
 
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 
@@ -256,8 +260,18 @@
                             && mb.isWritable()
                             && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
 
-                        mb.getUsedInWebPages().addAll(
-                            MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
+                        Map<String, List<String>> workspacePaths = MediaUsedInManager.getInstance().getUsedInPaths(
+                            media.getUUID());
+                        mb.getUsedInWebPages().addAll(workspacePaths.get(ContentRepository.WEBSITE));
+                        for (Map.Entry<String, List<String>> entry : workspacePaths.entrySet())
+                        {
+                            String repository = entry.getKey();
+                            for (String handle : entry.getValue())
+                            {
+                                String uri = URI2RepositoryManager.getInstance().getURI(repository, handle);
+                                mb.getUsedInUris().add(uri);
+                            }
+                        }
                     }
                     catch (RepositoryException ex)
                     {

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-05-12 09:06:47 UTC (rev 2403)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-05-12 09:37:09 UTC (rev 2404)
@@ -280,11 +280,11 @@
           <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
           <div class="pages menu" style="display: none;">
             <ul class="mediamenu">
-              [#list media.usedInWebPages as page]
+              [#list media.usedInUris as uri]
               <li>
-                <a href="${this.request.contextPath}${page}.html" target="_blank">
+                <a href="${this.request.contextPath}${uri}" target="_blank">
                   <img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" alt="" />
-                  <span>${page}</span>
+                  <span>${uri}</span>
                 </a>
               </li>
               [/#list]


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