cvs commit: jakarta-velocity/src/java/org/apache/velocity/anakia AnakiaTask.java

[geirm]

geirm       01/03/14 20:47:09

  Modified:    src/java/org/apache/velocity/anakia AnakiaTask.java
  Log:
  Changed getting of TEMPLATE_ENCODING  from Runtime.getString() to 
Velocity.getProperty()
  
  Revision  Changes    Path
  1.24      +11 -3     
jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java
  
  Index: AnakiaTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- AnakiaTask.java   2001/03/15 03:12:33     1.23
  +++ AnakiaTask.java   2001/03/15 04:47:08     1.24
  @@ -93,7 +93,7 @@
    * <a href="http://jakarta.apache.org/velocity/anakia.html">Website</a>.
    *   
    * @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
  - * @version $Id: AnakiaTask.java,v 1.23 2001/03/15 03:12:33 geirm Exp $
  + * @version $Id: AnakiaTask.java,v 1.24 2001/03/15 04:47:08 geirm Exp $
    */
   public class AnakiaTask extends MatchingTask
   {
  @@ -302,7 +302,9 @@
               
   
               // get the last modification of the VSL stylesheet
  -            styleSheetLastModified = Runtime.getTemplate(style).getLastModified();
  +
  +            styleSheetLastModified = Runtime.getTemplate( style ).getLastModified();
  +           
           }
           catch (Exception e)
           {
  @@ -359,8 +361,14 @@
                   // Shove things into the Context
   
                   VelocityContext context = new VelocityContext();
  +
  +                /*
  +                 *  get the property TEMPLATE_ENCODING
  +                 *  we know it's a string...
  +                 */
  +
  +                String encoding = (String) Velocity.getProperty( 
Runtime.TEMPLATE_ENCODING );
   
  -                String encoding = Runtime.getString(Runtime.TEMPLATE_ENCODING);
                   if (encoding == null || encoding.length() == 0 
                       || encoding.equals("8859-1") || encoding.equals("8859_1"))
                   {