dgraham 2003/07/04 14:23:13
Modified: src/share/org/apache/struts/action Action.java
Log:
Removed deprecated perform() methods.
Revision Changes Path
1.63 +26 -82 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Action.java 1 Jul 2003 01:24:10 -0000 1.62
+++ Action.java 4 Jul 2003 21:23:12 -0000 1.63
@@ -185,17 +185,26 @@
* @param response The non-HTTP response we are creating
*
* @exception Exception if the application business logic throws
- * an exception
+ * an exception.
* @since Struts 1.1
*/
- public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- ServletRequest request,
- ServletResponse response)
+ public ActionForward execute(
+ ActionMapping mapping,
+ ActionForm form,
+ ServletRequest request,
+ ServletResponse response)
throws Exception {
- // Call the deprecated method for backwards compatibility
- return (perform(mapping, form, request, response));
+ try {
+ return execute(
+ mapping,
+ form,
+ (HttpServletRequest) request,
+ (HttpServletResponse) response);
+
+ } catch (ClassCastException e) {
+ return null;
+ }
}
@@ -217,79 +226,14 @@
* an exception
* @since Struts 1.1
*/
- public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
+ public ActionForward execute(
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
throws Exception {
- // Call the deprecated method for backwards compatibility
- return (perform(mapping, form, request, response));
-
- }
-
-
- /**
- * Process the specified non-HTTP request, and create the corresponding
- * non-HTTP response (or forward to another web component that will create
- * it). Return an <code>ActionForward</code> instance describing where
- * and how control should be forwarded, or <code>null</code> if the
- * response has already been completed.
- * <p>
- * The default implementation attempts to forward to the HTTP version of
- * this method.
- *
- * @param mapping The ActionMapping used to select this instance
- * @param form The optional ActionForm bean for this request (if any)
- * @param request The non-HTTP request we are processing
- * @param response The non-HTTP response we are creating
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- *
- * @deprecated Use the <code>execute()</code> method instead
- */
- public ActionForward perform(ActionMapping mapping,
- ActionForm form,
- ServletRequest request,
- ServletResponse response)
- throws IOException, ServletException {
-
- try {
- return (perform(mapping, form,
- (HttpServletRequest) request,
- (HttpServletResponse) response));
- } catch (ClassCastException e) {
- return (null);
- }
-
- }
-
-
- /**
- * Process the specified HTTP request, and create the corresponding HTTP
- * response (or forward to another web component that will create it).
- * Return an <code>ActionForward</code> instance describing where and how
- * control should be forwarded, or <code>null</code> if the response has
- * already been completed.
- *
- * @param mapping The ActionMapping used to select this instance
- * @param form The optional ActionForm bean for this request (if any)
- * @param request The HTTP request we are processing
- * @param response The HTTP response we are creating
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- *
- * @deprecated Use the <code>execute()</code> method instead
- */
- public ActionForward perform(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- return (null); // Override this method to provide functionality
+ return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
