Return-Path:
*
getOut()
*
- * @since JSP2.0
+ * @since 2.0
*/
public abstract class JspContext {
@@ -136,7 +134,7 @@
abstract public void setAttribute(String name, Object attribute);
/**
- * register the name and object specified with appropriate scope semantics
+ * Register the name and object specified with appropriate scope semantics.
*
* @param name the name of the attribute to set
* @param o the object to associate with the name
@@ -218,7 +216,7 @@
abstract public int getAttributesScope(String name);
/**
- * Enumerate all the attributes in a given scope
+ * Enumerate all the attributes in a given scope.
*
* @param scope the scope to enumerate all the attributes for
* @return an enumeration of names (java.lang.String) of all the
@@ -241,17 +239,17 @@
* ExpressionEvaluator that can parse EL expressions.
*
* @return A valid instance of an ExpressionEvaluator.
- * @since JSP2.0
+ * @since 2.0
*/
public abstract ExpressionEvaluator getExpressionEvaluator();
/**
* Returns an instance of a VariableResolver that provides access to the
* implicit objects specified in the JSP specification using this JspContext
- * as the context object
+ * as the context object.
*
* @return A valid instance of a VariableResolver.
- * @since JSP2.0
+ * @since 2.0
*/
public abstract VariableResolver getVariableResolver();
@@ -273,7 +271,7 @@
* @param writer The Writer for the returned JspWriter to send
* output to.
* @return a new JspWriter that writes to the given Writer.
- * @since JSP2.0
+ * @since 2.0
*/
public JspWriter pushBody( java.io.Writer writer ) {
return null; // XXX to implement
@@ -282,7 +280,7 @@
/**
* Return the previous JspWriter "out" saved by the matching
* pushBody(), and update the value of the "out" attribute in
- * the page scope attribute namespace of the JspContext
+ * the page scope attribute namespace of the JspContext.
*
* @return the saved JspWriter.
*/
1.2 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspException.java
Index: JspException.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspException.java 13 Aug 2002 16:20:54 -0000 1.1
+++ JspException.java 29 Oct 2002 01:18:11 -0000 1.2
@@ -67,7 +67,7 @@
/**
- * Construct a JspException
+ * Construct a JspException.
*/
public JspException() {
}
1.3 +2 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspTagException.java
Index: JspTagException.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspTagException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspTagException.java 19 Aug 2002 16:29:49 -0000 1.2
+++ JspTagException.java 29 Oct 2002 01:18:11 -0000 1.3
@@ -96,7 +96,7 @@
* normal operation, making this JSP Tag
* exception necessary
*
- * @since JSP2.0
+ * @since 2.0
*/
public JspTagException(String message, Throwable rootCause) {
super( message, rootCause );
@@ -121,7 +121,7 @@
* normal operation, making the JSP Tag
* exception necessary
*
- * @since JSP2.0
+ * @since 2.0
*/
public JspTagException(Throwable rootCause) {
1.3 +7 -7 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspWriter.java
Index: JspWriter.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspWriter.java 19 Aug 2002 16:29:49 -0000 1.2
+++ JspWriter.java 29 Oct 2002 01:18:11 -0000 1.3
@@ -122,27 +122,27 @@
abstract public class JspWriter extends java.io.Writer {
/**
- * constant indicating that the Writer is not buffering output
+ * Constant indicating that the Writer is not buffering output.
*/
public static final int NO_BUFFER = 0;
/**
- * constant indicating that the Writer is buffered and is using the
- * implementation default buffer size
+ * Constant indicating that the Writer is buffered and is using the
+ * implementation default buffer size.
*/
public static final int DEFAULT_BUFFER = -1;
/**
- * constant indicating that the Writer is buffered and is unbounded; this
- * is used in BodyContent
+ * Constant indicating that the Writer is buffered and is unbounded; this
+ * is used in BodyContent.
*/
public static final int UNBOUNDED_BUFFER = -2;
/**
- * protected constructor.
+ * Protected constructor.
*
* @param bufferSize the size of the buffer to be used by the JspWriter
* @param autoFlush whether the JspWriter should be autoflushing
@@ -479,7 +479,7 @@
*/
/**
- * The size of the buffer used by the JspWriter
+ * The size of the buffer used by the JspWriter.
*/
protected int bufferSize;
1.5 +3 -8 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/PageContext.java
Index: PageContext.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/PageContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PageContext.java 3 Oct 2002 23:01:43 -0000 1.4
+++ PageContext.java 29 Oct 2002 01:18:11 -0000 1.5
@@ -57,8 +57,6 @@
import java.io.IOException;
-import java.util.Enumeration;
-
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -66,7 +64,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.tagext.BodyContent;
@@ -452,7 +449,7 @@
* @throws ServletException if the page that was forwarded to throws
* a ServletException
* @throws IOException if an I/O error occurred while forwarding
- * @since JSP2.0
+ * @since 2.0
*/
abstract public void include(String relativeUrlPath, boolean flush)
throws ServletException, IOException;
@@ -480,7 +477,6 @@
* @throws IOException if an I/O error occurred while invoking the error
* page
* @throws NullPointerException if the exception is null
- * @throws SecurityException if target resource cannot be accessed by caller
*
* @see #handlePageException(Throwable)
*/
@@ -513,7 +509,6 @@
* @throws IOException if an I/O error occurred while invoking the error
* page
* @throws NullPointerException if the exception is null
- * @throws SecurityException if target resource cannot be accessed by caller
*
* @see #handlePageException(Exception)
*/
@@ -524,7 +519,7 @@
/**
* Return a new BodyContent object, save the current "out" JspWriter,
* and update the value of the "out" attribute in the page scope
- * attribute namespace of the PageContext
+ * attribute namespace of the PageContext.
*
* @return the new BodyContent
*/
@@ -543,7 +538,7 @@
* if the isErrorPage attribute of the page directive is not set
* to "true"), the information is meaningless.
*
- * @since JSP2.0
+ * @since 2.0
*/
public ErrorData getErrorData() {
return new ErrorData(
1.3 +5 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java
Index: SkipPageException.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SkipPageException.java 19 Aug 2002 16:29:49 -0000 1.2
+++ SkipPageException.java 29 Oct 2002 01:18:11 -0000 1.3
@@ -61,12 +61,15 @@
* the pagein the case where one tag invokes another (as can be
* the case with tag files). The effect is similar to that of a
* Classic Tag Handler returning Tag.SKIP_PAGE from doEndTag().
- * Jsp Fragments may also throw this exception.
+ * Jsp Fragments may also throw this exception. This exception
+ * should not be thrown manually in a JSP page - the behavior is
+ * undefined. The exception is intended to be thrown inside
+ * SimpleTag handlers and in JSP fragments.
*
* @see javax.servlet.jsp.tagext.SimpleTag#doTag
* @see javax.servlet.jsp.tagext.JspFragment#invoke
* @see javax.servlet.jsp.tagext.Tag#doEndTag
- * @since JSP2.0
+ * @since 2.0
*/
public class SkipPageException
extends JspException
1.4 +4 -4 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ELException.java
Index: ELException.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ELException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ELException.java 3 Oct 2002 23:01:44 -0000 1.3
+++ ELException.java 29 Oct 2002 01:18:12 -0000 1.4
@@ -60,7 +60,7 @@
* Represents any of the exception conditions that arise during the
* operation evaluation of the evaluator.
*
- * @since JSP2.0
+ * @since 2.0
*/
public class ELException
extends Exception
@@ -93,7 +93,7 @@
//-------------------------------------
/**
- * Creates an ELException with the given root cause
+ * Creates an ELException with the given root cause.
*
* @param pRootCause the originating cause of this exception
**/
@@ -119,10 +119,10 @@
//-------------------------------------
/**
- * Returns the root cause
+ * Returns the root cause.
*
* @return the root cause of this exception
- **/
+ */
public Throwable getRootCause ()
{
return mRootCause;
1.2 +2 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ELParseException.java
Index: ELParseException.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ELParseException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ELParseException.java 19 Aug 2002 16:29:50 -0000 1.1
+++ ELParseException.java 29 Oct 2002 01:18:12 -0000 1.2
@@ -59,7 +59,7 @@
/**
* Represents a parsing error encountered while parsing an EL expression.
*
- * @since JSP2.0
+ * @since 2.0
*/
public class ELParseException extends ELException {
@@ -67,7 +67,7 @@
//-------------------------------------
/**
* Creates an ELParseException with no detail message.
- **/
+ */
public ELParseException ()
{
super ();
1.3 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/Expression.java
Index: Expression.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/Expression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Expression.java 9 Oct 2002 17:38:49 -0000 1.2
+++ Expression.java 29 Oct 2002 01:18:12 -0000 1.3
@@ -69,7 +69,7 @@
* invoking the evaluate() mehod should be ready for the case where ELParseException
* exceptions are raised.
Classes implementing this interface may, for instance, consult tag library * information to resolve the map.
* - * @since JSP2.0 + * @since 2.0 */ public interface FunctionMapper { 1.4 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java Index: VariableResolver.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- VariableResolver.java 3 Oct 2002 23:01:44 -0000 1.3 +++ VariableResolver.java 29 Oct 2002 01:18:12 -0000 1.4 @@ -66,7 +66,7 @@ *An instance of this class includes the context against which resolution * will happen
* - * @since JSP2.0 + * @since 2.0 */ public interface VariableResolver { 1.3 +3 -4 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyContent.java Index: BodyContent.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyContent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BodyContent.java 19 Aug 2002 16:29:51 -0000 1.2 +++ BodyContent.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -171,9 +171,8 @@ return enclosingWriter; } - /** - * private fields - */ - + + // private fields + private JspWriter enclosingWriter; } 1.2 +3 -3 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java Index: BodyTag.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BodyTag.java 13 Aug 2002 16:20:55 -0000 1.1 +++ BodyTag.java 29 Oct 2002 01:18:12 -0000 1.2 @@ -200,9 +200,9 @@ * tags whose doStartTag() method returns SKIP_BODY or EVAL_BODY_INCLUDE. * *- * The JSP container will resynchronize - * any variable values that are indicated as so in TagExtraInfo after the - * invocation of doInitBody(). + * The JSP container will resynchronize any variable values that + * are indicated as so in TagExtraInfo or TLD after the invocation of + * doInitBody(). * * @throws JspException * @see #doAfterBody 1.3 +2 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java Index: BodyTagSupport.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BodyTagSupport.java 19 Aug 2002 16:29:51 -0000 1.2 +++ BodyTagSupport.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -92,7 +92,7 @@ } /** - * Default processing of the start tag returning EVAL_BODY_BUFFERED + * Default processing of the start tag returning EVAL_BODY_BUFFERED. * * @return EVAL_BODY_BUFFERED * @throws JspException if an error occurred while processing this tag @@ -198,7 +198,7 @@ // protected fields /** - * The current BodyContent for this BodyTag + * The current BodyContent for this BodyTag. */ protected BodyContent bodyContent; } 1.3 +4 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/DynamicAttributes.java Index: DynamicAttributes.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/DynamicAttributes.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DynamicAttributes.java 19 Aug 2002 16:29:51 -0000 1.2 +++ DynamicAttributes.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -54,6 +54,8 @@ */ package javax.servlet.jsp.tagext; +import javax.servlet.jsp.JspException; + /** * For a tag to declare that it accepts dynamic attributes, it must implement * this interface. The entry for the tag in the Tag Library Descriptor must @@ -65,7 +67,7 @@ * value of the attribute. It is the responsibility of the tag to * remember the names and values of the dynamic attributes. * - * @since JSP2.0 + * @since 2.0 */ public interface DynamicAttributes { @@ -83,6 +85,6 @@ */ public void setDynamicAttribute( String uri, String localName, Object value ) - throws javax.servlet.jsp.JspException; + throws JspException; } 1.3 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/FunctionInfo.java Index: FunctionInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/FunctionInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FunctionInfo.java 19 Aug 2002 16:29:51 -0000 1.2 +++ FunctionInfo.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -60,7 +60,7 @@ * This class is instantiated from the Tag Library Descriptor file (TLD) * and is available only at translation time. * - * @since JSP2.0 + * @since 2.0 */ public class FunctionInfo { 1.2 +3 -3 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java Index: IterationTag.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IterationTag.java 13 Aug 2002 16:20:56 -0000 1.1 +++ IterationTag.java 29 Oct 2002 01:18:12 -0000 1.2 @@ -138,9 +138,9 @@ * of external computation. * *
- * The JSP container will resynchronize - * any variable values that are indicated as so in TagExtraInfo after the - * invocation of doAfterBody(). + * The JSP container will resynchronize any variable values that are + * indicated as so in TagExtraInfo or TLD after the invocation of + * doAfterBody(). * * @return whether additional evaluations of the body are desired * @throws JspException 1.4 +4 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java Index: JspFragment.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JspFragment.java 28 Oct 2002 17:45:44 -0000 1.3 +++ JspFragment.java 29 Oct 2002 01:18:12 -0000 1.4 @@ -70,7 +70,9 @@ * capable of executing the defined fragment. *
* A tag handler can invoke the fragment zero or more times, or - * pass it along to other tags, before returning. + * pass it along to other tags, before returning. To communicate values + * to/from a JSP fragment, tag handlers store/retrieve values in + * the JspContext associated with the fragment. *
* Note that tag library developers and page authors should not generate * JspFragment implementations manually. @@ -81,7 +83,7 @@ * JspFragment. Upon construction, a discriminator can be passed to * select which fragment that instance will execute. * - * @since JSP2.0 + * @since 2.0 */ public interface JspFragment { 1.3 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/JspTag.java Index: JspTag.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/JspTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JspTag.java 19 Aug 2002 16:29:51 -0000 1.2 +++ JspTag.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -58,7 +58,7 @@ * Serves as a base class for Tag and SimpleTag. * This is mostly for organizational and type-safety purposes. * - * @since JSP2.0 + * @since 2.0 */ public interface JspTag { } 1.3 +6 -4 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java Index: SimpleTag.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SimpleTag.java 19 Aug 2002 16:29:51 -0000 1.2 +++ SimpleTag.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -85,9 +85,11 @@ * *
setJspContext()
and setParent()
are
- * called by the container.setJspContext()
and setParent()
+ * methods are called by the container.- * The JSP container will resynchronize - * any variable values that are indicated as so in TagExtraInfo after the - * invocation of doStartTag(). + * The JSP container will resynchronize any variable values that are + * indicated as so in TagExtraInfo or the TLD after the invocation of + * doStartTag(). * * @return EVAL_BODY_INCLUDE if the tag wants to process body, SKIP_BODY * if it does not want to process it. @@ -263,7 +263,7 @@ * *
* This method will be called after returning from doStartTag. The - * body of the action may or not have been evaluated, depending on + * body of the action may or may not have been evaluated, depending on * the return value of doStartTag. * *
@@ -275,9 +275,9 @@ * only the current page evaluation is stopped. * *
- * The JSP container will resynchronize - * any variable values that are indicated as so in TagExtraInfo after the - * invocation of doEndTag(). + * The JSP container will resynchronize any variable values that are + * indicated as so in TagExtraInfo or the TLD after the invocation of + * doEndTag(). * * @return indication of whether to continue evaluating the JSP page. * @throws JspException if an error occurred while processing this tag 1.5 +3 -3 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagAdapter.java Index: TagAdapter.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagAdapter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TagAdapter.java 5 Sep 2002 17:28:13 -0000 1.4 +++ TagAdapter.java 29 Oct 2002 01:18:12 -0000 1.5 @@ -70,15 +70,15 @@ * adapter is passed to setParent() instead. A classic Tag Handler can * call getAdaptee() to retrieve the encapsulated SimpleTag instance. * - * @since JSP2.0 + * @since 2.0 */ public class TagAdapter implements Tag { - /** The simple tag that's being adapted */ + /** The simple tag that's being adapted. */ private SimpleTag simpleTagAdaptee; - /** The parent, of this tag, converted (if necessary) to be of type Tag */ + /** The parent, of this tag, converted (if necessary) to be of type Tag. */ private Tag parent; // Flag indicating whether we have already determined the parent 1.3 +3 -3 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagAttributeInfo.java Index: TagAttributeInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagAttributeInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TagAttributeInfo.java 19 Aug 2002 16:29:51 -0000 1.2 +++ TagAttributeInfo.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -105,7 +105,7 @@ * @param reqTime Whether this attribute holds a request-time Attribute. * @param fragment Whether this attribute is of type JspFragment * - * @since JSP2.0 + * @since 2.0 */ public TagAttributeInfo(String name, boolean required, @@ -172,11 +172,11 @@ } /** - * Whether this attribute is of type JspFragment + * Whether this attribute is of type JspFragment. * * @return if the attribute is of type JspFragment * - * @since JSP2.0 + * @since 2.0 */ public boolean isFragment() { return fragment; 1.3 +2 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagData.java Index: TagData.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagData.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TagData.java 19 Aug 2002 16:29:51 -0000 1.2 +++ TagData.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -119,9 +119,9 @@ } /** - * The value of the id attribute, if available. + * The value of the jsp:id attribute. * - * @return the value of the id attribute or null + * @return the value of the jsp:id attribute. */ public String getId() { 1.3 +13 -3 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java Index: TagExtraInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TagExtraInfo.java 19 Aug 2002 16:29:51 -0000 1.2 +++ TagExtraInfo.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -81,6 +81,12 @@ * corresponds to the tag being translated. The call should happen before * any invocation on validate() and before any invocation on * getVariableInfo(). + * + *
+ * NOTE: It is a (translation time) error for a tag definition + * in a TLD with one or more variable subelements to have an associated + * TagExtraInfo implementation that returns a VariableInfo array with + * one or more elements from a call to getVariableInfo(). */ public abstract class TagExtraInfo { @@ -91,10 +97,11 @@ * Request-time attributes are indicated as such in the TagData parameter. * * @param data The TagData instance. - * @return An array of VariableInfo data. + * @return An array of VariableInfo data, or a zero length array + * if no scripting variables are to be defined. */ public VariableInfo[] getVariableInfo(TagData data) { - return new VariableInfo[0]; + return ZERO_VARIABLE_INFO; } /** @@ -127,7 +134,7 @@ * @param data The TagData instance. * @return A null object, or zero length array if no errors, an * array of ValidationMessages otherwise. - * @since JSP2.0 + * @since 2.0 */ public ValidationMessage[] validate( TagData data ) { ValidationMessage[] result = null; @@ -160,5 +167,8 @@ // private data private TagInfo tagInfo; + + // zero length VariableInfo array + private static final VariableInfo[] ZERO_VARIABLE_INFO = { }; } 1.3 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagFileInfo.java Index: TagFileInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagFileInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TagFileInfo.java 19 Aug 2002 16:29:51 -0000 1.2 +++ TagFileInfo.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -60,7 +60,7 @@ * This class is instantiated from the Tag Library Descriptor file (TLD) * and is available only at translation time. * - * @since JSP2.0 + * @since 2.0 */ public class TagFileInfo { 1.3 +36 -26 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java Index: TagInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TagInfo.java 19 Aug 2002 16:29:51 -0000 1.2 +++ TagInfo.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -66,28 +66,28 @@ public class TagInfo { /** - * static constant for getBodyContent() when it is JSP + * Static constant for getBodyContent() when it is JSP. */ public static final String BODY_CONTENT_JSP = "JSP"; /** - * static constant for getBodyContent() when it is Tag dependent + * Static constant for getBodyContent() when it is Tag dependent. */ public static final String BODY_CONTENT_TAG_DEPENDENT = "TAGDEPENDENT"; /** - * static constant for getBodyContent() when it is empty + * Static constant for getBodyContent() when it is empty. */ public static final String BODY_CONTENT_EMPTY = "EMPTY"; /** - * static constant for getBodyContent() when it is scriptless + * Static constant for getBodyContent() when it is scriptless. * - * @since JSP2.0 + * @since 2.0 */ public static final String BODY_CONTENT_SCRIPTLESS = "SCRIPTLESS"; @@ -207,7 +207,7 @@ * @param tvi An array of a TagVariableInfo (or null) * @param dynamicAttributes True if supports dynamic attributes * - * @since JSP2.0 + * @since 2.0 */ public TagInfo(String tagName, String tagClassName, @@ -241,7 +241,8 @@ /** * The name of the Tag. * - * @return The (short) name of the tag. + * @return The (short) name of the tag, or null + * if not defined. */ public String getTagName() { @@ -252,9 +253,9 @@ * Attribute information (in the TLD) on this tag. * The return is an array describing the attributes of this tag, as * indicated in the TLD. - * A null return means no attributes. * - * @return The array of TagAttributeInfo for this tag. + * @return The array of TagAttributeInfo for this tag, or a + * zero-length array if the tag has no attributes. */ public TagAttributeInfo[] getAttributes() { @@ -269,7 +270,9 @@ * otherwise, {"id", Object} * * @param data TagData describing this action. - * @return Array of VariableInfo elements. + * @return Array of VariableInfo elements, or a zero length + * array if the associated TagExtraInfo defines no scripting + * variables. */ public VariableInfo[] getVariableInfo(TagData data) { @@ -302,7 +305,7 @@ * @param data The translation-time TagData instance. * @return A null object, or zero length array if no errors, an * array of ValidationMessages otherwise. - * @since JSP2.0 + * @since 2.0 */ public ValidationMessage[] validate( TagData data ) { TagExtraInfo tei = getTagExtraInfo(); @@ -313,7 +316,7 @@ } /** - * Set the instance for extra tag information + * Set the instance for extra tag information. * * @param tei the TagExtraInfo instance */ @@ -323,7 +326,7 @@ /** - * The instance (if any) for extra tag information + * The instance (if any) for extra tag information. * * @return The TagExtraInfo instance, if any. */ @@ -345,6 +348,8 @@ /** * The bodycontent information for this tag. + * If the bodycontent is not defined for this + * tag, the default of JSP will be returned. * * @return the body content string. */ @@ -357,7 +362,8 @@ /** * The information string for the tag. * - * @return the info string + * @return the info string, or null if + * not defined */ public String getInfoString() { @@ -387,7 +393,7 @@ /** * The instance of TabLibraryInfo we belong to. * - * @return the tab library instance we belong to. + * @return the tag library instance we belong to */ public TagLibraryInfo getTagLibrary() { @@ -399,9 +405,10 @@ /** - * Get the displayName + * Get the displayName. * - * @return A short name to be displayed by tools + * @return A short name to be displayed by tools, + * or null if not defined */ public String getDisplayName() { @@ -409,9 +416,10 @@ } /** - * Get the path to the small icon + * Get the path to the small icon. * - * @return Path to a small icon to be displayed by tools + * @return Path to a small icon to be displayed by tools, + * or null if not defined */ public String getSmallIcon() { @@ -419,9 +427,10 @@ } /** - * Get the path to the large icon + * Get the path to the large icon. * - * @return Path to a large icon to be displayed by tools + * @return Path to a large icon to be displayed by tools, + * or null if not defined */ public String getLargeIcon() { @@ -429,9 +438,11 @@ } /** - * Get TagVariableInfo objects associated with this TagInfo + * Get TagVariableInfo objects associated with this TagInfo. * - * @return A TagVariableInfo object associated with this + * @return Array of TagVariableInfo objects corresponding to + * variables declared by this tag, or a zero length + * array if no variables have been declared */ public TagVariableInfo[] getTagVariableInfos() { @@ -442,10 +453,10 @@ // ============== JSP 2.0 TLD Information ======== /** - * Get dynamicAttributes associated with this TagInfo + * Get dynamicAttributes associated with this TagInfo. * * @return True if tag handler supports dynamic attributes - * @since JSP2.0 + * @since 2.0 */ public boolean hasDynamicAttributes() { return dynamicAttributes; @@ -454,7 +465,6 @@ /* * private fields for 1.1 info */ - private String tagName; // the name of the tag private String tagClassName; private String bodyContent; 1.5 +26 -62 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryInfo.java Index: TagLibraryInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TagLibraryInfo.java 11 Oct 2002 20:35:26 -0000 1.4 +++ TagLibraryInfo.java 29 Oct 2002 01:18:12 -0000 1.5 @@ -58,10 +58,6 @@ import javax.servlet.jsp.tagext.TagInfo; import javax.servlet.jsp.tagext.TagFileInfo; -import java.net.URL; - -import java.io.InputStream; - /** * Translation-time information associated with a taglib directive, and its * underlying TLD file. @@ -78,37 +74,16 @@ * Constructor. * * This will invoke the constructors for TagInfo, and TagAttributeInfo - * after parsing the TLD file. Sets tagdir to null. + * after parsing the TLD file. * * @param prefix the prefix actually used by the taglib directive * @param uri the URI actually used by the taglib directive */ protected TagLibraryInfo(String prefix, String uri) { - this( prefix, uri, null ); - } - - /** - * JSP 2.0 Constructor. - * - * This will invoke the constructors for TagInfo, and TagAttributeInfo - * after parsing the TLD file. - * - * @param prefix the prefix actually used by the taglib directive - * @param uri the URI actually used by the taglib directive. Either - * uri or tagdir must be null. - * @param tagdir the directory of tag files, starting with /WEB-INF/tags/ - * if this directive is specifying the directory of an implicit - * tag library composed of tag files. Either uri or tagdir - * must be null. - * @since JSP2.0 - */ - protected TagLibraryInfo(String prefix, String uri, String tagdir) { this.prefix = prefix; this.uri = uri; - this.tagdir = tagdir; } - // ==== methods accessing taglib information ======= /** @@ -123,17 +98,6 @@ } /** - * The value of the tagdir attribute from the <%@ taglib directive for - * this tag library. - * - * @return the value of the tagdir attribute - * @since JSP2.0 - */ - public String getTagdir() { - return tagdir; - } - - /** * The prefix assigned to this taglib from the taglib directive * * @return the prefix assigned to this taglib from the taglib directive @@ -194,7 +158,9 @@ /** * An array describing the tags that are defined in this tag library. * - * @return the tags defined in this tag lib + * @return the TagInfo objects corresponding to the tags defined by this + * tag library, or a zero length array if this tag library + * defines no tags */ public TagInfo[] getTags() { return tags; @@ -203,8 +169,10 @@ /** * An array describing the tag files that are defined in this tag library. * - * @return the tag files defined in this tag lib - * @since JSP2.0 + * @return the TagFileInfo objects corresponding to the tag files defined + * by this tag library, or a zero length array if this + * tag library defines no tags files + * @since 2.0 */ public TagFileInfo[] getTagFiles() { return tagFiles; @@ -213,10 +181,11 @@ /** * Get the TagInfo for a given tag name, looking through all the - * tags in this tag library. Returns null if no tag is found. + * tags in this tag library. * * @param shortname The short name (no prefix) of the tag - * @return the TagInfo for that tag. + * @return the TagInfo for the tag with the specified short name, or + * null if no such tag is found */ public TagInfo getTag(String shortname) { @@ -236,11 +205,12 @@ /** * Get the TagFileInfo for a given tag name, looking through all the - * tag files in this tag library. Returns null if no tag file is found. + * tag files in this tag library. * * @param shortname The short name (no prefix) of the tag - * @return the TagFileInfo for that tag file. - * @since JSP2.0 + * @return the TagFileInfo for the specified Tag file, or null + * if no Tag file is found + * @since 2.0 */ public TagFileInfo getTagFile(String shortname) { TagFileInfo tagFiles[] = getTagFiles(); @@ -260,8 +230,9 @@ /** * An array describing the functions that are defined in this tag library. * - * @return the functions defined in this tag lib - * @since JSP2.0 + * @return the functions defined in this tag library, or a zero + * length array if the tag library defines no functions. + * @since 2.0 */ public FunctionInfo[] getFunctions() { return functions; @@ -273,8 +244,9 @@ * functions in this tag library. * * @param name The name (no prefix) of the function - * @return the FunctionInfo for that function. - * @since JSP2.0 + * @return the FunctionInfo for the function with the given name, or null + * if no such function exists + * @since 2.0 */ public FunctionInfo getFunction(String name) { @@ -295,7 +267,7 @@ // Protected fields /** - * The prefix assigned to this taglib from the taglib directive + * The prefix assigned to this taglib from the taglib directive. */ protected String prefix; @@ -306,14 +278,6 @@ protected String uri; /** - * The value of the tagdir attribute from the <%@ taglib directive for - * this tag library. - * - * @since JSP2.0 - */ - protected String tagdir; - - /** * An array describing the tags that are defined in this tag library. */ protected TagInfo[] tags; @@ -321,26 +285,26 @@ /** * An array describing the tag files that are defined in this tag library. * - * @since JSP2.0 + * @since 2.0 */ protected TagFileInfo[] tagFiles; /** * An array describing the functions that are defined in this tag library. * - * @since JSP2.0 + * @since 2.0 */ protected FunctionInfo[] functions; // Tag Library Data /** - * The version of the tag library + * The version of the tag library. */ protected String tlibversion; // required /** - * The version of the JSP specification this tag library is written to + * The version of the JSP specification this tag library is written to. */ protected String jspversion; // required 1.3 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java Index: TagLibraryValidator.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TagLibraryValidator.java 19 Aug 2002 16:29:51 -0000 1.2 +++ TagLibraryValidator.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -146,7 +146,7 @@ } /** - * Release any data kept by this instance for validation purposes + * Release any data kept by this instance for validation purposes. */ public void release() { initParameters = null; 1.3 +2 -2 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java Index: TagSupport.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TagSupport.java 19 Aug 2002 16:29:51 -0000 1.2 +++ TagSupport.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -179,7 +179,7 @@ /** - * Default processing for a body + * Default processing for a body. * * @return SKIP_BODY * @throws JspException if an error occurs while processing this tag @@ -323,7 +323,7 @@ // protected fields /** - * The PageContext + * The PageContext. */ protected PageContext pageContext; } 1.5 +4 -4 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagVariableInfo.java Index: TagVariableInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagVariableInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TagVariableInfo.java 28 Oct 2002 17:45:44 -0000 1.4 +++ TagVariableInfo.java 29 Oct 2002 01:18:12 -0000 1.5 @@ -68,7 +68,7 @@ public class TagVariableInfo { /** - * Constructor for TagVariableInfo + * Constructor for TagVariableInfo. * * @param nameGiven value of <name-given> * @param nameFromAttribute value of <name-from-attribute> @@ -90,7 +90,7 @@ } /** - * The body of the <name-given> element + * The body of the <name-given> element. * * @return The variable name as a constant */ @@ -124,7 +124,7 @@ } /** - * The body of the <declare> element + * The body of the <declare> element. * * @return Whether the variable is to be declared or not. * If not defined in the TLD, 'true' will be returned. @@ -135,7 +135,7 @@ } /** - * The body of the <scope> element + * The body of the <scope> element. * * @return The scope to give the variable. NESTED * scope will be returned if not defined in 1.3 +11 -8 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java Index: VariableInfo.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VariableInfo.java 19 Aug 2002 16:29:51 -0000 1.2 +++ VariableInfo.java 29 Oct 2002 01:18:12 -0000 1.3 @@ -140,10 +140,12 @@ *