[Yanel-commits] rev 53530 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2010-09-29 09:35:41 +0200 (Wed, 29 Sep 2010)
New Revision: 53530

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelHTMLUI.java
Log:
yanel.toolbar parametrized and suppress added to value check

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelHTMLUI.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelHTMLUI.java	2010-09-29 07:04:49 UTC (rev 53529)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelHTMLUI.java	2010-09-29 07:35:41 UTC (rev 53530)
@@ -23,6 +23,7 @@
 class YanelHTMLUI {
 
     private static final String TOOLBAR_KEY = "toolbar";
+    private static final String TOOLBAR_PARAM_NAME = "yanel.toolbar";
 
     private String reservedPrefix;
     private Map map;
@@ -41,7 +42,7 @@
      */
     void switchToolbar(HttpServletRequest request) {
         // Check for toolbar ...
-        String yanelToolbar = request.getParameter("yanel.toolbar");
+        String yanelToolbar = request.getParameter(TOOLBAR_PARAM_NAME);
         if(yanelToolbar != null) {
             if (yanelToolbar.equals("on")) {
                 log.info("Turn on toolbar!");
@@ -49,6 +50,8 @@
             } else if (yanelToolbar.equals("off")) {
                 log.info("Turn off toolbar!");
                 disableToolbar(request);
+            } else if (yanelToolbar.equals("suppress")) { // INFO: See isToolbarEnabled(HttpServletRequest)
+                log.info("Suppress toolbar!");
             } else {
                 log.warn("No such toolbar value: " + yanelToolbar);
             }
@@ -280,8 +283,8 @@
     boolean isToolbarEnabled(HttpServletRequest request) {
         String toolbarStatus = (String) request.getSession(true).getAttribute(TOOLBAR_KEY);
         if (toolbarStatus != null && toolbarStatus.equals("on")) {
-            String yanelToolbar = request.getParameter("yanel.toolbar");
-            if(yanelToolbar != null && request.getParameter("yanel.toolbar").equals("suppress")) {
+            String yanelToolbar = request.getParameter(TOOLBAR_PARAM_NAME);
+            if(yanelToolbar != null && request.getParameter(TOOLBAR_PARAM_NAME).equals("suppress")) {
                 return false;
             } else {
                 return true;