You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2001/09/07 07:05:14 UTC

cvs commit: jakarta-velocity/src/java/org/apache/velocity/app Velocity.java VelocityEngine.java

geirm       01/09/06 22:05:14

  Modified:    src/java/org/apache/velocity/app Velocity.java
                        VelocityEngine.java
  Log:
  Support to let all possible exception come out of an evaluate().  Lazyness
  would require us to just list 'VelocityException', but this way is more
  descriptive.
  
  Revision  Changes    Path
  1.23      +7 -4      jakarta-velocity/src/java/org/apache/velocity/app/Velocity.java
  
  Index: Velocity.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/app/Velocity.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Velocity.java	2001/08/23 18:44:06	1.22
  +++ Velocity.java	2001/09/07 05:05:14	1.23
  @@ -108,7 +108,7 @@
    * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
    * @author <a href="Christoph.Reck@dlr.de">Christoph Reck</a>
    * @author <a href="jvanzyl@apache.org">Jason van Zyl</a>
  - * @version $Id: Velocity.java,v 1.22 2001/08/23 18:44:06 dlr Exp $
  + * @version $Id: Velocity.java,v 1.23 2001/09/07 05:05:14 geirm Exp $
    */
   
   public class Velocity implements RuntimeConstants
  @@ -247,7 +247,8 @@
        */
       public static  boolean evaluate( Context context,  Writer out,  
                                        String logTag, String instring )
  -        throws ParseErrorException, MethodInvocationException, IOException
  +        throws ParseErrorException, MethodInvocationException, 
  +        	ResourceNotFoundException, IOException
       {
           return evaluate( context, out, logTag, new BufferedReader( new StringReader( instring )) );
       }
  @@ -271,7 +272,8 @@
        */
       public static boolean evaluate( Context context, Writer writer, 
                                       String logTag, InputStream instream )
  -        throws ParseErrorException, MethodInvocationException, IOException
  +        throws ParseErrorException, MethodInvocationException,
  +        	ResourceNotFoundException, IOException
       {
           /*
            *  first, parse - convert ParseException if thrown
  @@ -313,7 +315,8 @@
        */
       public static boolean evaluate( Context context, Writer writer, 
                                       String logTag, Reader reader )
  -        throws ParseErrorException, MethodInvocationException, IOException
  +        throws ParseErrorException, MethodInvocationException, 	
  +        	ResourceNotFoundException,IOException
       {
           SimpleNode nodeTree = null;
           
  
  
  
  1.2       +7 -4      jakarta-velocity/src/java/org/apache/velocity/app/VelocityEngine.java
  
  Index: VelocityEngine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/app/VelocityEngine.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VelocityEngine.java	2001/08/07 22:15:36	1.1
  +++ VelocityEngine.java	2001/09/07 05:05:14	1.2
  @@ -106,7 +106,7 @@
    * </p>
    *
    * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  - * @version $Id: VelocityEngine.java,v 1.1 2001/08/07 22:15:36 geirm Exp $
  + * @version $Id: VelocityEngine.java,v 1.2 2001/09/07 05:05:14 geirm Exp $
    */
   public class VelocityEngine implements RuntimeConstants
   {
  @@ -246,7 +246,8 @@
        */
       public  boolean evaluate( Context context,  Writer out,  
                                        String logTag, String instring )
  -        throws ParseErrorException, MethodInvocationException, IOException
  +        throws ParseErrorException, MethodInvocationException,
  +        	ResourceNotFoundException, IOException
       {
           return evaluate( context, out, logTag, new BufferedReader( new StringReader( instring )) );
       }
  @@ -270,7 +271,8 @@
        */
       public boolean evaluate( Context context, Writer writer, 
                                       String logTag, InputStream instream )
  -        throws ParseErrorException, MethodInvocationException, IOException
  +        throws ParseErrorException, MethodInvocationException, 
  +        	ResourceNotFoundException, IOException
       {
           /*
            *  first, parse - convert ParseException if thrown
  @@ -312,7 +314,8 @@
        */
       public boolean evaluate( Context context, Writer writer, 
                                       String logTag, Reader reader )
  -        throws ParseErrorException, MethodInvocationException, IOException
  +        throws ParseErrorException, MethodInvocationException, 
  +        	ResourceNotFoundException,IOException
       {
           SimpleNode nodeTree = null;