cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime Runtime.java

[jvanzyl]

jvanzyl     00/11/27 16:14:31

  Modified:    src/java/org/apache/velocity/runtime Runtime.java
  Log:
  - removing import statements for the directives as they
    are dynamically loaded by the Runtime in the initializeDirectives()
    method.
  
  - cleaned up the createParser() method to use the runtimeDirectives
    hashtable created by the initializeDirectives() method.
  
  Revision  Changes    Path
  1.59      +1 -16     
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
  
  Index: Runtime.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Runtime.java      2000/11/28 00:10:05     1.58
  +++ Runtime.java      2000/11/28 00:14:27     1.59
  @@ -88,12 +88,6 @@
   import org.apache.velocity.runtime.loader.TemplateFactory;
   import org.apache.velocity.runtime.loader.TemplateLoader;
   
  -import org.apache.velocity.runtime.directive.Foreach;
  -import org.apache.velocity.runtime.directive.Dummy;
  -import org.apache.velocity.runtime.directive.Include;
  -import org.apache.velocity.runtime.directive.Parse;
  -import org.apache.velocity.runtime.directive.Macro;
  -
   import org.apache.velocity.runtime.directive.Directive;
   import org.apache.velocity.runtime.VelocimacroFactory;
   
  @@ -160,7 +154,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magusson Jr.</a>
  - * @version $Id: Runtime.java,v 1.58 2000/11/28 00:10:05 jvanzyl Exp $
  + * @version $Id: Runtime.java,v 1.59 2000/11/28 00:14:27 jvanzyl Exp $
    */
   public class Runtime implements RuntimeConstants
   {
  @@ -799,15 +793,6 @@
       public static Parser createNewParser()
       {
           Parser parser = new Parser();
  -        
  -        /*
  -        Hashtable directives = new Hashtable();
  -        directives.put("foreach", new Foreach());
  -        directives.put("dummy", new Dummy());
  -        directives.put("include", new Include() );
  -        directives.put("parse", new Parse() );
  -        directives.put("macro", new Macro() );
  -        */
           parser.setDirectives(runtimeDirectives);
           return parser;
       }