svn commit: rev 56634 - in incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags: html rendering

[dolander]

Author: dolander
Date: Thu Nov  4 15:27:57 2004
New Revision: 56634

Modified:
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java
Log:
Convert the WriteRenderAppender to using JspContext instead of PageContext




Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
    Thu Nov  4 15:27:57 2004
@@ -190,8 +190,6 @@
         if (scriptId != null)
             write(scriptId);
 
-        //write(results.toString());
-
         localRelease();
         return EVAL_PAGE;
     }

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java
        Thu Nov  4 15:27:57 2004
@@ -3,9 +3,8 @@
 import org.apache.beehive.netui.util.Bundle;
 import org.apache.beehive.netui.util.logging.Logger;
 import org.apache.struts.util.RequestUtils;
-import org.apache.struts.util.ResponseUtils;
 
-import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspContext;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 import java.io.IOException;
@@ -14,28 +13,31 @@
 {
     private static final Logger logger = 
Logger.getInstance(WriteRenderAppender.class);
 
-    private PageContext _pc;
+    private JspContext _jspC;
 
     public WriteRenderAppender()
     {
     }
 
-    public WriteRenderAppender(PageContext pc)
+    public WriteRenderAppender(JspContext jspC)
     {
-        _pc = pc;
+        _jspC = jspC;
     }
 
-    public void setPageContext(PageContext pc)
+    public void setPageContext(JspContext jspC)
     {
-        _pc = pc;
+        _jspC = jspC;
     }
 
     public void append(String s)
     {
+        JspWriter writer = _jspC.getOut();
         try {
-            ResponseUtils.write(_pc, s);
+            writer.print(s);
         }
-        catch (JspException e) {
+        catch (IOException e) {
+            if (_jspC instanceof PageContext)
+                RequestUtils.saveException((PageContext) _jspC, e);
             logger.error(Bundle.getString("Tags_WriteException"), e);
         }
     }
@@ -46,12 +48,13 @@
      */
     public void append(char c)
     {
-        JspWriter writer = _pc.getOut();
+        JspWriter writer = _jspC.getOut();
         try {
             writer.print(c);
         }
         catch (IOException e) {
-            RequestUtils.saveException(_pc, e);
+            if (_jspC instanceof PageContext)
+                RequestUtils.saveException((PageContext) _jspC, e);
             logger.error(Bundle.getString("Tags_WriteException"), e);
         }
     }