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

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

Revision: 3395
          http://openutils.svn.sourceforge.net/openutils/?rev=3395&view=rev
Author:   diego_schivo
Date:     2011-03-23 13:44:39 +0000 (Wed, 23 Mar 2011)

Log Message:
-----------
MEDIA-223 mediafolderpath cookie

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.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/MediaBrowserPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2011-03-23 13:38:14 UTC (rev 3394)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2011-03-23 13:44:39 UTC (rev 3395)
@@ -38,6 +38,7 @@
 import java.util.zip.ZipFile;
 
 import javax.jcr.RepositoryException;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -144,6 +145,16 @@
                 // should never happen
             }
         }
+        for (Cookie cookie : request.getCookies())
+        {
+            if ("mediafolderpath".equals(cookie.getName()))
+            {
+                if (StringUtils.isEmpty(openPath))
+                {
+                    openPath = cookie.getValue();
+                }
+            }
+        }
     }
 
     /**

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	2011-03-23 13:38:14 UTC (rev 3394)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2011-03-23 13:44:39 UTC (rev 3395)
@@ -86,8 +86,6 @@
 
     protected String sorting;
 
-    protected String mediaFolderPath;
-
     protected boolean selectMedia;
 
     protected String actMediaHandle;
@@ -157,7 +155,6 @@
         bgSelector = null;
         pagesizeSelector = null;
         sorting = null;
-        mediaFolderPath = null;
         for (Cookie cookie : request.getCookies())
         {
             if ("bgselector".equals(cookie.getName()))
@@ -172,10 +169,6 @@
             {
                 sorting = cookie.getValue();
             }
-            else if ("mediafolderpath".equals(cookie.getName()))
-            {
-                mediaFolderPath = cookie.getValue();
-            }
         }
         bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
         pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1");
@@ -626,15 +619,6 @@
     }
 
     /**
-     * Returns the mediaFolderPath.
-     * @return the mediaFolderPath
-     */
-    public String getMediaFolderPath()
-    {
-        return mediaFolderPath;
-    }
-
-    /**
      * Returns the writable.
      * @return the writable
      */

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-03-23 13:38:14 UTC (rev 3394)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-03-23 13:44:39 UTC (rev 3395)
@@ -18,7 +18,7 @@
 var viewport;
 var nodeid = "${this.nodeid!''}";
 var selectMedia = ${this.selectMedia?string("true", "false")};
-var openPath = "${this.openPath!this.mediaFolderPath!''}";
+var openPath = "${this.openPath!''}";
 var actMediaHandle = "${this.actMediaHandle!''}";
 var mediaType = "${this.mediaType!''}"; // get tree url
 


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