cvs commit: jakarta-velocity/src/java/org/apache/velocity/texen/ant TexenTask.java

[jvanzyl]

jvanzyl     00/11/17 18:54:07

  Modified:    src/java/org/apache/velocity/texen/ant TexenTask.java
  Log:
  - minor cleanups.
  
  Revision  Changes    Path
  1.6       +10 -3     
jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java
  
  Index: TexenTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TexenTask.java    2000/11/18 00:57:14     1.5
  +++ TexenTask.java    2000/11/18 02:54:07     1.6
  @@ -76,7 +76,7 @@
    * An ant task for generating output by using Velocity
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
  - * @version $Id: TexenTask.java,v 1.5 2000/11/18 00:57:14 jvanzyl Exp $
  + * @version $Id: TexenTask.java,v 1.6 2000/11/18 02:54:07 jvanzyl Exp $
    */
   
   public abstract class TexenTask extends Task
  @@ -176,8 +176,15 @@
               String path = outputDirectory + File.separator + outputFile;
               System.out.println(path);
               FileWriter writer = new FileWriter(path);
  -                
  -            writer.write(generator.parse(controlTemplate, initControlContext()));
  +            
  +            // The generator and the output path should
  +            // be placed in the init context here and
  +            // not in the generator class itself.
  +            
  +            Context c = initControlContext();
  +            //c.put("generator", generator);
  +            
  +            writer.write(generator.parse(controlTemplate, c));
               writer.flush();
               writer.close();
           }