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

[michi at wyona.com]

Author: michi
Date: 2011-01-02 12:52:40 +0100 (Sun, 02 Jan 2011)
New Revision: 55809

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
set toolbar enabled

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 11:50:14 UTC (rev 55808)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-01-02 11:52:40 UTC (rev 55809)
@@ -39,6 +39,7 @@
 import org.wyona.yanel.core.Resource;
 import org.wyona.yanel.core.ResourceConfiguration;
 import org.wyona.yanel.core.ResourceTypeRegistry;
+import org.wyona.yanel.core.ToolbarState;
 import org.wyona.yanel.core.Yanel;
 import org.wyona.yanel.core.api.attributes.IntrospectableV1;
 import org.wyona.yanel.core.api.attributes.ModifiableV1;
@@ -924,13 +925,18 @@
             identity = getIdentity(request, map);
             Realm realm = map.getRealm(request.getServletPath());
             String stateOfView = StateOfView.AUTHORING;
-            if (yanelUI.isToolbarEnabled(request)) {
+            if (yanelUI.isToolbarEnabled(request)) { // TODO: Is this the only criteria?
                 stateOfView = StateOfView.AUTHORING;
             } else {
                 stateOfView = StateOfView.LIVE;
             }
             //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
+                environment.setToolbarState(ToolbarState.ON);
+            } else {
+                environment.setToolbarState(ToolbarState.OFF);
+            }
             return environment;
         } catch (Exception e) {
             throw new ServletException(e.getMessage(), e);