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

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

Revision: 2759
          http://openutils.svn.sourceforge.net/openutils/?rev=2759&view=rev
Author:   diego_schivo
Date:     2010-06-30 13:15:14 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 mediatab link

Modified Paths:
--------------
    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/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 12:35:10 UTC (rev 2758)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 13:15:14 UTC (rev 2759)
@@ -38,6 +38,7 @@
 import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
 
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -47,6 +48,7 @@
 import java.util.Map;
 
 import javax.jcr.RepositoryException;
+import javax.print.attribute.standard.RequestingUserName;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -838,4 +840,31 @@
             param
         });
     }
+
+    /**
+     * Builds the href for the media type link in the navigation bar.
+     * @param type
+     * @return
+     */
+    public String mediatabLink(MediaTypeConfiguration type)
+    {
+        String link = "?" + StringUtils.defaultString(request.getQueryString());
+        int p1 = StringUtils.indexOfAny(link, new String[]{
+            "?type=", "&type="
+        });
+        if (p1 == -1)
+        {
+            link += ("?".equals(link) ? StringUtils.EMPTY : "&") + "type=" + type.getName();
+        }
+        else
+        {
+            int p2 = StringUtils.indexOf(link, '&', p1 + 1);
+            if (p2 == -1)
+            {
+                p2 = link.length();
+            }
+            link = StringUtils.substring(link, 0, p1 + 1) + "type=" + type.getName() + StringUtils.substring(link, p2);
+        }
+        return link;
+    }
 }

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-06-30 12:35:10 UTC (rev 2758)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-06-30 13:15:14 UTC (rev 2759)
@@ -160,7 +160,7 @@
           [#assign actual = ""]
         [/#if]
       <div class="voice mediatab ${actual}">
-        <a href="?type=${type.name}&amp;path=${this.path!?url!''}[#if this.request.parameterMap['selectMedia']?exists]&amp;selectMedia=true[/#if]&amp;search=${this.search!""}">
+        <a href="${this.mediatabLink(type)}">
           <img src="${this.request.contextPath}${type.menuIcon}" alt="${this.msgs.get('media.types.' + type.name)}" />
           ${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
         </a>


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