jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sh...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql ResultImpl.java
Date Mon, 29 Apr 2002 19:28:30 GMT
shawn       02/04/29 12:28:30

  Modified:    standard/src/javax/servlet/jsp/jstl/sql ResultImpl.java
               standard/src/org/apache/taglibs/standard/tag/common/core
                        OutSupport.java
  Added:       standard/src/org/apache/taglibs/standard/tag/common/sql
                        ResultImpl.java
  Removed:     standard/src/org/apache/taglibs/standard/lang/spel
                        BeanInfoManager.java BeanInfoProperty.java
                        BooleanLiteral.java Constants.java Evaluator.java
                        Expression.java FloatingPointLiteral.java
                        Indexer.java IntegerLiteral.java Literal.java
                        LiteralIndexes.java NamedValue.java
                        NullLiteral.java ParsedExpression.java
                        PrimitiveObjects.java PropertyExpression.java
                        RelationalExpression.java RelationalOperator.java
                        Resources.properties Scope.java SpelException.java
                        SpelExpressionException.java SpelParser.jj
                        StringLiteral.java
               standard/src/org/apache/taglibs/standard/lang/spel/parser
                        ASCII_UCodeESC_CharStream.java ParseException.java
                        SpelParser.java SpelParserConstants.java
                        SpelParserTokenManager.java Token.java
                        TokenMgrError.java
               standard/src/org/apache/taglibs/standard/lang/spel/test
                        Bean1.java Bean2.java Bean2Editor.java
                        EvaluationTest.java PageContextImpl.java
                        ParserTest.java PerformanceTest.java
                        evaluationTests.txt
                        evaluationTestsExpectedOutput.txt parserTests.txt
                        parserTestsExpectedOutput.txt
               standard/src/org/apache/taglibs/standard/lang/spel/test/beans
                        Factory.java PrivateBean1a.java PrivateBean2b.java
                        PrivateBean2c.java PrivateBean2d.java
                        PublicBean1.java PublicBean1b.java
                        PublicBean2a.java PublicInterface2.java
  Log:
  All this just to respond to minor request #8347.  :-)
  
  Revision  Changes    Path
  1.8       +4 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ResultImpl.java	23 Apr 2002 20:51:22 -0000	1.7
  +++ ResultImpl.java	29 Apr 2002 19:28:29 -0000	1.8
  @@ -62,13 +62,15 @@
    * <p>This class creates a cached version of a <tt>ResultSet</tt>.
    * It's represented as a <tt>Result</tt> implementation, capable of 
    * returing an array of <tt>Row</tt> objects containing a <tt>Column</tt>

  - * instance for each column in the row. 
  + * instance for each column in the row.   It is not part of the JSTL
  + * API; it serves merely as a back-end to ResultSupport's static methods.
  + * Thus, we scope its access to the package.
    *
    * @author Hans Bergsten
    * @author Justyna Horwat
    */
   
  -public class ResultImpl implements Result {
  +class ResultImpl implements Result {
       private List rowMap;
       private List rowByIndex;
       private String[] columnNames;
  
  
  
  1.4       +3 -9      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java
  
  Index: OutSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OutSupport.java	18 Apr 2002 01:57:48 -0000	1.3
  +++ OutSupport.java	29 Apr 2002 19:28:30 -0000	1.4
  @@ -57,7 +57,6 @@
   
   import java.io.*;
   import javax.servlet.jsp.*;
  -import javax.servlet.jsp.jstl.core.ExpressionException;
   import javax.servlet.jsp.tagext.*;
   import org.apache.taglibs.standard.tag.common.core.*;
   import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
  @@ -65,9 +64,7 @@
   
   /**
    * <p>Support for handlers of the &lt;out&gt; tag, which simply evalutes
and
  - * prints the result of the expression it's passed.  If the expression
  - * fails to complete evaluation successfully because of a
  - * javax.servlet.jsp.jstl.core.ExpressionException, or if the result is
  + * prints the result of the expression it's passed.  If the result is
    * null, we print the value of the 'default' attribute's expression or
    * our body (which two are mutually exclusive, although this constraint
    * is enforced outside this handler, in our TagLibraryValidator).</p>
  @@ -137,15 +134,12 @@
   		return EVAL_BODY_BUFFERED;
   	    }
   
  -	    // if we do have 'default', try it
  +	    // if we do have 'default', print it
   	    if (def != null) {
   		// good 'default'
                   out(pageContext, escapeXml, def.toString());
  -		return SKIP_BODY;
  -	    } else {
  -		// bad 'default'
  -		throw new NullAttributeException("out", "default");
   	    }
  +	    return SKIP_BODY;
   	}
         } catch (IOException ex) {
   	throw new JspException(ex.getMessage(), ex);
  
  
  
  1.7       +74 -60    jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
  
  
  
  

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


Mime
View raw message