[Yanel-commits] rev 23249 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

[paloma at wyona.com]

Author: paloma
Date: 2007-03-13 17:05:11 +0100 (Tue, 13 Mar 2007)
New Revision: 23249

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
directly show toolbar after login form. Thanks to Josias

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-13 16:00:07 UTC (rev 23248)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-13 16:05:11 UTC (rev 23249)
@@ -223,18 +223,7 @@
         }
 
         // Check for toolbar ...
-        String yanelToolbar = request.getParameter("yanel.toolbar");
-        if(yanelToolbar != null) {
-            if (yanelToolbar.equals("on")) {
-                log.info("Turn on toolbar!");
-                session.setAttribute(TOOLBAR_KEY, "on");
-            } else if (yanelToolbar.equals("off")) {
-                log.info("Turn off toolbar!");
-                session.setAttribute(TOOLBAR_KEY, "off");
-            } else {
-                log.warn("No such toolbar value: " + yanelToolbar);
-            }
-        }
+        checkToolbar(request);
 
         // Check for requests refered by WebDAV
         String yanelWebDAV = request.getParameter("yanel.webdav");
@@ -253,6 +242,28 @@
     }
     
     /**
+     * Checks if the yanel.toolbar request-param is set and stores
+     * the value of the parameter in the session.
+     * @param request
+     */
+    private void checkToolbar(HttpServletRequest request) {
+        // Check for toolbar ...
+        String yanelToolbar = request.getParameter("yanel.toolbar");
+        if(yanelToolbar != null) {
+            HttpSession session = request.getSession(false);
+            if (yanelToolbar.equals("on")) {
+                log.info("Turn on toolbar!");
+                session.setAttribute(TOOLBAR_KEY, "on");
+            } else if (yanelToolbar.equals("off")) {
+                log.info("Turn off toolbar!");
+                session.setAttribute(TOOLBAR_KEY, "off");
+            } else {
+                log.warn("No such toolbar value: " + yanelToolbar);
+            }
+        }
+    }
+    
+    /**
      * Returns the mime-type according to the given file extension.
      * Default is application/octet-stream.
      * @param extension
@@ -669,6 +680,9 @@
                 }
             }
 
+            // Check for toolbar ...
+            checkToolbar(request);
+            
             getContent(request, response);
         }
     }