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

[geirm]

geirm       00/12/05 21:58:57

  Modified:    src/java/org/apache/velocity/runtime VelocimacroFactory.java
  Log:
  Support for name of source template of VM.
  
  Revision  Changes    Path
  1.2       +4 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
  
  Index: VelocimacroFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/VelocimacroFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VelocimacroFactory.java   2000/11/19 23:17:28     1.1
  +++ VelocimacroFactory.java   2000/12/06 05:58:57     1.2
  @@ -58,7 +58,7 @@
    *   manages the set of VMs in a running Velocity engine.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: VelocimacroFactory.java,v 1.1 2000/11/19 23:17:28 geirm Exp $ 
  + * @version $Id: VelocimacroFactory.java,v 1.2 2000/12/06 05:58:57 geirm Exp $ 
    *
    */
   
  @@ -216,7 +216,8 @@
       /**
        *   adds a macro to the factory.  Lots of room for improvement here...
        */
  -    public boolean addVelocimacro( String strName, String strMacro, String 
strArgArray[], String strMacroArray[], TreeMap tmArgIndexMap)
  +    public boolean addVelocimacro( String strName, String strMacro, String 
strArgArray[], String strMacroArray[], 
  +                                   TreeMap tmArgIndexMap, String strSourceTemplate )
       {
           /*
            *  maybe we should throw an exception, maybe just tell the caller like 
this...
  @@ -246,6 +247,7 @@
           h.put("macroarray",  strMacroArray );
           h.put("indexmap", tmArgIndexMap );
           h.put("macrobody", strMacro);
  +        h.put("sourcetemplate", strSourceTemplate );
   
           synchronized( obLock) {
               if (!isVelocimacro( strName ))