You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by jv...@locus.apache.org on 2000/09/21 04:37:44 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity Template.java
jvanzyl 00/09/20 19:37:44
Modified: src/java/org/apache/velocity Template.java
Log:
- update for self-walking tree.
Revision Changes Path
1.4 +10 -6 jakarta-velocity/src/java/org/apache/velocity/Template.java
Index: Template.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/Template.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Template.java 2000/09/19 19:49:52 1.3
+++ Template.java 2000/09/21 02:37:43 1.4
@@ -59,6 +59,8 @@
import java.io.Writer;
import org.apache.velocity.processor.Processor;
+import org.apache.velocity.processor.javacc.parser.SimpleNode;
+import org.apache.velocity.processor.javacc.visitor.BaseVisitor;
/**
* This class is used for controlling all template
@@ -79,12 +81,14 @@
* template.merge(context, writer);
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Template.java,v 1.3 2000/09/19 19:49:52 jvanzyl Exp $
+ * @version $Id: Template.java,v 1.4 2000/09/21 02:37:43 jvanzyl Exp $
*/
public class Template
{
/** Template processor */
private Processor processor;
+ private SimpleNode document;
+ private BaseVisitor visitor;
// So now, after a template is constructed all the
// initial processing is done.
@@ -93,17 +97,17 @@
throws Exception
{
this.processor = processor;
- parse(inputStream);
+ document = processor.parse(inputStream);
}
- public void parse(InputStream inputStream) throws Exception
+ public synchronized void parse(InputStream inputStream) throws Exception
{
- processor.parse(inputStream);
+ document = processor.parse(inputStream);
}
- public void merge(Context context, Writer writer)
+ public synchronized void merge(Context context, Writer writer)
throws IOException
{
- processor.merge(context, writer);
+ document.render(context, writer);
}
}