martinc 2002/09/21 22:46:52
Modified: src/share/org/apache/struts/action Action.java
ActionErrors.java ActionMappings.java
ActionServlet.java ActionServletWrapper.java
ExceptionHandler.java RequestProcessor.java
Log:
Cleanup identified by IDEA. I think I'm a convert...
Revision Changes Path
1.47 +7 -9 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Action.java 28 Jul 2002 00:17:27 -0000 1.46
+++ Action.java 22 Sep 2002 05:46:51 -0000 1.47
@@ -67,7 +67,6 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Locale;
-import java.util.Hashtable;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -80,7 +79,6 @@
import org.apache.struts.config.ApplicationConfig;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.upload.MultipartRequestHandler;
/**
@@ -414,7 +412,7 @@
* this method.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request (if any)
+ * @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
*
@@ -448,7 +446,7 @@
* already been completed.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request (if any)
+ * @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
*
@@ -691,7 +689,7 @@
session.removeAttribute(TRANSACTION_TOKEN_KEY);
// Retrieve the transaction token included in this request
- String token = (String) request.getParameter(Constants.TOKEN_KEY);
+ String token = request.getParameter(Constants.TOKEN_KEY);
if (token == null)
return (false);
1.8 +4 -8
jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java
Index: ActionErrors.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ActionErrors.java 25 Jun 2002 01:30:40 -0000 1.7
+++ ActionErrors.java 22 Sep 2002 05:46:51 -0000 1.8
@@ -64,10 +64,6 @@
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.HashMap;
/**
1.9 +4 -6
jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java
Index: ActionMappings.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ActionMappings.java 13 Jan 2002 00:25:35 -0000 1.8
+++ ActionMappings.java 22 Sep 2002 05:46:51 -0000 1.9
@@ -64,8 +64,6 @@
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections.FastHashMap;
1.120 +5 -5
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ActionServlet.java 27 Jul 2002 21:53:13 -0000 1.119
+++ ActionServlet.java 22 Sep 2002 05:46:51 -0000 1.120
@@ -789,7 +789,7 @@
* Look up and return the {@link RequestProcessor} responsible for the
* specified application module, creating a new one if necessary.
*
- * @param appConfig The application module configuration for which to
+ * @param config The application module configuration for which to
* acquire and return a RequestProcessor.
*
* @exception ServletException if we cannot instantiate a RequestProcessor
1.5 +4 -5
jakarta-struts/src/share/org/apache/struts/action/ActionServletWrapper.java
Index: ActionServletWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServletWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ActionServletWrapper.java 25 Jun 2002 00:42:44 -0000 1.4
+++ ActionServletWrapper.java 22 Sep 2002 05:46:52 -0000 1.5
@@ -63,7 +63,6 @@
package org.apache.struts.action;
import org.apache.struts.upload.MultipartRequestHandler;
-import org.apache.struts.upload.MultipartRequestWrapper;
/**
1.8 +0 -3
jakarta-struts/src/share/org/apache/struts/action/ExceptionHandler.java
Index: ExceptionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ExceptionHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExceptionHandler.java 22 Sep 2002 05:36:37 -0000 1.7
+++ ExceptionHandler.java 22 Sep 2002 05:46:52 -0000 1.8
@@ -54,11 +54,8 @@
*/
package org.apache.struts.action;
-import java.util.Locale;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
1.19 +4 -6
jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java
Index: RequestProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RequestProcessor.java 27 Aug 2002 00:38:12 -0000 1.18
+++ RequestProcessor.java 22 Sep 2002 05:46:52 -0000 1.19
@@ -77,9 +77,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts.config.ActionConfig;
import org.apache.struts.config.ApplicationConfig;
-import org.apache.struts.config.ControllerConfig;
import org.apache.struts.config.ExceptionConfig;
-import org.apache.struts.config.FormBeanConfig;
import org.apache.struts.config.ForwardConfig;
import org.apache.struts.upload.MultipartRequestWrapper;
import org.apache.struts.taglib.html.Constants;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
