jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/tlv PermittedTaglibsTLV.java
Date Tue, 25 Mar 2003 23:07:39 GMT
pierred     2003/03/25 15:07:39

  Modified:    standard/src/javax/servlet/jsp/jstl/core LoopTagSupport.java
               standard/src/javax/servlet/jsp/jstl/fmt LocaleSupport.java
               standard/src/javax/servlet/jsp/jstl/sql ResultImpl.java
                        ResultSupport.java SQLExecutionTag.java
               standard/src/javax/servlet/jsp/jstl/tlv
                        PermittedTaglibsTLV.java
  Log:
  Patch from Ryan Lubke:
  Correct/clarify the JSTL API documentation.
  
  Revision  Changes    Path
  1.9       +3 -3      jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/core/LoopTagSupport.java
  
  Index: LoopTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/core/LoopTagSupport.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LoopTagSupport.java	14 Mar 2003 22:04:24 -0000	1.8
  +++ LoopTagSupport.java	25 Mar 2003 23:07:37 -0000	1.9
  @@ -198,7 +198,7 @@
        * does not simply call for an Iterator from its subtags.)</p>
        * 
        * @return the java.lang.Object to use in the next round of iteration
  -     * @exception NoSuchElementException
  +     * @exception java.util.NoSuchElementException
        *            if next() is called but no new elements are available
        * @exception javax.servlet.jsp.JspTagException
        *            for other, unexpected exceptions
  @@ -216,7 +216,7 @@
        *
        * @return <tt>true</tt> if there is at least one more item to iterate
        *         over, <tt>false</tt> otherwise
  -     * @exception javax.servlet.JspTagException
  +     * @exception javax.servlet.jsp.JspTagException
        * @see #next
        */
       protected abstract boolean hasNext() throws JspTagException;
  @@ -227,7 +227,7 @@
        * Subclasses can assume that prepare() will be called once for
        * each invocation of doStartTag() in the superclass.</p>
        *
  -     * @exception javax.servlet.JspTagException
  +     * @exception javax.servlet.jsp.JspTagException
        */
       protected abstract void prepare() throws JspTagException;
   
  
  
  
  1.10      +3 -5      jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
  
  Index: LocaleSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LocaleSupport.java	14 Mar 2003 22:04:24 -0000	1.9
  +++ LocaleSupport.java	25 Mar 2003 23:07:38 -0000	1.10
  @@ -58,10 +58,8 @@
   import java.util.*;
   import java.text.*;
   import javax.servlet.jsp.*;
  -import javax.servlet.jsp.jstl.core.Config;
   import org.apache.taglibs.standard.tag.common.fmt.BundleSupport;
   import org.apache.taglibs.standard.tag.common.fmt.MessageSupport;
  -import org.apache.taglibs.standard.resources.Resources;
   
   /**
    * Class which exposes the locale-determination logic for resource bundles
  @@ -167,7 +165,7 @@
        * 
        * @return the localized message corresponding to the given key 
        */ 
  -    public static String getLocalizedMessage(PageContext pc, 
  +    public static String getLocalizedMessage(PageContext pageContext, 
                                                String key, 
                                                Object[] args, 
                                                String basename) {
  @@ -176,9 +174,9 @@
   	    + MessageSupport.UNDEFINED_KEY;
   
   	if (basename != null) {
  -	    locCtxt = BundleSupport.getLocalizationContext(pc, basename);
  +	    locCtxt = BundleSupport.getLocalizationContext(pageContext, basename);
   	} else {
  -	    locCtxt = BundleSupport.getLocalizationContext(pc);
  +	    locCtxt = BundleSupport.getLocalizationContext(pageContext);
   	}
   
   	if (locCtxt != null) {
  
  
  
  1.11      +3 -3      jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/sql/ResultImpl.java
  
  Index: ResultImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/sql/ResultImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ResultImpl.java	14 Mar 2003 22:04:25 -0000	1.10
  +++ ResultImpl.java	25 Mar 2003 23:07:38 -0000	1.11
  @@ -82,9 +82,9 @@
        *
        * @param rs an open <tt>ResultSet</tt>, positioned before the first
        * row
  -     * @param startRow, beginning row to be cached
  -     * @param maxRows, query maximum rows limit
  -     * @exception if a database error occurs
  +     * @param startRow beginning row to be cached
  +     * @param maxRows query maximum rows limit
  +     * @exception java.sql.SQLException if a database error occurs
        */
       public ResultImpl(ResultSet rs, int startRow, int maxRows)
           throws SQLException 
  
  
  
  1.3       +2 -2      jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/sql/ResultSupport.java
  
  Index: ResultSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/sql/ResultSupport.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResultSupport.java	14 Mar 2003 22:04:25 -0000	1.2
  +++ ResultSupport.java	25 Mar 2003 23:07:38 -0000	1.3
  @@ -72,7 +72,7 @@
       /**
        * Returns an array of Row objects.
        *
  -     * @param ResultSet the ResultSet object
  +     * @param rs the ResultSet object
        *
        * @return the <code>Result</code> object of the result
        */
  @@ -87,7 +87,7 @@
       /**
        * Returns the Result object of the cached ResultSet limited by maxRows
        *
  -     * @param ResultSet the ResultSet object
  +     * @param rs the ResultSet object
        * @param maxRows the maximum number of rows
        *
        * @return the <code>Result</code> object of the result limited by maxRows
  
  
  
  1.5       +1 -1      jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
  
  Index: SQLExecutionTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SQLExecutionTag.java	14 Mar 2003 22:04:25 -0000	1.4
  +++ SQLExecutionTag.java	25 Mar 2003 23:07:38 -0000	1.5
  @@ -87,7 +87,7 @@
       /**
        * Adds a PreparedStatement parameter value
        *
  -     * @param the PreparedStatement parameter value
  +     * @param value the PreparedStatement parameter value
        */
       public void addSQLParameter(Object value);
   }
  
  
  
  1.3       +0 -1      jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
  
  Index: PermittedTaglibsTLV.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PermittedTaglibsTLV.java	14 Mar 2003 22:04:25 -0000	1.2
  +++ PermittedTaglibsTLV.java	25 Mar 2003 23:07:38 -0000	1.3
  @@ -57,7 +57,6 @@
   
   import java.io.*;
   import java.util.*;
  -import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
   import javax.xml.parsers.*;
   import org.xml.sax.*;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org


Mime
View raw message