geirm 01/06/18 20:31:28
Modified: src/java/org/apache/velocity/runtime/visitor
BaseVisitor.java
Added: src/java/org/apache/velocity/runtime/visitor
VMReferenceMungeVisitor.java
Log:
VMReferenceMungeVisitor : visitor to alter a VM node tree to make the
references render in such a way that it makes Daniel Rall happy after
I make the change that makes Paulo happy.
Congratulations and a long and happy marriage, Daniel!
BaseVisitor : tweak to make complete...
Revision Changes Path
1.10 +7 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
Index: BaseVisitor.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BaseVisitor.java 2001/03/20 01:11:34 1.9
+++ BaseVisitor.java 2001/06/19 03:31:28 1.10
@@ -70,7 +70,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
- * @version $Id: BaseVisitor.java,v 1.9 2001/03/20 01:11:34 jon Exp $
+ * @version $Id: BaseVisitor.java,v 1.10 2001/06/19 03:31:28 geirm Exp $
*/
public abstract class BaseVisitor implements ParserVisitor
{
@@ -289,6 +289,12 @@
}
public Object visit(ASTSetDirective node, Object data)
+ {
+ data = node.childrenAccept(this, data);
+ return data;
+ }
+
+ public Object visit(ASTDirective node, Object data)
{
data = node.childrenAccept(this, data);
return data;
1.1
jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/VMReferenceMungeVisitor.java
Index: VMReferenceMungeVisitor.java
===================================================================
package org.apache.velocity.runtime.visitor;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.util.Map;
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.parser.node.ASTReference;
/**
* This class is a visitor used by the VM proxy to change the
* literal representation of a reference in a VM. The reason is
* to preserve the 'render literal if null' behavior w/o making
* the VMProxy stuff more complicated than it is already.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
* @version $Id: VMReferenceMungeVisitor.java,v 1.1 2001/06/19 03:31:28 geirm Exp $
*/
public class VMReferenceMungeVisitor extends BaseVisitor
{
/**
* Map containing VM arg to instance-use reference
* Passed in with CTOR
*/
private Map argmap = null;
/**
* CTOR - takes a map of args to reference
*/
public VMReferenceMungeVisitor( Map map )
{
argmap = map;
}
/**
* Visitor method - if the literal is right, will
* set the literal in the ASTReference node
*
* @param node ASTReference to work on
* @param data Object to pass down from caller
*/
public Object visit( ASTReference node, Object data)
{
/*
* see if there is an override value for this
* reference
*/
String override = (String) argmap.get( node.literal().substring(1) );
/*
* if so, set in the node
*/
if( override != null)
{
node.setLiteral( override );
}
/*
* feed the children...
*/
data = node.childrenAccept(this, data);
return data;
}
}
