geirm       00/12/10 11:38:05

  Modified:    src/java/org/apache/velocity/runtime VelocimacroManager.java
  Log:
  Removed call to Runtime.getBoolean() for TILV support, set by Factory at right time 
and removed useless and annoying log message.
  
  Revision  Changes    Path
  1.2       +10 -5     
jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroManager.java
  
  Index: VelocimacroManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VelocimacroManager.java   2000/12/10 04:53:49     1.1
  +++ VelocimacroManager.java   2000/12/10 19:38:05     1.2
  @@ -67,7 +67,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Jose Alberto Fernandez</a>
  - * @version $Id: VelocimacroManager.java,v 1.1 2000/12/10 04:53:49 geirm Exp $ 
  + * @version $Id: VelocimacroManager.java,v 1.2 2000/12/10 19:38:05 geirm Exp $ 
    */
   
   package org.apache.velocity.runtime;
  @@ -88,6 +88,8 @@
   
       /*  big switch for namespaces.  If true, then properties control usage. If 
false, no. */
       private boolean bUsingNamespaces_ = true;
  +   
  +    private boolean  bInlineLocalMode_ = false;
   
       /**
        *  not much to do but add the global namespace to the hash
  @@ -187,9 +189,7 @@
                       return false;
               
                   h.clear();
  -                
  -                Runtime.info("Velocimacro Manager : dumping VMs for namespace \"" + 
strNamespace + "\"" );
  -
  +               
                   return true;
               }
   
  @@ -208,6 +208,11 @@
           return;
       }
   
  +    public void setTemplateLocalInlineVM( boolean b )
  +    {
  +        bInlineLocalMode_ = b;
  +    }
  +
       /**
        *  returns the hash for the specified namespace.  Will not create a new one
        *  if it doesn't exist
  @@ -279,7 +284,7 @@
            *  currently, we only support the local template namespace idea
            */
   
  -        if (Runtime.getBoolean(VelocimacroFactory.VM_PERM_INLINE_LOCAL, false ))
  +        if ( bInlineLocalMode_)
               return true;
   
           return false;
  
  
  

Reply via email to