geirm       01/04/22 11:02:33

  Modified:    src/java/org/apache/velocity/runtime/parser/node
                        ASTStringLiteral.java
  Log:
  Support for new per-template encoding support.  This change really reflects
  internal change of parser, so no functional change for the node per se...
  
  Revision  Changes    Path
  1.10      +7 -8      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
  
  Index: ASTStringLiteral.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ASTStringLiteral.java     2001/03/19 18:53:52     1.9
  +++ ASTStringLiteral.java     2001/04/22 18:02:32     1.10
  @@ -59,6 +59,9 @@
   
   import java.io.StringWriter;
   import java.io.ByteArrayInputStream;
  +import java.io.BufferedReader;
  +import java.io.StringReader;
  +
   import org.apache.velocity.runtime.Runtime;
   
   /**
  @@ -66,7 +69,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
  - * @version $Id: ASTStringLiteral.java,v 1.9 2001/03/19 18:53:52 geirm Exp $
  + * @version $Id: ASTStringLiteral.java,v 1.10 2001/04/22 18:02:32 geirm Exp $
    */
   public class ASTStringLiteral extends SimpleNode
   {
  @@ -155,18 +158,14 @@
   
                   if (nodeTree == null)
                   {
  -                   
  -                    ByteArrayInputStream inStream 
  -                        = new ByteArrayInputStream( 
  -                                interpolateimage.getBytes() );
  -  
                       /*
                        *  parse the stringlit
                        */
                       
  +                    BufferedReader br = new BufferedReader( new StringReader( 
interpolateimage ));
  +
                       nodeTree 
  -                        = Runtime.parse( inStream, 
  -                                         context.getCurrentTemplateName() );        
  +                        = Runtime.parse( br,context.getCurrentTemplateName() );     
   
                   
                       /*
                        *  init with context. It won't modify anything
  
  
  

Reply via email to