webwork/src/main/webwork/action/standard JSP.java,1.10,1.11

Update of /cvsroot/opensymphony/webwork/src/main/webwork/action/standard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20558/src/main/webwork/action/standard

Modified Files:
	JSP.java 
Log Message:
Fixed a bunch of 1.5 related warnings

Index: JSP.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/action/standard/JSP.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- JSP.java	9 Sep 2002 21:21:16 -0000	1.10
+++ JSP.java	19 Mar 2005 19:20:21 -0000	1.11
@@ -9,19 +9,15 @@
 import webwork.action.Action;
 import webwork.action.ActionSupport;
 import webwork.action.ActionContext;
-import webwork.action.factory.ActionFactory;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Locale;
-
-import org.apache.commons.logging.*;
 
 /**
  *	JSP execution wrapper. This action allows JSP pages to be executed as actions.
@@ -30,7 +26,7 @@
  * Well defined result status constants are defined in the Action interface.
  *
  *	@see webwork.action.Action
- *	@author Rickard Öberg ([email protected])
+ *	@author Rickard �berg ([email protected])
  *	@version $Revision$
  */
 public class JSP
@@ -58,7 +54,7 @@
    public void setPage(String aPageName)
    {
       pageName = aPageName;
-      dispatcher = ActionContext.getContext().getRequest().getRequestDispatcher(aPageName);
+      dispatcher = ActionContext.getRequest().getRequestDispatcher(aPageName);
    }
 
    // Action implementation -----------------------------------------
@@ -73,19 +69,17 @@
    public String execute()
       throws Exception
    {
-      // Get servlet context
-      ActionContext ctx = ActionContext.getContext();
-
       // Create wrapper which ignores all content-modifying calls
-      HttpServletResponse res = new WrapperHttpServletResponse(ctx.getResponse());
+      HttpServletResponse res = new WrapperHttpServletResponse(ActionContext.getResponse());
 
-      String oldResult = (String)ctx.getRequest().getAttribute("result");
+     HttpServletRequest request = ActionContext.getRequest();
+     String oldResult = (String)request.getAttribute("result");
 
       // Execute JSP
-      dispatcher.forward(ctx.getRequest(), res);
+      dispatcher.forward(request, res);
 
       // Extract the result
-      String result =(String)ctx.getRequest().getAttribute("result");
+      String result =(String)request.getAttribute("result");
 
       // Default to success
       if (result == null)
@@ -93,9 +87,9 @@
 
       // Restore request attribute
       if (oldResult == null)
-         ctx.getRequest().removeAttribute("result");
+         request.removeAttribute("result");
       else
-         ctx.getRequest().setAttribute("result", oldResult);
+         request.setAttribute("result", oldResult);
       return result;
    }
 
@@ -126,7 +120,7 @@
       {
          return new ServletOutputStream()
          {
-            public void write(int b) throws IOException
+            public void write(int b)
             {
                // Throw away
             }



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click