You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by rl...@apache.org on 2002/12/08 09:14:30 UTC
cvs commit: jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold BaseAction.java BaseHelperAction.java BaseMapForm.java BizAction.java BizForm.java BizFormImpl.java ContinueAction.java ExistsAttributeAction.java FindForwardAction.java ParameterAction.java ProcessAction.java ProcessDispatchAction.java ProcessFormAction.java RelayAction.java RemoveAttributeAction.java SetPathsAction.java SuccessAction.java
rleland 2002/12/08 00:14:30
Modified: contrib/scaffold/src/java/org/apache/struts/scaffold
BaseAction.java BaseHelperAction.java
BaseMapForm.java BizAction.java BizForm.java
BizFormImpl.java ContinueAction.java
ExistsAttributeAction.java FindForwardAction.java
ParameterAction.java ProcessAction.java
ProcessDispatchAction.java ProcessFormAction.java
RelayAction.java RemoveAttributeAction.java
SetPathsAction.java SuccessAction.java
Log:
Remove unused import statements &
fix obvious JavaDoc items ie wrong param names.
Revision Changes Path
1.8 +1 -2 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java
Index: BaseAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseAction.java 23 Nov 2002 19:09:19 -0000 1.7
+++ BaseAction.java 8 Dec 2002 08:14:29 -0000 1.8
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.Properties;
import javax.servlet.ServletException;
1.2 +2 -5 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java
Index: BaseHelperAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseHelperAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseHelperAction.java 14 Aug 2002 18:30:09 -0000 1.1
+++ BaseHelperAction.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -3,9 +3,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.commons.scaffold.lang.Log;
@@ -74,8 +72,7 @@
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
* <p>
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
+ * @exception Exception if error occurs
*/
public void executeLogic(
ActionMapping mapping,
1.2 +4 -4 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java
Index: BaseMapForm.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseMapForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseMapForm.java 14 Aug 2002 18:30:08 -0000 1.1
+++ BaseMapForm.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -35,7 +35,7 @@
/**
* Get the properties map.
*
- * @returns The map being used for our properties
+ * @return The map being used for our properties
*/
public Map getMap() throws Exception {
return this.map;
@@ -52,7 +52,7 @@
* In a Struts 1.1 application, this will set an element to the
* map. See also <code>getValue()</code>.
* <p>
- * @exception Passes through any Exception thrown by underlying
+ * @exception Exception Passes through any Exception thrown by underlying
* hashmap.
* @param key - key with which the specified value is to be associated.
* @param value - value to be associated with the specified key.*/
@@ -69,7 +69,7 @@
* property from the Map, e.g., property="value(username)"
* <p>
* @param key - key whose associated value is to be returned.
- * @exception Passes through any Exception thrown by underlying
+ * @exception Exception Passes through any Exception thrown by underlying
* hashmap.
*/
public Object getValue(String key) throws Exception {
1.2 +5 -17 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BizAction.java
Index: BizAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BizAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BizAction.java 24 Nov 2002 15:53:05 -0000 1.1
+++ BizAction.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -1,21 +1,14 @@
package org.apache.struts.scaffold;
-import java.io.IOException;
-import java.io.PrintWriter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.BeanUtils;
@@ -26,8 +19,6 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
-
import org.apache.commons.scaffold.lang.Log;
import org.apache.commons.scaffold.lang.ParameterException;
import org.apache.commons.scaffold.lang.Tokens;
@@ -140,7 +131,6 @@
* If data is a Collection, only the first element is stored.
*
* @param mapping The ActionMapping used to select this instance
- * @param form The ActionForm
* @param request The HTTP request we are processing
* @param bizResponse The BizResponse we are handling
*/
@@ -189,7 +179,6 @@
* By default, this is the <code>form-bean</code>'s name.
*
* @param mapping The ActionMapping used to select this instance
- * @param form The ActionForm
* @param request The HTTP request we are processing
* @param bizResponse The BizResponse we are handling
*/
@@ -333,7 +322,7 @@
* superclass method.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request
+ * @param form The optional ActionForm bean for this request
* @param request The HTTP request we are processing
* @param response The resonse we are creating
* @return The ActionForward representing FAILURE
@@ -371,7 +360,7 @@
* default behaviour will branch to findFailure().
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request
+ * @param form The optional ActionForm bean for this request
* @param request The HTTP request we are processing
* @param response The resonse we are creating
*/
@@ -540,9 +529,8 @@
* @param form The ActionForm
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
- * @param helper The object instantiated from type given as parameter.
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
+ * @param helpers The object instantiated from type given as parameter.
+ * @exception Exception if a error occurs
*/
protected void executeLogic(
ActionMapping mapping,
1.2 +1 -10 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BizForm.java
Index: BizForm.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BizForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BizForm.java 24 Nov 2002 15:53:05 -0000 1.1
+++ BizForm.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -1,16 +1,10 @@
package org.apache.struts.scaffold;
-import java.util.Map;
-import org.apache.commons.beanutils.BeanUtils;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMapping;
// import org.apache.struts.validator.ValidatorForm; // Struts 1.1
import com.wintecinc.struts.action.ValidatorForm; // Struts 1.0.x
@@ -83,10 +77,7 @@
* Override this approach to implement another method (e.g cookies).
* Also revise UpdateProfile action-mapping to store changes.
*
- * @param mapping The ActionMapping used to select this instance
- * @param form The ActionForm
* @param request The HTTP request we are processing
- * @param response The HTTP response we are creating
*/
public void resetUserProfile(HttpServletRequest request);
1.3 +1 -6 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java
Index: BizFormImpl.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BizFormImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BizFormImpl.java 24 Nov 2002 15:53:05 -0000 1.2
+++ BizFormImpl.java 8 Dec 2002 08:14:29 -0000 1.3
@@ -5,12 +5,7 @@
import org.apache.commons.beanutils.BeanUtils;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionFormBeans;
import org.apache.struts.action.ActionMapping;
// import org.apache.struts.validator.ValidatorForm; // Struts 1.1
import com.wintecinc.struts.action.ValidatorForm; // Struts 1.0.x
1.2 +3 -8 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ContinueAction.java
Index: ContinueAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ContinueAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContinueAction.java 14 Aug 2002 18:30:08 -0000 1.1
+++ ContinueAction.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -1,17 +1,12 @@
package org.apache.struts.scaffold;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
import org.apache.commons.scaffold.lang.Tokens;
1.3 +2 -7 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ExistsAttributeAction.java
Index: ExistsAttributeAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ExistsAttributeAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExistsAttributeAction.java 16 Aug 2002 22:29:24 -0000 1.2
+++ ExistsAttributeAction.java 8 Dec 2002 08:14:29 -0000 1.3
@@ -1,19 +1,14 @@
package org.apache.struts.scaffold;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
import org.apache.commons.scaffold.lang.Tokens;
@@ -41,7 +36,7 @@
* If both parameters are not given, an error is set.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request
+ * @param form The optional ActionForm bean for this request
* @param request The HTTP request we are processing
* @param response The response we are creating
* @todo Add support for multiple attributes
1.2 +3 -8 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/FindForwardAction.java
Index: FindForwardAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/FindForwardAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FindForwardAction.java 14 Aug 2002 18:30:08 -0000 1.1
+++ FindForwardAction.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -1,17 +1,12 @@
package org.apache.struts.scaffold;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
import org.apache.commons.scaffold.lang.Tokens;
1.4 +4 -11 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ParameterAction.java
Index: ParameterAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ParameterAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParameterAction.java 11 Nov 2002 21:25:53 -0000 1.3
+++ ParameterAction.java 8 Dec 2002 08:14:29 -0000 1.4
@@ -1,22 +1,15 @@
package org.apache.struts.scaffold;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.scaffold.lang.Tokens;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
/**
1.8 +1 -8 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java
Index: ProcessAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProcessAction.java 24 Nov 2002 15:53:05 -0000 1.7
+++ ProcessAction.java 8 Dec 2002 08:14:29 -0000 1.8
@@ -2,30 +2,23 @@
import java.io.IOException;
-import java.io.PrintWriter;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
import java.util.Map;
-import java.util.StringTokenizer;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
import org.apache.commons.scaffold.lang.Log;
import org.apache.commons.scaffold.lang.Tokens;
1.8 +1 -16 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java
Index: ProcessDispatchAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProcessDispatchAction.java 23 Nov 2002 19:09:07 -0000 1.7
+++ ProcessDispatchAction.java 8 Dec 2002 08:14:29 -0000 1.8
@@ -2,35 +2,20 @@
import java.io.IOException;
-import java.io.PrintWriter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.HashMap;
import java.util.Map;
-import java.util.StringTokenizer;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-
-import org.apache.struts.util.MessageResources;
import org.apache.commons.scaffold.lang.Log;
import org.apache.commons.scaffold.lang.Tokens;
1.7 +1 -2 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java
Index: ProcessFormAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProcessFormAction.java 31 Oct 2002 14:32:07 -0000 1.6
+++ ProcessFormAction.java 8 Dec 2002 08:14:29 -0000 1.7
@@ -1,7 +1,6 @@
package org.apache.struts.scaffold;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.beanutils.BeanUtils;
1.2 +3 -8 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/RelayAction.java
Index: RelayAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/RelayAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelayAction.java 14 Aug 2002 18:30:08 -0000 1.1
+++ RelayAction.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -1,16 +1,11 @@
package org.apache.struts.scaffold;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
import org.apache.commons.scaffold.lang.Tokens;
1.4 +3 -7 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/RemoveAttributeAction.java
Index: RemoveAttributeAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/RemoveAttributeAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoveAttributeAction.java 27 Sep 2002 18:59:52 -0000 1.3
+++ RemoveAttributeAction.java 8 Dec 2002 08:14:29 -0000 1.4
@@ -1,19 +1,15 @@
package org.apache.struts.scaffold;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
+
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
import org.apache.commons.scaffold.lang.Tokens;
@@ -46,7 +42,7 @@
* If both parameters are not given, an error is set.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request
+ * @param form The optional ActionForm bean for this request
* @param request The HTTP request we are processing
* @param response The response we are creating
* @todo Add support for multiple attributes
1.2 +3 -6 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java
Index: SetPathsAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/SetPathsAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetPathsAction.java 31 Oct 2002 20:24:21 -0000 1.1
+++ SetPathsAction.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -6,11 +6,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
import org.apache.struts.scaffold.BaseAction;
import org.apache.commons.scaffold.lang.Log;
1.2 +5 -5 jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/SuccessAction.java
Index: SuccessAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/SuccessAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SuccessAction.java 14 Aug 2002 18:30:08 -0000 1.1
+++ SuccessAction.java 8 Dec 2002 08:14:29 -0000 1.2
@@ -11,7 +11,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
+
import org.apache.commons.scaffold.lang.Tokens;
@@ -30,7 +30,7 @@
* Forward to "success" [Tokens.SUCCESS].
*
* @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
* @exception IOException if an input/output error occurs
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>