rleland 2002/12/07 22:54:52 Modified: src/share/org/apache/struts/taglib/html BaseHandlerTag.java ErrorsTag.java HtmlTag.java JavascriptValidatorTag.java MessagesTag.java OptionTag.java src/share/org/apache/struts/taglib/nested NestedNameSupport.java NestedPropertyTag.java NestedRootTag.java NestedWriteNestingTag.java src/share/org/apache/struts/taglib/nested/html NestedLinkTag.java src/share/org/apache/struts/taglib/template GetTag.java PutTag.java src/share/org/apache/struts/taglib/tiles AttributeToScopeTag.java DefinitionTag.java GetAttributeTag.java ImportAttributeTag.java InsertTag.java PutListTag.java PutTag.java UseAttributeTag.java src/share/org/apache/struts/taglib/tiles/ext TextTag.java src/share/org/apache/struts/taglib/tiles/util TagUtils.java Log: Npo functional change Fix JavaDoc and unused import statements. Revision Changes Path 1.20 +4 -10 jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java Index: BaseHandlerTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- BaseHandlerTag.java 16 Nov 2002 06:04:16 -0000 1.19 +++ BaseHandlerTag.java 8 Dec 2002 06:54:50 -0000 1.20 @@ -65,8 +65,6 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.Tag; -import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.Globals; import org.apache.struts.taglib.logic.IterateTag; @@ -774,8 +772,6 @@ /** * Allows HTML tags to find out if they're nested within an %lt;html:html> tag that * has xhtml set to true. - * @param tag - Tags should pass themselves into the method as a starting point - * for finding the parent html tag. * @return true if the tag is nested within an html tag with xhtml set to true, false * otherwise. * @since Struts 1.1 @@ -801,8 +797,6 @@ /** * Returns the closing brace for an input element depending on xhtml status. The tag * must be nested within an %lt;html:html> tag that has xhtml set to true. - * @param tag - Tags should pass themselves into the method as a starting point - * for finding the parent html tag. * @return String - > if xhtml is false, /> if xhtml is true * @since Struts 1.1 */ 1.19 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java Index: ErrorsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ErrorsTag.java 12 Nov 2002 03:47:42 -0000 1.18 +++ ErrorsTag.java 8 Dec 2002 06:54:51 -0000 1.19 @@ -70,7 +70,6 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.Globals; -import org.apache.struts.action.Action; import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.util.MessageResources; 1.9 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java Index: HtmlTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- HtmlTag.java 20 Nov 2002 05:00:18 -0000 1.8 +++ HtmlTag.java 8 Dec 2002 06:54:51 -0000 1.9 @@ -69,7 +69,6 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.Globals; -import org.apache.struts.action.Action; import org.apache.struts.util.MessageResources; import org.apache.struts.util.ResponseUtils; 1.19 +1 -2 jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java Index: JavascriptValidatorTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- JavascriptValidatorTag.java 21 Nov 2002 02:02:16 -0000 1.18 +++ JavascriptValidatorTag.java 8 Dec 2002 06:54:51 -0000 1.19 @@ -75,7 +75,6 @@ import org.apache.commons.validator.ValidatorUtil; import org.apache.commons.validator.Var; import org.apache.struts.Globals; -import org.apache.struts.action.Action; import org.apache.struts.config.ModuleConfig; import org.apache.struts.util.MessageResources; import org.apache.struts.util.RequestUtils; 1.7 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java Index: MessagesTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MessagesTag.java 12 Nov 2002 03:47:42 -0000 1.6 +++ MessagesTag.java 8 Dec 2002 06:54:51 -0000 1.7 @@ -67,7 +67,6 @@ import javax.servlet.jsp.tagext.BodyTagSupport; import org.apache.struts.Globals; -import org.apache.struts.action.Action; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.util.MessageResources; 1.14 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java Index: OptionTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- OptionTag.java 12 Nov 2002 03:47:42 -0000 1.13 +++ OptionTag.java 8 Dec 2002 06:54:51 -0000 1.14 @@ -69,7 +69,6 @@ import javax.servlet.jsp.tagext.BodyTagSupport; import org.apache.struts.Globals; -import org.apache.struts.action.Action; import org.apache.struts.util.MessageResources; import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; 1.3 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedNameSupport.java Index: NestedNameSupport.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedNameSupport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedNameSupport.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedNameSupport.java 8 Dec 2002 06:54:51 -0000 1.3 @@ -79,7 +79,7 @@ /** * The setter for the <i>name</i> property - * @param newProperty new String value to set the name property to + * @param newNamed new String value to set the name property to */ public void setName(String newNamed); 1.6 +6 -6 jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java Index: NestedPropertyTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NestedPropertyTag.java 16 Nov 2002 04:32:38 -0000 1.5 +++ NestedPropertyTag.java 8 Dec 2002 06:54:51 -0000 1.6 @@ -91,7 +91,7 @@ /** Setter method for the <i>property</i> property * Also, only setting the original property value to those values not * set by the nested logic. - * @param property new value for the property property + * @param newProperty new value for the property property */ public void setProperty(String newProperty) { property = newProperty; @@ -107,7 +107,7 @@ return this.name; } /** Setter method for the <i>name</i> property - * @param property new value for the name property + * @param name new value for the name property */ public void setName(String name) { this.name = name; 1.6 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedRootTag.java Index: NestedRootTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedRootTag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NestedRootTag.java 16 Nov 2002 04:32:38 -0000 1.5 +++ NestedRootTag.java 8 Dec 2002 06:54:51 -0000 1.6 @@ -104,7 +104,7 @@ return this.name; } /** Setter method for the <i>name</i> property - * @param property new value for the name property + * @param name new value for the name property */ public void setName(String name) { this.name = name; 1.3 +6 -6 jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java Index: NestedWriteNestingTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedWriteNestingTag.java 16 Nov 2002 04:32:38 -0000 1.2 +++ NestedWriteNestingTag.java 8 Dec 2002 06:54:51 -0000 1.3 @@ -85,7 +85,7 @@ } /** Setter method for the <i>property</i> property - * @param property new value for the property property + * @param newProperty new value for the property property */ public void setProperty(String newProperty) { this.property = newProperty; @@ -100,7 +100,7 @@ } /** Setter method for the <i>filter</i> property - * @param property new value for the filter property + * @param newFilter new value for the filter property */ public void setFilter(boolean newFilter) { this.filter = newFilter; 1.7 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java Index: NestedLinkTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NestedLinkTag.java 16 Nov 2002 04:38:36 -0000 1.6 +++ NestedLinkTag.java 8 Dec 2002 06:54:51 -0000 1.7 @@ -146,7 +146,7 @@ /** For the same reasons as the above method, we have to remember this * property to keep things correct here also. * - * @param newProperty new property value + * @param newParamProperty new property value */ public void setParamProperty(String newParamProperty) { /* let the real tag do its thang */ 1.15 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java Index: GetTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- GetTag.java 12 Nov 2002 03:56:09 -0000 1.14 +++ GetTag.java 8 Dec 2002 06:54:51 -0000 1.15 @@ -127,7 +127,7 @@ /** * Set the role attribute - * @param name The role the user must be in to retrieve content. + * @param role The role the user must be in to retrieve content. * @deprecated Use Tiles instead. */ public void setRole(String role) { 1.13 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java Index: PutTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- PutTag.java 21 Nov 2002 03:42:21 -0000 1.12 +++ PutTag.java 8 Dec 2002 06:54:51 -0000 1.13 @@ -119,7 +119,7 @@ /** * - * @param name The role the user must be in to store content. + * @param role The role the user must be in to store content. * @deprecated Use Tiles instead. */ public void setRole(String role) { 1.3 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java Index: AttributeToScopeTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AttributeToScopeTag.java 16 Nov 2002 04:46:05 -0000 1.2 +++ AttributeToScopeTag.java 8 Dec 2002 06:54:51 -0000 1.3 @@ -125,9 +125,9 @@ } /** - * Set the offset. + * Set the scope. * - * @param offset The new offset + * @param scope The new scope */ public void setScope(String scope) { 1.5 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java Index: DefinitionTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefinitionTag.java 16 Nov 2002 04:46:05 -0000 1.4 +++ DefinitionTag.java 8 Dec 2002 06:54:51 -0000 1.5 @@ -209,7 +209,7 @@ /** * Sets the value of the id property. * - * @param aId the new value of the id property + * @param id the new value of the id property */ public void setId(String id) { 1.6 +4 -4 jakarta-struts/src/share/org/apache/struts/taglib/tiles/GetAttributeTag.java Index: GetAttributeTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/GetAttributeTag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- GetAttributeTag.java 16 Nov 2002 04:46:05 -0000 1.5 +++ GetAttributeTag.java 8 Dec 2002 06:54:51 -0000 1.6 @@ -153,7 +153,7 @@ /** * Set role attribute - * @param name The role the user must be in to store content. + * @param role The role the user must be in to store content. */ public void setRole(String role) { this.role = role; 1.5 +4 -4 jakarta-struts/src/share/org/apache/struts/taglib/tiles/ImportAttributeTag.java Index: ImportAttributeTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/ImportAttributeTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ImportAttributeTag.java 16 Nov 2002 04:46:05 -0000 1.4 +++ ImportAttributeTag.java 8 Dec 2002 06:54:51 -0000 1.5 @@ -137,7 +137,7 @@ /** * Set the scope by its string name. * - * @param offset The new offset + * @param scope The new scope */ public void setScope(String scope) { 1.7 +7 -7 jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java Index: InsertTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- InsertTag.java 12 Nov 2002 03:56:09 -0000 1.6 +++ InsertTag.java 8 Dec 2002 06:54:51 -0000 1.7 @@ -612,9 +612,9 @@ /** * Process a bean. * Get bean value, eventually using property and scope. Found value is process by processObjectValue(). - * @param name Name of the bean - * @param property Property in the bean, or null. - * @param scope bean scope, or null. + * @param beanName Name of the bean + * @param beanProperty Property in the bean, or null. + * @param beanScope bean scope, or null. * @return Appropriate TagHandler. * @throws JspException - NoSuchDefinitionException No value associated to bean. * @throws JspException an error occur while reading bean, or no definition found. 1.3 +4 -4 jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutListTag.java Index: PutListTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutListTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PutListTag.java 16 Nov 2002 04:46:05 -0000 1.2 +++ PutListTag.java 8 Dec 2002 06:54:51 -0000 1.3 @@ -128,7 +128,7 @@ /** * Set role attribute - * @param name The role the user must be in to store content. + * @param role The role the user must be in to store content. */ public void setRole(String role) { 1.5 +7 -7 jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutTag.java Index: PutTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PutTag.java 16 Nov 2002 04:42:51 -0000 1.4 +++ PutTag.java 8 Dec 2002 06:54:51 -0000 1.5 @@ -296,7 +296,7 @@ /** * Set role attribute - * @param name The role the user must be in to store content. + * @param role The role the user must be in to store content. */ public void setRole(String role) { this.role = role; @@ -314,7 +314,7 @@ * Get real value according to tag attribute. * Real value is the value compute after attribute processing : * @return real value. - * @throws JspTagException If something goes wrong while getting value from bean. + * @throws JspException If something goes wrong while getting value from bean. */ public Object getRealValue() throws JspException { @@ -326,7 +326,7 @@ /** * Compute real value according to tag attributes. - * @throws JspTagException If something goes wrong while getting value from bean. + * @throws JspException If something goes wrong while getting value from bean. */ protected void computeRealValue() throws JspException { @@ -396,7 +396,7 @@ /** * Extract real value from specified bean. - * @throws JspTagException If something goes wrong while getting value from bean. + * @throws JspException If something goes wrong while getting value from bean. */ protected void getRealValueFromBean() throws JspException { 1.7 +7 -7 jakarta-struts/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java Index: UseAttributeTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- UseAttributeTag.java 6 Dec 2002 07:58:39 -0000 1.6 +++ UseAttributeTag.java 8 Dec 2002 06:54:51 -0000 1.7 @@ -142,9 +142,9 @@ /** - * Set the length. + * Set the class name. * - * @param length The new length + * @param name The new class name */ public void setClassname(String name) { @@ -168,9 +168,9 @@ } /** - * Set the offset. + * Set the scope. * - * @param offset The new offset + * @param scope The new ecope */ public void setScope(String scope) { this.scopeName = scope; 1.2 +5 -12 jakarta-struts/src/share/org/apache/struts/taglib/tiles/ext/TextTag.java Index: TextTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/ext/TextTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TextTag.java 25 Jun 2002 03:17:19 -0000 1.1 +++ TextTag.java 8 Dec 2002 06:54:52 -0000 1.2 @@ -62,19 +62,12 @@ package org.apache.struts.taglib.tiles.ext; -import org.apache.struts.taglib.html.BaseFieldTag; -import org.apache.struts.taglib.html.Constants; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; +import org.apache.struts.taglib.html.BaseFieldTag; import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; -import org.apache.struts.util.MessageResources; /** 1.4 +7 -7 jakarta-struts/src/share/org/apache/struts/taglib/tiles/util/TagUtils.java Index: TagUtils.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/util/TagUtils.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TagUtils.java 12 Nov 2002 03:56:10 -0000 1.3 +++ TagUtils.java 8 Dec 2002 06:54:52 -0000 1.4 @@ -89,7 +89,7 @@ /** * Get scope value from string value * @param scopeName scope as a String - * @param default returned value, if not found. + * @param defaultValue returned value, if not found. * @return scope as an int, or defaultValue if scope is null. * @throws JspException Scope name is not recognize as a valid scope. */ @@ -141,8 +141,8 @@ * Retrieve bean from page context, using specified scope. * If scope is not setted, use findAttribute. * - * @param bean Name Name of bean to retrieve - * @param scope Name Scope or null. If null, bean is searched using + * @param beanName Name of bean to retrieve + * @param scopeName Scope or null. If null, bean is searched using * findAttribute. * @param pageContext Current pageContext. * @@ -303,7 +303,7 @@ * * @param pageContext current pageContext * @param name Name of the bean - * @param value Bean value to store + * @param beanValue Bean value to store * * @exception JspException if an invalid scope name * is requested
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>