svn commit: rev 36633 - incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common

[ekoneil]

Author: ekoneil
Date: Thu Aug 19 13:10:01 2004
New Revision: 36633

Modified:
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
Log:
Change the DataAccessProviderStack API to accept a JspContext instead of just a 
PageContext.

BB: self
DRT: NetUI pass
BVT: NetUI pass



Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
      Thu Aug 19 13:10:01 2004
@@ -19,7 +19,7 @@
 package org.apache.beehive.netui.script.common;
 
 import java.util.Stack;
-import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.JspContext;
 
 public class DataAccessProviderStack
 {
@@ -27,46 +27,49 @@
 
     private Stack _stack = null;
 
-    public static final void addDataAccessProvider(IDataAccessProvider 
provider, PageContext pageContext)
+    public static final void addDataAccessProvider(IDataAccessProvider 
provider, JspContext jspContext)
     {
+       assert jspContext != null;
+
         DataAccessProviderBean bean = new DataAccessProviderBean(provider);
         
-        Object val = pageContext.getAttribute(KEY);
+        Object val = jspContext.getAttribute(KEY);
         DataAccessProviderStack curStack = null;
         if(val == null)
         {
             curStack = new DataAccessProviderStack();
 
-            pageContext.setAttribute(KEY, curStack);
+            jspContext.setAttribute(KEY, curStack);
         }
         else curStack = (DataAccessProviderStack)val;
 
         curStack.push(bean);
-
-        pageContext.setAttribute("container", bean);
+       
+        jspContext.setAttribute("container", bean);
 
         return;
     }
 
-    public static final DataAccessProviderBean 
removeDataAccessProvider(PageContext pageContext)
+    public static final DataAccessProviderBean 
removeDataAccessProvider(JspContext jspContext)
     {
-        DataAccessProviderStack curStack = null;
-        Object val = pageContext.getAttribute(KEY);
+       assert jspContext != null;
+
+        Object val = jspContext.getAttribute(KEY);
         if(val != null)
         {
-            curStack = (DataAccessProviderStack)val;
+            DataAccessProviderStack curStack = (DataAccessProviderStack)val;
             DataAccessProviderBean lastTop = curStack.pop();
 
             if(!curStack.isEmpty())
-                pageContext.setAttribute("container", curStack.peek());
-            else pageContext.removeAttribute("container");
+                jspContext.setAttribute("container", curStack.peek());
+            else jspContext.removeAttribute("container");
 
             return lastTop;
         }
 
-        // TODO: error reporting when no stack is found in the PageContext
+       // todo: should this thrown an IllegalStateException?
 
-        return null;
+       return null;
     }
 
     public DataAccessProviderStack()