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

[michi at wyona.com]

Author: michi
Date: 2011-01-02 13:19:00 +0100 (Sun, 02 Jan 2011)
New Revision: 55812

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
differentiate between on and suppressed toolbar state

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-01-02 12:09:29 UTC (rev 55811)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-01-02 12:19:00 UTC (rev 55812)
@@ -932,8 +932,10 @@
             }
             //log.debug("State of view: " + stateOfView);
             Environment environment = new Environment(request, response, identity, stateOfView, null);
-            if (yanelUI.isToolbarEnabled(request)) { // TODO: Differentiate between ON and SUPPRESSED
+            if (yanelUI.isToolbarEnabled(request)) {
                 environment.setToolbarState(ToolbarState.ON);
+            } else if (yanelUI.isToolbarSuppressed(request)) {
+                environment.setToolbarState(ToolbarState.SUPPRESSED);
             } else {
                 environment.setToolbarState(ToolbarState.OFF);
             }