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/08/26 18:48:08 UTC

cvs commit: jakarta-velocity/src/java/org/apache/velocity/visitor ProcessVisitor.java

jvanzyl     00/08/26 09:48:08

  Modified:    src/java/org/apache/velocity Template.java Test.java test.sh
               src/java/org/apache/velocity/visitor ProcessVisitor.java
  Log:
  - updating for caching.
  
  Revision  Changes    Path
  1.4       +1 -0      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/08/26 07:55:06	1.3
  +++ Template.java	2000/08/26 16:48:07	1.4
  @@ -121,6 +121,7 @@
   
       public void parse()
       {
  +        visitor.reset();
           visitor.setContext(context);
           root.jjtAccept(visitor, null);
           System.out.println(visitor.getDocument());
  
  
  
  1.5       +5 -2      jakarta-velocity/src/java/org/apache/velocity/Test.java
  
  Index: Test.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/Test.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Test.java	2000/08/26 07:55:07	1.4
  +++ Test.java	2000/08/26 16:48:07	1.5
  @@ -73,11 +73,14 @@
           
           context.put("list", al);
           
  -        
           template.preParse();
           
           template.setContext(context);
  -        template.parse();
  +        
  +        for (int i = 0; i < 1000; i++)
  +        {
  +            template.parse();
  +        }            
       }
   
       public static void main(String[] args)
  
  
  
  1.2       +1 -1      jakarta-velocity/src/java/org/apache/velocity/test.sh
  
  Index: test.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/test.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test.sh	2000/08/24 21:42:46	1.1
  +++ test.sh	2000/08/26 16:48:07	1.2
  @@ -1 +1 @@
  -java -cp ../../.. org.apache.velocity.Test ./test.wm > output
  +jt Test.class ./compare.wm > output
  
  
  
  1.3       +6 -2      jakarta-velocity/src/java/org/apache/velocity/visitor/ProcessVisitor.java
  
  Index: ProcessVisitor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/visitor/ProcessVisitor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProcessVisitor.java	2000/08/26 06:28:47	1.2
  +++ ProcessVisitor.java	2000/08/26 16:48:08	1.3
  @@ -167,7 +167,11 @@
       public ProcessVisitor()
       {
           document = new StringBuffer();
  -        
  +        reset();        
  +    }
  +
  +    public void reset()
  +    {
           line = 1;
           lastLine = 0;
           column = 1;
  @@ -177,7 +181,7 @@
           ifBlockLength = 0;
           processingStatement = false;
       }
  -    
  +
       /**
        * Set the visitor's initial context.
        */