[Yanel-commits] rev 55810 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2011-01-02 12:54:56 +0100 (Sun, 02 Jan 2011)
New Revision: 55810

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
Log:
use getToolbarState method

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2011-01-02 11:52:40 UTC (rev 55809)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2011-01-02 11:54:56 UTC (rev 55810)
@@ -523,6 +523,15 @@
      * Get toolbar status from session
      */
     protected String getToolbarStatus() {
+        org.wyona.yanel.core.ToolbarState ts = getEnvironment().getToolbarState();
+        switch(ts) {
+            case ON: return "on";
+            case SUPPRESSED: return "on"; // Strictly backwards compatible
+            //case SUPPRESSED: return "suppressed";
+            default: return "off";
+        }
+
+/*
         // TODO: Use YanelServlet.TOOLBAR_KEY instead "toolbar"!
         javax.servlet.http.HttpSession session = getEnvironment().getRequest().getSession(true);
         if (session != null) {
@@ -530,6 +539,7 @@
         }
         log.warn("No session exists or could be created!");
         return null;
+*/
     }
 
     /**