You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2006/09/19 23:00:26 UTC
svn commit: r447969 [2/10] - in /jakarta/velocity/engine/trunk: ./ build/
build/xsl/ examples/anakia/build/ examples/anakia/xdocs/
examples/anakia/xdocs/about/ examples/anakia/xdocs/stylesheets/
examples/app_example1/ examples/app_example2/ examples/co...
Modified: jakarta/velocity/engine/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/project.properties?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/project.properties (original)
+++ jakarta/velocity/engine/trunk/project.properties Tue Sep 19 14:00:14 2006
@@ -38,7 +38,7 @@
maven.junit.fork=true
# No ideology without asking
-maven.xdoc.developmentProcessUrl=
+maven.xdoc.developmentProcessUrl=
maven.xdoc.navigation.file=xdoc/stylesheet/project.xml
maven.xdoc.theme= velocity
Modified: jakarta/velocity/engine/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/project.xml?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/project.xml (original)
+++ jakarta/velocity/engine/trunk/project.xml Tue Sep 19 14:00:14 2006
@@ -44,7 +44,7 @@
<description>
Velocity is a Java-based template engine. It permits anyone to use the
simple yet powerful template language to reference objects defined in Java
- code.
+ code.
</description>
<shortDescription>Velocity is a Java-based template engine</shortDescription>
@@ -337,7 +337,7 @@
</build>
- <reports>
+ <reports>
<report>maven-jdepend-plugin</report>
<!-- With > 20.000 errors, this currently makes no sense ... -->
<!-- <report>maven-checkstyle-plugin</report> -->
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/VelocityContext.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/VelocityContext.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/VelocityContext.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/VelocityContext.java Tue Sep 19 14:00:14 2006
@@ -23,20 +23,20 @@
import org.apache.velocity.context.Context;
/**
- * General purpose implemention of the application Context
- * interface for general application use. This class should
+ * General purpose implemention of the application Context
+ * interface for general application use. This class should
* be used in place of the original Context class.
*
- * This implementation uses a HashMap (@see java.util.HashMap )
+ * This implementation uses a HashMap (@see java.util.HashMap )
* for data storage.
*
* This context implementation cannot be shared between threads
- * without those threads synchronizing access between them, as
+ * without those threads synchronizing access between them, as
* the HashMap is not synchronized, nor are some of the fundamentals
- * of AbstractContext. If you need to share a Context between
- * threads with simultaneous access for some reason, please create
- * your own and extend the interface Context
- *
+ * of AbstractContext. If you need to share a Context between
+ * threads with simultaneous access for some reason, please create
+ * your own and extend the interface Context
+ *
* @see org.apache.velocity.context.Context
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
@@ -51,13 +51,13 @@
* Version Id for serializable
*/
private static final long serialVersionUID = 9033846851064645037L;
-
+
/**
* Storage for key/value pairs.
*/
private Map context = null;
- /**
+ /**
* Creates a new instance (with no inner context).
*/
public VelocityContext()
@@ -65,10 +65,10 @@
this(null, null);
}
- /**
+ /**
* Creates a new instance with the provided storage (and no inner
* context).
- * @param context
+ * @param context
*/
public VelocityContext(Map context)
{
@@ -76,9 +76,9 @@
}
/**
- * Chaining constructor, used when you want to
+ * Chaining constructor, used when you want to
* wrap a context in another. The inner context
- * will be 'read only' - put() calls to the
+ * will be 'read only' - put() calls to the
* wrapping context will only effect the outermost
* context
*
@@ -114,7 +114,7 @@
public Object internalGet( String key )
{
return context.get( key );
- }
+ }
/**
* stores the value for key to internal
@@ -150,7 +150,7 @@
{
return context.keySet().toArray();
}
-
+
/**
* remove a key/value pair from the
* internal storage
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaElement.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaElement.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaElement.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaElement.java Tue Sep 19 14:00:14 2006
@@ -36,10 +36,10 @@
* Version Id for serializable
*/
private static final long serialVersionUID = 8429597252274491314L;
-
+
private static final XMLOutputter DEFAULT_OUTPUTTER = new XMLOutputter();
- static
+ static
{
DEFAULT_OUTPUTTER.getFormat().setLineSeparator(System.getProperty("line.separator"));
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java Tue Sep 19 14:00:14 2006
@@ -30,7 +30,7 @@
public class AnakiaJDOMFactory extends DefaultJDOMFactory
{
/**
- *
+ *
*/
public AnakiaJDOMFactory()
{
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java Tue Sep 19 14:00:14 2006
@@ -45,16 +45,16 @@
import org.xml.sax.SAXParseException;
/**
- * The purpose of this Ant Task is to allow you to use
+ * The purpose of this Ant Task is to allow you to use
* Velocity as an XML transformation tool like XSLT is.
- * So, instead of using XSLT, you will be able to use this
+ * So, instead of using XSLT, you will be able to use this
* class instead to do your transformations. It works very
* similar in concept to Ant's <style> task.
* <p>
* You can find more documentation about this class on the
- * Velocity
+ * Velocity
* <a href="http://jakarta.apache.org/velocity/anakia.html">Website</a>.
- *
+ *
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>
* @version $Id$
@@ -66,22 +66,22 @@
/** the destination directory */
private File destDir = null;
-
+
/** the base directory */
File baseDir = null;
/** the style= attribute */
private String style = null;
-
+
/** last modified of the style sheet */
private long styleSheetLastModified = 0;
/** the projectFile= attribute */
private String projectAttribute = null;
-
+
/** the File for the project.xml file */
private File projectFile = null;
-
+
/** last modified of the project file if it exists */
private long projectFileLastModified = 0;
@@ -114,13 +114,13 @@
/**
* Set the base directory.
- * @param dir
+ * @param dir
*/
public void setBasedir(File dir)
{
baseDir = dir;
}
-
+
/**
* Set the destination directory into which the VSL result
* files should be copied to
@@ -130,28 +130,28 @@
{
destDir = dir;
}
-
+
/**
* Allow people to set the default output file extension
- * @param extension
+ * @param extension
*/
public void setExtension(String extension)
{
this.extension = extension;
}
-
+
/**
* Allow people to set the path to the .vsl file
- * @param style
+ * @param style
*/
public void setStyle(String style)
{
this.style = style;
}
-
+
/**
* Allow people to set the path to the project.xml file
- * @param projectAttribute
+ * @param projectAttribute
*/
public void setProjectFile(String projectAttribute)
{
@@ -162,20 +162,20 @@
* Set the path to the templates.
* The way it works is this:
* If you have a Velocity.properties file defined, this method
- * will <strong>override</strong> whatever is set in the
+ * will <strong>override</strong> whatever is set in the
* Velocity.properties file. This allows one to not have to define
* a Velocity.properties file, therefore using Velocity's defaults
* only.
- * @param templatePath
+ * @param templatePath
*/
-
+
public void setTemplatePath(File templatePath)
{
- try
+ try
{
this.templatePath = templatePath.getCanonicalPath();
- }
- catch (java.io.IOException ioe)
+ }
+ catch (java.io.IOException ioe)
{
throw new BuildException(ioe);
}
@@ -184,10 +184,10 @@
/**
* Allow people to set the path to the velocity.properties file
* This file is found relative to the path where the JVM was run.
- * For example, if build.sh was executed in the ./build directory,
+ * For example, if build.sh was executed in the ./build directory,
* then the path would be relative to this directory.
* This is optional based on the setting of setTemplatePath().
- * @param velocityPropertiesFile
+ * @param velocityPropertiesFile
*/
public void setVelocityPropertiesFile(File velocityPropertiesFile)
{
@@ -196,11 +196,11 @@
/**
* Turn on/off last modified checking. by default, it is on.
- * @param lastmod
+ * @param lastmod
*/
public void setLastModifiedCheck(String lastmod)
{
- if (lastmod.equalsIgnoreCase("false") || lastmod.equalsIgnoreCase("no")
+ if (lastmod.equalsIgnoreCase("false") || lastmod.equalsIgnoreCase("no")
|| lastmod.equalsIgnoreCase("off"))
{
this.lastModifiedCheck = false;
@@ -209,7 +209,7 @@
/**
* Main body of the application
- * @throws BuildException
+ * @throws BuildException
*/
public void execute () throws BuildException
{
@@ -225,7 +225,7 @@
String msg = "destdir attribute must be set!";
throw new BuildException(msg);
}
- if (style == null)
+ if (style == null)
{
throw new BuildException("style attribute must be set!");
}
@@ -236,13 +236,13 @@
}
/*
- * If the props file doesn't exist AND a templatePath hasn't
+ * If the props file doesn't exist AND a templatePath hasn't
* been defined, then throw the exception.
*/
if ( !velocityPropertiesFile.exists() && templatePath == null )
{
- throw new BuildException ("No template path and could not " +
- "locate velocity.properties file: " +
+ throw new BuildException ("No template path and could not " +
+ "locate velocity.properties file: " +
velocityPropertiesFile.getAbsolutePath());
}
@@ -258,7 +258,7 @@
}
else
{
- log ("Project file is defined, but could not be located: " +
+ log ("Project file is defined, but could not be located: " +
projectFile.getAbsolutePath(), Project.MSG_INFO );
projectFile = null;
}
@@ -297,7 +297,7 @@
log("Error: " + e.toString(), Project.MSG_INFO);
throw new BuildException(e);
}
-
+
// find the files/directories
scanner = getDirectoryScanner(baseDir);
@@ -305,11 +305,11 @@
list = scanner.getIncludedFiles();
for (int i = 0;i < list.length; ++i)
{
- process(list[i], projectDocument );
+ process(list[i], projectDocument );
}
-
- }
-
+
+ }
+
/**
* Process an XML file using Velocity
*/
@@ -324,12 +324,12 @@
// the current input file relative to the baseDir
inFile = new File(baseDir,xmlFile);
// the output file relative to basedir
- outFile = new File(destDir,
+ outFile = new File(destDir,
xmlFile.substring(0,
xmlFile.lastIndexOf('.')) + extension);
// only process files that have changed
- if (lastModifiedCheck == false ||
+ if (lastModifiedCheck == false ||
(inFile.lastModified() > outFile.lastModified() ||
styleSheetLastModified > outFile.lastModified() ||
projectFileLastModified > outFile.lastModified() ||
@@ -351,7 +351,7 @@
* we know it's a string...
*/
String encoding = (String) ve.getProperty( RuntimeConstants.OUTPUT_ENCODING );
- if (encoding == null || encoding.length() == 0
+ if (encoding == null || encoding.length() == 0
|| encoding.equals("8859-1") || encoding.equals("8859_1"))
{
encoding = "ISO-8859-1";
@@ -361,7 +361,7 @@
f.setEncoding(encoding);
OutputWrapper ow = new OutputWrapper(f);
-
+
context.put ("root", root.getRootElement());
context.put ("xmlout", ow );
context.put ("relativePath", getRelativePath(xmlFile));
@@ -377,11 +377,11 @@
{
context.put ("project", projectDocument.getRootElement());
}
-
+
/**
* Add the user subcontexts to the to context
- */
- for (Iterator iter = contexts.iterator(); iter.hasNext();)
+ */
+ for (Iterator iter = contexts.iterator(); iter.hasNext();)
{
Context subContext = (Context) iter.next();
if (subContext == null)
@@ -397,7 +397,7 @@
context.put(subContext.getName(), subContext
.getContextDocument().getRootElement());
}
-
+
/**
* Process the VSL template with the context and write out
* the result as the outFile.
@@ -427,9 +427,9 @@
System.out.println("");
System.out.println("Error: " + rootCause.getMessage());
System.out.println(
- " Line: " +
- ((SAXParseException)rootCause).getLineNumber() +
- " Column: " +
+ " Line: " +
+ ((SAXParseException)rootCause).getLineNumber() +
+ " Column: " +
((SAXParseException)rootCause).getColumnNumber());
System.out.println("");
}
@@ -450,7 +450,7 @@
outFile.delete();
}
e.printStackTrace();
- }
+ }
finally
{
if (writer != null)
@@ -475,7 +475,7 @@
}
}
}
-
+
/**
* Hacky method to figure out the relative path
* that we are currently in. This is good for getting
@@ -488,7 +488,7 @@
StringTokenizer st = new StringTokenizer(file, "/\\");
// needs to be -1 cause ST returns 1 even if there are no matches. huh?
int slashCount = st.countTokens() - 1;
- StringBuffer sb = new StringBuffer();
+ StringBuffer sb = new StringBuffer();
for (int i=0;i<slashCount ;i++ )
{
sb.append ("../");
@@ -501,7 +501,7 @@
return ".";
}
-
+
/**
* create directories as needed
*/
@@ -512,7 +512,7 @@
{
if (!directory.mkdirs())
{
- throw new BuildException("Unable to create directory: "
+ throw new BuildException("Unable to create directory: "
+ directory.getAbsolutePath() );
}
}
@@ -522,115 +522,115 @@
/**
* Check to see if user context is modified.
*/
- private boolean userContextsModifed(long lastModified)
+ private boolean userContextsModifed(long lastModified)
{
- for (Iterator iter = contexts.iterator(); iter.hasNext();)
+ for (Iterator iter = contexts.iterator(); iter.hasNext();)
{
AnakiaTask.Context ctx = (AnakiaTask.Context) iter.next();
- if(ctx.getLastModified() > lastModified)
+ if(ctx.getLastModified() > lastModified)
{
return true;
}
}
return false;
}
-
+
/**
* Create a new context.
* @return A new context.
*/
- public Context createContext()
+ public Context createContext()
{
Context context = new Context();
contexts.add(context);
- return context;
+ return context;
}
-
-
+
+
/**
* A context implementation that loads all values from an XML file.
*/
- public class Context
+ public class Context
{
-
+
private String name;
private Document contextDoc = null;
private String file;
-
+
/**
* Public constructor.
*/
- public Context()
+ public Context()
{
}
-
+
/**
* Get the name of the context.
* @return The name of the context.
*/
- public String getName()
+ public String getName()
{
return name;
}
/**
- * Set the name of the context.
- * @param name
- *
- * @throws IllegalArgumentException if a reserved word is used as a
+ * Set the name of the context.
+ * @param name
+ *
+ * @throws IllegalArgumentException if a reserved word is used as a
* name, specifically any of "relativePath", "treeWalk", "xpath",
* "escape", "date", or "project"
*/
- public void setName(String name)
+ public void setName(String name)
{
- if (name.equals("relativePath") ||
- name.equals("treeWalk") ||
- name.equals("xpath") ||
- name.equals("escape") ||
+ if (name.equals("relativePath") ||
+ name.equals("treeWalk") ||
+ name.equals("xpath") ||
+ name.equals("escape") ||
name.equals("date") ||
- name.equals("project"))
+ name.equals("project"))
{
-
+
throw new IllegalArgumentException("Context name '" + name
+ "' is reserved by Anakia");
}
-
+
this.name = name;
}
-
+
/**
* Build the context based on a file path.
- * @param file
+ * @param file
*/
- public void setFile(String file)
+ public void setFile(String file)
{
this.file = file;
}
-
+
/**
* Retrieve the time the source file was last modified.
* @return The time the source file was last modified.
*/
- public long getLastModified()
+ public long getLastModified()
{
return new File(baseDir, file).lastModified();
}
-
+
/**
* Retrieve the context document object.
* @return The context document object.
*/
- public Document getContextDocument()
+ public Document getContextDocument()
{
if (contextDoc == null)
{
File contextFile = new File(baseDir, file);
-
- try
+
+ try
{
contextDoc = builder.build(contextFile);
- }
- catch (Exception e)
+ }
+ catch (Exception e)
{
throw new BuildException(e);
}
@@ -639,4 +639,4 @@
}
}
-}
+}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/Escape.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/Escape.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/Escape.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/Escape.java Tue Sep 19 14:00:14 2006
@@ -17,7 +17,7 @@
*/
/**
- * This class is for escaping CDATA sections. The code was
+ * This class is for escaping CDATA sections. The code was
* "borrowed" from the JDOM code. Also included is escaping
* the " -> &quot; character and the conversion of newlines
* to the platform line separator.
@@ -29,10 +29,10 @@
public class Escape
{
/**
- *
+ *
*/
public static final String LINE_SEPARATOR = System.getProperty("line.separator");
-
+
/**
* Empty constructor
*/
@@ -40,10 +40,10 @@
{
// left blank on purpose
}
-
+
/**
* Do the escaping.
- * @param st
+ * @param st
* @return The escaped text.
*/
public static final String getText(String st)
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/NodeList.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/NodeList.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/NodeList.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/NodeList.java Tue Sep 19 14:00:14 2006
@@ -39,9 +39,9 @@
*/
public class NodeList implements List, Cloneable
{
- private static final AttributeXMLOutputter DEFAULT_OUTPUTTER =
+ private static final AttributeXMLOutputter DEFAULT_OUTPUTTER =
new AttributeXMLOutputter();
-
+
/** The contained nodes */
private List nodes;
@@ -55,7 +55,7 @@
/**
* Creates a node list that holds a single {@link Document} node.
- * @param document
+ * @param document
*/
public NodeList(Document document)
{
@@ -64,7 +64,7 @@
/**
* Creates a node list that holds a single {@link Element} node.
- * @param element
+ * @param element
*/
public NodeList(Element element)
{
@@ -81,10 +81,10 @@
nodes = new ArrayList(1);
nodes.add(object);
}
-
+
/**
- * Creates a node list that holds a list of nodes.
- * @param nodes the list of nodes this template should hold. The created
+ * Creates a node list that holds a list of nodes.
+ * @param nodes the list of nodes this template should hold. The created
* template will copy the passed nodes list, so changes to the passed list
* will not affect the model.
*/
@@ -92,9 +92,9 @@
{
this(nodes, true);
}
-
+
/**
- * Creates a node list that holds a list of nodes.
+ * Creates a node list that holds a list of nodes.
* @param nodes the list of nodes this template should hold.
* @param copy if true, the created template will copy the passed nodes
* list, so changes to the passed list will not affect the model. If false,
@@ -110,13 +110,13 @@
}
this.nodes = copy ? new ArrayList(nodes) : nodes;
}
-
+
/**
* Retrieves the underlying list used to store the nodes. Note however, that
* you can fully use the underlying list through the <code>List</code> interface
* of this class itself. You would probably access the underlying list only for
* synchronization purposes.
- * @return The internal node List.
+ * @return The internal node List.
*/
public List getList()
{
@@ -124,7 +124,7 @@
}
/**
- * This method returns the string resulting from concatenation of string
+ * This method returns the string resulting from concatenation of string
* representations of its nodes. Each node is rendered using its XML
* serialization format. This greatly simplifies creating XML-transformation
* templates, as to output a node contained in variable x as XML fragment,
@@ -184,9 +184,9 @@
else
{
throw new IllegalArgumentException(
- "Cannot process a " +
- (node == null
- ? "null node"
+ "Cannot process a " +
+ (node == null
+ ? "null node"
: "node of class " + node.getClass().getName()));
}
}
@@ -212,7 +212,7 @@
clonedList.cloneNodes();
return clonedList;
}
-
+
private void cloneNodes()
throws CloneNotSupportedException
{
@@ -234,7 +234,7 @@
// Cannot happen as listClass represents a concrete, non-primitive,
// non-array, non-void class - there's an instance of it in "nodes"
// which proves these assumptions.
- throw new Error();
+ throw new Error();
}
}
@@ -246,7 +246,7 @@
{
return nodes.hashCode();
}
-
+
/**
* Tests for equality with another object.
* @param o the object to test for equality
@@ -255,11 +255,11 @@
*/
public boolean equals(Object o)
{
- return o instanceof NodeList
+ return o instanceof NodeList
? ((NodeList)o).nodes.equals(nodes)
: false;
}
-
+
/**
* Applies an XPath expression to the node list and returns the resulting
* node list. In order for this method to work, your application must have
@@ -466,7 +466,7 @@
}
/**
- * A special subclass of XMLOutputter that will be used to output
+ * A special subclass of XMLOutputter that will be used to output
* Attribute nodes. As a subclass of XMLOutputter it can use its protected
* method escapeAttributeEntities() to serialize the attribute
* appropriately.
@@ -484,10 +484,10 @@
out.write(" ");
out.write(attribute.getQualifiedName());
out.write("=");
-
+
out.write("\"");
out.write(escapeAttributeEntities(attribute.getValue()));
- out.write("\"");
+ out.write("\"");
}
}
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/OutputWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/OutputWrapper.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/OutputWrapper.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/OutputWrapper.java Tue Sep 19 14:00:14 2006
@@ -59,9 +59,9 @@
* <p>
* foo <strong>bar</strong> ack </td>
* </p>
- * @param element
- * @param strip
- * @return The output string.
+ * @param element
+ * @param strip
+ * @return The output string.
*/
public String outputString(Element element, boolean strip)
{
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/TreeWalker.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/TreeWalker.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/TreeWalker.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/TreeWalker.java Tue Sep 19 14:00:14 2006
@@ -24,8 +24,8 @@
/**
* This class allows you to walk a tree of JDOM Element objects.
- * It first walks the tree itself starting at the Element passed
- * into allElements() and stores each node of the tree
+ * It first walks the tree itself starting at the Element passed
+ * into allElements() and stores each node of the tree
* in a Vector which allElements() returns as a result of its
* execution. You can then use a #foreach in Velocity to walk
* over the Vector and visit each Element node. However, you can
@@ -44,10 +44,10 @@
{
// Left blank
}
-
+
/**
* Creates a new Vector and walks the Element tree.
- *
+ *
* @param e the starting Element node
* @return Vector a vector of Element nodes
*/
@@ -57,7 +57,7 @@
treeWalk (e, theElements);
return new NodeList(theElements, false);
}
-
+
/**
* A recursive method to walk the Element tree.
* @param Element the current Element
@@ -69,6 +69,6 @@
Element child = (Element)i.next();
theElements.add(child);
treeWalk(child, theElements);
- }
+ }
}
-}
+}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathCache.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathCache.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathCache.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathCache.java Tue Sep 19 14:00:14 2006
@@ -21,8 +21,8 @@
import java.util.WeakHashMap;
/**
- * Provides a cache for XPath expressions. Used by {@link NodeList} and
- * {@link AnakiaElement} to minimize XPath parsing in their
+ * Provides a cache for XPath expressions. Used by {@link NodeList} and
+ * {@link AnakiaElement} to minimize XPath parsing in their
* <code>selectNodes()</code> methods.
*
* @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>
@@ -37,7 +37,7 @@
private XPathCache()
{
}
-
+
/**
* Returns an XPath object representing the requested XPath expression.
* A cached object is returned if it already exists for the requested expression.
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathTool.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathTool.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathTool.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/XPathTool.java Tue Sep 19 14:00:14 2006
@@ -39,7 +39,7 @@
* <pre>
* #set $authors = $xpath.applyTo("document/author", $root)
* #foreach ($author in $authors)
- * $author.getValue()
+ * $author.getValue()
* #end
* #set $chapterTitles = $xpath.applyTo("document/chapter/@title", $root)
* #foreach ($title in $chapterTitles)
@@ -52,7 +52,7 @@
* <pre>
* #set $authors = $root.selectNodes("document/author")
* #foreach ($author in $authors)
- * $author.getValue()
+ * $author.getValue()
* #end
* #set $chapterTitles = $root.selectNodes("document/chapter/@title")
* #foreach ($title in $chapterTitles)
@@ -60,7 +60,7 @@
* #end
* </pre>
* <p>
- *
+ *
* @author <a href="mailto:bob@werken.com">bob mcwhirter</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java Tue Sep 19 14:00:14 2006
@@ -26,12 +26,12 @@
* <p>
* This is a small utility class allow easy access to static fields in a class,
* such as string constants. Velocity will not introspect for class
- * fields (and won't in the future :), but writing setter/getter methods to do
+ * fields (and won't in the future :), but writing setter/getter methods to do
* this really is a pain, so use this if you really have
* to access fields.
- *
+ *
* <p>
- * The idea it so enable access to the fields just like you would in Java.
+ * The idea it so enable access to the fields just like you would in Java.
* For example, in Java, you would access a static field like
* <blockquote><pre>
* MyClass.STRING_CONSTANT
@@ -44,7 +44,7 @@
* context.put("runtime", new FieldMethodizer( "org.apache.velocity.runtime.Runtime" ));
* </pre></blockquote>
* and then in your template, you can access any of your static fields in this way :
- * <blockquote><pre>
+ * <blockquote><pre>
* $runtime.RUNTIME_LOG_WARN_STACKTRACE
* </pre></blockquote>
*
@@ -55,7 +55,7 @@
* to handle them by explicitly placing them into the context.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id$
+ * @version $Id$
*/
public class FieldMethodizer
{
@@ -87,8 +87,8 @@
}
catch( Exception e )
{
- System.err.println("Could not add " + s
- + " for field methodizing: "
+ System.err.println("Could not add " + s
+ + " for field methodizing: "
+ e.getMessage());
}
}
@@ -109,27 +109,27 @@
}
catch( Exception e )
{
- System.err.println("Could not add " + o
- + " for field methodizing: "
+ System.err.println("Could not add " + o
+ + " for field methodizing: "
+ e.getMessage());
}
}
-
+
/**
* Add the Name of the class to methodize
- * @param s
- * @throws Exception
+ * @param s
+ * @throws Exception
*/
public void addObject ( String s )
throws Exception
{
inspect(ClassUtils.getClass(s));
}
-
+
/**
* Add an Object to methodize
- * @param o
- * @throws Exception
+ * @param o
+ * @throws Exception
*/
public void addObject ( Object o )
throws Exception
@@ -147,7 +147,7 @@
public Object get( String fieldName )
{
Object value = null;
- try
+ try
{
Field f = (Field) fieldHash.get( fieldName );
if (f != null)
@@ -157,7 +157,7 @@
}
catch( IllegalAccessException e )
{
- System.err.println("IllegalAccessException while trying to access " + fieldName
+ System.err.println("IllegalAccessException while trying to access " + fieldName
+ ": " + e.getMessage());
}
return value;
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/Velocity.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/Velocity.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/Velocity.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/Velocity.java Tue Sep 19 14:00:14 2006
@@ -70,8 +70,8 @@
/**
* initialize the Velocity runtime engine, using the default
* properties of the Velocity distribution
- *
- * @throws Exception When an error during initialization occurs.
+ *
+ * @throws Exception When an error during initialization occurs.
*/
public static void init()
throws Exception
@@ -85,7 +85,7 @@
*
* @param propsFilename file containing properties to use to initialize
* the Velocity runtime
- * @throws Exception When an error during initialization occurs.
+ * @throws Exception When an error during initialization occurs.
*/
public static void init( String propsFilename )
throws Exception
@@ -98,7 +98,7 @@
* plus the properties in the passed in java.util.Properties object
*
* @param p Properties object containing initialization properties
- * @throws Exception When an error during initialization occurs.
+ * @throws Exception When an error during initialization occurs.
*
*/
public static void init( Properties p )
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/VelocityEngine.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/VelocityEngine.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/VelocityEngine.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/VelocityEngine.java Tue Sep 19 14:00:14 2006
@@ -104,7 +104,7 @@
/**
* initialize the Velocity runtime engine, using the default
* properties of the Velocity distribution
- * @throws Exception
+ * @throws Exception
*/
public void init()
throws Exception
@@ -118,7 +118,7 @@
*
* @param propsFilename file containing properties to use to initialize
* the Velocity runtime
- * @throws Exception
+ * @throws Exception
*/
public void init(String propsFilename)
throws Exception
@@ -131,7 +131,7 @@
* plus the properties in the passed in java.util.Properties object
*
* @param p Proprties object containing initialization properties
- * @throws Exception
+ * @throws Exception
*
*/
public void init(Properties p)
@@ -211,10 +211,10 @@
*
* @return true if successful, false otherwise. If false, see
* Velocity runtime log
- * @throws ParseErrorException
- * @throws MethodInvocationException
- * @throws ResourceNotFoundException
- * @throws IOException
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws ResourceNotFoundException
+ * @throws IOException
*/
public boolean evaluate( Context context, Writer out,
String logTag, String instring )
@@ -237,10 +237,10 @@
*
* @return true if successful, false otherwise. If false, see
* Velocity runtime log
- * @throws ParseErrorException
- * @throws MethodInvocationException
- * @throws ResourceNotFoundException
- * @throws IOException
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws ResourceNotFoundException
+ * @throws IOException
* @deprecated Use
* {@link #evaluate( Context context, Writer writer,
* String logTag, Reader reader ) }
@@ -284,10 +284,10 @@
*
* @return true if successful, false otherwise. If false, see
* Velocity runtime log
- * @throws ParseErrorException
- * @throws MethodInvocationException
- * @throws ResourceNotFoundException
- * @throws IOException
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws ResourceNotFoundException
+ * @throws IOException
*
* @since Velocity v1.1
*/
@@ -368,7 +368,7 @@
* @param context Context object containing data/objects used for rendering.
* @param writer Writer for output stream
* @return true if Velocimacro exists and successfully invoked, false otherwise.
- * @throws Exception
+ * @throws Exception
*/
public boolean invokeVelocimacro( String vmName, String logTag,
String params[], Context context,
@@ -446,10 +446,10 @@
*
* @return true if successful, false otherwise. Errors
* logged to velocity log.
- * @throws ResourceNotFoundException
- * @throws ParseErrorException
- * @throws MethodInvocationException
- * @throws Exception
+ * @throws ResourceNotFoundException
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws Exception
* * @deprecated Use
* {@link #mergeTemplate( String templateName, String encoding,
* Context context, Writer writer )}
@@ -472,10 +472,10 @@
*
* @return true if successful, false otherwise. Errors
* logged to velocity log
- * @throws ResourceNotFoundException
- * @throws ParseErrorException
- * @throws MethodInvocationException
- * @throws Exception
+ * @throws ResourceNotFoundException
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws Exception
*
* @since Velocity v1.1
*/
@@ -558,7 +558,7 @@
}
/**
- * @param resourceName
+ * @param resourceName
* @return True if the template exists.
* @see #resourceExists(String)
* @deprecated Use resourceExists(String) instead.
@@ -580,7 +580,7 @@
}
/**
- * @param message
+ * @param message
* @deprecated Use getLog() and call warn() on it.
*/
public void warn(Object message)
@@ -589,7 +589,7 @@
}
/**
- * @param message
+ * @param message
* @deprecated Use getLog() and call warn() on it.
*/
public void info(Object message)
@@ -598,7 +598,7 @@
}
/**
- * @param message
+ * @param message
* @deprecated Use getLog() and call warn() on it.
*/
public void error(Object message)
@@ -607,7 +607,7 @@
}
/**
- * @param message
+ * @param message
* @deprecated Use getLog() and call warn() on it.
*/
public void debug(Object message)
@@ -617,8 +617,8 @@
/**
* <p>
- * Sets an application attribute (which can be any Object) that will be
- * accessible from any component of the system that gets a
+ * Sets an application attribute (which can be any Object) that will be
+ * accessible from any component of the system that gets a
* RuntimeServices. This allows communication between the application
* environment and custom pluggable components of the Velocity engine,
* such as ResourceLoaders and LogChutes.
@@ -639,7 +639,7 @@
{
ri.setApplicationAttribute(key, value);
}
-
+
/**
* <p>
* Return an application attribute (which can be any Object)
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java Tue Sep 19 14:00:14 2006
@@ -23,11 +23,11 @@
* have the method setContext called before each event. This
* allows the event handler to use information in the latest context
* when responding to the event.
- *
+ *
* <P>Important Note: Only local event handlers attached to the context
* (as opposed to global event handlers initialized in the velocity.properties
* file) should implement ContextAware. Since global event handlers are
- * singletons individual requests will not be able to count on the
+ * singletons individual requests will not be able to count on the
* correct context being loaded before a request.
*
* @author <a href="mailto:wglass@wglass@forio.com">Will Glass-Husain</a>
@@ -37,7 +37,7 @@
{
/**
* Initialize the EventHandler.
- * @param context
+ * @param context
*/
public void setContext( Context context );
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java Tue Sep 19 14:00:14 2006
@@ -247,8 +247,8 @@
* Initialize the handlers. For global handlers this is called when Velocity
* is initialized. For local handlers this is called when the first handler
* is executed. Handlers will not be initialized more than once.
- * @param rs
- * @throws Exception
+ * @param rs
+ * @throws Exception
*/
public void initialize (RuntimeServices rs) throws Exception
{
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/IncludeEventHandler.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/IncludeEventHandler.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/IncludeEventHandler.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/IncludeEventHandler.java Tue Sep 19 14:00:14 2006
@@ -32,13 +32,13 @@
* of the resource to be included or may block the include entirely. All the
* registered IncludeEventHandlers are called unless null is returned. If
* none are registered the template at the includeResourcePath is retrieved.
- *
+ *
* @param includeResourcePath the path as given in the include directive.
* @param currentResourcePath the path of the currently rendering template that includes the
* include directive.
* @param directiveName name of the directive used to include the resource. (With the
* standard directives this is either "parse" or "include").
- *
+ *
* @return a new resource path for the directive, or null to block the
* include from occurring.
*/
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ReferenceInsertionEventHandler.java Tue Sep 19 14:00:14 2006
@@ -35,7 +35,7 @@
* ReferenceInsertionEventHandlers are called in sequence. If no
* ReferenceInsertionEventHandlers are are registered then reference value
* is inserted into the output stream as is.
- *
+ *
* @param reference Reference from template about to be inserted.
* @param value Value about to be inserted (after its <code>toString()</code>
* method is called).
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java Tue Sep 19 14:00:14 2006
@@ -21,8 +21,8 @@
/**
* Event handlers implementing this interface will automatically
* have the method setRuntimeServices called when the associated
- * EventCartridge is attached to the context.
- *
+ * EventCartridge is attached to the context.
+ *
* @author <a href="mailto:wglass@wglass@forio.com">Will Glass-Husain</a>
* @version $Id$
*/
@@ -30,8 +30,8 @@
{
/**
* Initialize the EventHandler.
- * @param rs
- * @throws Exception
+ * @param rs
+ * @throws Exception
*/
public void setRuntimeServices( RuntimeServices rs ) throws Exception;
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java Tue Sep 19 14:00:14 2006
@@ -11,8 +11,8 @@
{
/**
- * Escape all HTML entities.
- * @param text
+ * Escape all HTML entities.
+ * @param text
* @return An escaped String.
* @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/StringEscapeUtils.html#escapeHtml(java.lang.String)">StringEscapeUtils</a>
*/
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java Tue Sep 19 14:00:14 2006
@@ -12,7 +12,7 @@
/**
* Escapes the characters in a String to be suitable for use in JavaScript.
- * @param text
+ * @param text
* @return An escaped String.
* @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/StringEscapeUtils.html#escapeJavaScript(java.lang.String)">StringEscapeUtils</a>
*/
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java Tue Sep 19 14:00:14 2006
@@ -26,82 +26,82 @@
/**
* Base class for escaping references. To use it, override the following methods:
* <DL>
- * <DT><code>String escape(String text)</code></DT>
+ * <DT><code>String escape(String text)</code></DT>
* <DD>escape the provided text</DD>
* <DT><code>String getMatchAttribute()</code></DT>
* <DD>retrieve the configuration attribute used to match references (see below)</DD>
* </DL>
- *
- * <P>By default, all references are escaped. However, by setting the match attribute
- * in the configuration file to a regular expression, users can specify which references
+ *
+ * <P>By default, all references are escaped. However, by setting the match attribute
+ * in the configuration file to a regular expression, users can specify which references
* to escape. For example the following configuration property tells the EscapeSqlReference
- * event handler to only escape references that start with "sql".
+ * event handler to only escape references that start with "sql".
* (e.g. <code>$sql</code>, <code>$sql.toString(),</code>, etc).
- *
+ *
* <PRE>
- * <CODE>eventhandler.escape.sql.match = /sql.*<!-- -->/
+ * <CODE>eventhandler.escape.sql.match = /sql.*<!-- -->/
* </CODE>
* </PRE>
* <!-- note: ignore empty HTML comment above - breaks up star slash avoiding javadoc end -->
*
* Regular expressions should follow the "Perl5" format used by the ORO regular expression
- * library. More info is at
+ * library. More info is at
* <a href="http://jakarta.apache.org/oro/api/org/apache/oro/text/perl/package-summary.html">http://jakarta.apache.org/oro/api/org/apache/oro/text/perl/package-summary.html</a>.
- *
+ *
* @author <a href="mailto:wglass@forio.com">Will Glass-Husain </a>
* @version $Id$
*/
public abstract class EscapeReference implements ReferenceInsertionEventHandler,RuntimeServicesAware {
-
- private Perl5Util perl = new Perl5Util();
+
+ private Perl5Util perl = new Perl5Util();
private RuntimeServices rs;
-
+
private String matchRegExp = null;
/**
* Escape the given text. Override this in a subclass to do the actual
* escaping.
- *
+ *
* @param text the text to escape
* @return the escaped text
*/
protected abstract String escape(Object text);
-
+
/**
- * Specify the configuration attribute that specifies the
+ * Specify the configuration attribute that specifies the
* regular expression. Ideally should be in a form
* <pre><code>eventhandler.escape.XYZ.match</code></pre>
- *
- * <p>where <code>XYZ</code> is the type of escaping being done.
+ *
+ * <p>where <code>XYZ</code> is the type of escaping being done.
* @return configuration attribute
*/
protected abstract String getMatchAttribute();
-
+
/**
* Escape the provided text if it matches the configured regular expression.
- * @param reference
- * @param value
+ * @param reference
+ * @param value
* @return Escaped text.
*/
- public Object referenceInsert(String reference, Object value)
+ public Object referenceInsert(String reference, Object value)
{
if(value == null)
{
- return value;
+ return value;
}
-
+
if (matchRegExp == null)
{
return escape(value);
}
-
+
else if (perl.match(matchRegExp,reference))
{
return escape(value);
}
-
+
else
{
return value;
@@ -110,10 +110,10 @@
/**
* Called automatically when event cartridge is initialized.
- * @param rs
- * @throws Exception
+ * @param rs
+ * @throws Exception
*/
- public void setRuntimeServices(RuntimeServices rs) throws Exception
+ public void setRuntimeServices(RuntimeServices rs) throws Exception
{
this.rs = rs;
@@ -125,28 +125,28 @@
{
matchRegExp = null;
}
-
+
/**
* Test the regular expression for a well formed pattern
*/
- if (matchRegExp != null)
+ if (matchRegExp != null)
{
- try
+ try
{
perl.match(matchRegExp,"");
- }
- catch (MalformedPerl5PatternException E)
+ }
+ catch (MalformedPerl5PatternException E)
{
rs.getLog().error("Invalid regular expression '" + matchRegExp
+ "'. No escaping will be performed.", E);
matchRegExp = null;
}
}
-
+
}
/**
- * Retrieve a reference to RuntimeServices. Use this for checking additional
+ * Retrieve a reference to RuntimeServices. Use this for checking additional
* configuration properties.
* @return The current runtime services object.
*/
@@ -154,5 +154,5 @@
{
return rs;
}
-
+
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java Tue Sep 19 14:00:14 2006
@@ -12,7 +12,7 @@
/**
* Escapes the characters in a String to be suitable to pass to an SQL query.
- * @param text
+ * @param text
* @return An escaped string.
* @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/StringEscapeUtils.html#escapeSql(java.lang.String)">StringEscapeUtils</a>
*/
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java Tue Sep 19 14:00:14 2006
@@ -11,8 +11,8 @@
{
/**
- * Escape all XML entities.
- * @param text
+ * Escape all XML entities.
+ * @param text
* @return An escaped String.
* @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/StringEscapeUtils.html#escapeSql(java.lang.String)">StringEscapeUtils</a>
*/
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java Tue Sep 19 14:00:14 2006
@@ -49,9 +49,9 @@
* Chseck to see if included file exists, and display "not found" page if it
* doesn't. If "not found" page does not exist, log an error and return
* null.
- * @param includeResourcePath
- * @param currentResourcePath
- * @param directiveName
+ * @param includeResourcePath
+ * @param currentResourcePath
+ * @param directiveName
* @return message.
*/
public String includeEvent(
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeRelativePath.java Tue Sep 19 14:00:14 2006
@@ -31,9 +31,9 @@
/**
* Return path relative to the current template's path.
- * @param includeResourcePath
- * @param currentResourcePath
- * @param directiveName
+ * @param includeResourcePath
+ * @param currentResourcePath
+ * @param directiveName
* @return Include String.
*/
public String includeEvent(
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java Tue Sep 19 14:00:14 2006
@@ -46,11 +46,11 @@
/**
* Render the method exception, and optionally the exception message and stack trace.
- * @param claz
- * @param method
- * @param e
+ * @param claz
+ * @param method
+ * @param e
* @return Exception Message.
- * @throws Exception
+ * @throws Exception
*/
public Object methodException(Class claz, String method, Exception e) throws Exception
{
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/tools/VelocityFormatter.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/tools/VelocityFormatter.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/tools/VelocityFormatter.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/tools/VelocityFormatter.java Tue Sep 19 14:00:14 2006
@@ -264,11 +264,11 @@
public class VelocityAlternator
{
/**
- *
+ *
*/
protected String[] alternates = null;
/**
- *
+ *
*/
protected int current = 0;
@@ -369,10 +369,10 @@
/**
* Makes an alternator object that alternates between three
* values.
- * @param name
- * @param alt1
- * @param alt2
- * @param alt3
+ * @param name
+ * @param alt1
+ * @param alt2
+ * @param alt3
* @return alternated object.
*
* @see #makeAlternator(String name, String alt1, String alt2)
@@ -389,11 +389,11 @@
/**
* Makes an alternator object that alternates between four values.
- * @param name
- * @param alt1
- * @param alt2
- * @param alt3
- * @param alt4
+ * @param name
+ * @param alt1
+ * @param alt2
+ * @param alt3
+ * @param alt4
* @return Alternated object.
*
* @see #makeAlternator(String name, String alt1, String alt2)
@@ -409,10 +409,10 @@
/**
* Makes an alternator object that alternates between two values
* automatically.
- * @param name
- * @param alt1
- * @param alt2
- * @return Alternated object.
+ * @param name
+ * @param alt1
+ * @param alt2
+ * @return Alternated object.
*
* @see #makeAlternator(String name, String alt1, String alt2)
*/
@@ -425,8 +425,8 @@
/**
* Returns a default value if the object passed is null.
- * @param o
- * @param dflt
+ * @param o
+ * @param dflt
* @return Object or default value when object is null.
*/
public Object isNull(Object o, Object dflt)
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/AbstractContext.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/AbstractContext.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/AbstractContext.java Tue Sep 19 14:00:14 2006
@@ -18,9 +18,9 @@
/**
- * This class is the abstract base class for all conventional
- * Velocity Context implementations. Simply extend this class
- * and implement the abstract routines that access your preferred
+ * This class is the abstract base class for all conventional
+ * Velocity Context implementations. Simply extend this class
+ * and implement the abstract routines that access your preferred
* storage method.
*
* Takes care of context chaining.
@@ -35,7 +35,7 @@
* will be dropped and logged.
* </ul>
*
- * The default implementation of this for application use is
+ * The default implementation of this for application use is
* org.apache.velocity.VelocityContext.
*
* All thanks to Fedor for the chaining idea.
@@ -46,30 +46,30 @@
* @version $Id$
*/
-public abstract class AbstractContext extends InternalContextBase
+public abstract class AbstractContext extends InternalContextBase
implements Context
{
/**
* the chained Context if any
*/
private Context innerContext = null;
-
- /**
- * Implement to return a value from the context storage.
+
+ /**
+ * Implement to return a value from the context storage.
* <br><br>
* The implementation of this method is required for proper
* operation of a Context implementation in general
* Velocity use.
- *
+ *
* @param key key whose associated value is to be returned
* @return object stored in the context
*/
public abstract Object internalGet( String key );
- /**
+ /**
* Implement to put a value into the context storage.
* <br><br>
- * The implementation of this method is required for
+ * The implementation of this method is required for
* proper operation of a Context implementation in
* general Velocity use.
*
@@ -79,19 +79,19 @@
*/
public abstract Object internalPut( String key, Object value );
- /**
+ /**
* Implement to determine if a key is in the storage.
* <br><br>
- * Currently, this method is not used internally by
- * the Velocity engine.
+ * Currently, this method is not used internally by
+ * the Velocity engine.
*
- * @param key key to test for existance
+ * @param key key to test for existance
* @return true if found, false if not
*/
public abstract boolean internalContainsKey(Object key);
- /**
- * Implement to return an object array of key
+ /**
+ * Implement to return an object array of key
* strings from your storage.
* <br><br>
* Currently, this method is not used internally by
@@ -101,7 +101,7 @@
*/
public abstract Object[] internalGetKeys();
- /**
+ /**
* I mplement to remove an item from your storage.
* <br><br>
* Currently, this method is not used internally by
@@ -117,13 +117,13 @@
*/
public AbstractContext()
{
- }
+ }
/**
* Chaining constructor accepts a Context argument.
* It will relay get() operations into this Context
* in the even the 'local' get() returns null.
- *
+ *
* @param inner context to be chained
*/
public AbstractContext( Context inner )
@@ -142,8 +142,8 @@
}
/**
- * Adds a name/value pair to the context.
- *
+ * Adds a name/value pair to the context.
+ *
* @param key The name to key the provided value with.
* @param value The corresponding value.
* @return Object that was replaced in the the Context if
@@ -163,7 +163,7 @@
{
return null;
}
-
+
return internalPut(key, value);
}
@@ -199,12 +199,12 @@
{
o = innerContext.get( key );
}
-
+
return o;
- }
+ }
/**
- * Indicates whether the specified key is in the context. Provided for
+ * Indicates whether the specified key is in the context. Provided for
* debugging purposes.
*
* @param key The key to look for.
@@ -218,7 +218,7 @@
}
return internalContainsKey(key);
- }
+ }
/**
* Get all the keys for the values in the context
@@ -234,7 +234,7 @@
* Removes the value associated with the specified key from the context.
*
* @param key The name of the value to remove.
- * @return The value that the key was mapped to, or <code>null</code>
+ * @return The value that the key was mapped to, or <code>null</code>
* if unmapped.
*/
public Object remove(Object key)
@@ -245,7 +245,7 @@
}
return internalRemove(key);
- }
+ }
/**
* returns innerContext if one is chained
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/Context.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/Context.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/Context.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/Context.java Tue Sep 19 14:00:14 2006
@@ -51,7 +51,7 @@
* @return The value corresponding to the provided key.
*/
Object get(String key);
-
+
/**
* Indicates whether the specified key is in the context.
*
@@ -70,7 +70,7 @@
* Removes the value associated with the specified key from the context.
*
* @param key The name of the value to remove.
- * @return The value that the key was mapped to, or <code>null</code>
+ * @return The value that the key was mapped to, or <code>null</code>
* if unmapped.
*/
Object remove(Object key);
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapter.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapter.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapter.java Tue Sep 19 14:00:14 2006
@@ -27,7 +27,7 @@
* @version $Id$
*/
-public interface InternalContextAdapter
+public interface InternalContextAdapter
extends InternalHousekeepingContext, Context, InternalWrapperContext, InternalEventContext
{
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java Tue Sep 19 14:00:14 2006
@@ -34,37 +34,37 @@
* <li> InternalEventContext : for event handling.
* </ul>
*
- * This class implements the two interfaces to ensure that all methods are
- * supported. When adding to the interfaces, or adding more context
+ * This class implements the two interfaces to ensure that all methods are
+ * supported. When adding to the interfaces, or adding more context
* functionality, the interface is the primary definition, so alter that first
- * and then all classes as necessary. As of this writing, this would be
+ * and then all classes as necessary. As of this writing, this would be
* the only class affected by changes to InternalContext
*
* This class ensures that an InternalContextBase is available for internal
* use. If an application constructs their own Context-implementing
* object w/o subclassing AbstractContext, it may be that support for
* InternalContext is not available. Therefore, InternalContextAdapter will
- * create an InternalContextBase if necessary for this support. Note that
+ * create an InternalContextBase if necessary for this support. Note that
* if this is necessary, internal information such as node-cache data will be
* lost from use to use of the context. This may or may not be important,
* depending upon application.
- *
+ *
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @version $Id$
*/
public final class InternalContextAdapterImpl implements InternalContextAdapter
{
- /**
- * the user data Context that we are wrapping
+ /**
+ * the user data Context that we are wrapping
*/
Context context = null;
-
- /**
+
+ /**
* the ICB we are wrapping. We may need to make one
* if the user data context implementation doesn't
* support one. The default AbstractContext-derived
- * VelocityContext does, and it's recommended that
+ * VelocityContext does, and it's recommended that
* people derive new contexts from AbstractContext
* rather than piecing things together
*/
@@ -73,19 +73,19 @@
/**
* The InternalEventContext that we are wrapping. If
* the context passed to us doesn't support it, no
- * biggie. We don't make it for them - since its a
+ * biggie. We don't make it for them - since its a
* user context thing, nothing gained by making one
* for them now
*/
InternalEventContext iec = null;
/**
- * CTOR takes a Context and wraps it, delegating all 'data' calls
+ * CTOR takes a Context and wraps it, delegating all 'data' calls
* to it.
- *
+ *
* For support of internal contexts, it will create an InternalContextBase
* if need be.
- * @param c
+ * @param c
*/
public InternalContextAdapterImpl( Context c )
{
@@ -123,7 +123,7 @@
{
icb.popCurrentTemplateName();
}
-
+
/**
* @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentTemplateName()
*/
@@ -147,7 +147,7 @@
{
return icb.icacheGet( key );
}
-
+
/**
* @see org.apache.velocity.context.InternalHousekeepingContext#icachePut(java.lang.Object, org.apache.velocity.util.introspection.IntrospectionCacheData)
*/
@@ -238,7 +238,7 @@
/**
* returns the user data context that
* we are wrapping
- * @return The internal user data context.
+ * @return The internal user data context.
*/
public Context getInternalUserContext()
{
@@ -246,7 +246,7 @@
}
/**
- * Returns the base context that we are
+ * Returns the base context that we are
* wrapping. Here, its this, but for other thing
* like VM related context contortions, it can
* be something else
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java Tue Sep 19 14:00:14 2006
@@ -26,9 +26,9 @@
import org.apache.velocity.runtime.resource.Resource;
/**
- * class to encapsulate the 'stuff' for internal operation of velocity.
+ * class to encapsulate the 'stuff' for internal operation of velocity.
* We use the context as a thread-safe storage : we take advantage of the
- * fact that it's a visitor of sorts to all nodes (that matter) of the
+ * fact that it's a visitor of sorts to all nodes (that matter) of the
* AST during init() and render().
* Currently, it carries the template name for namespace
* support, as well as node-local context data introspection caching.
@@ -51,7 +51,7 @@
* cache for node/context specific introspection information
*/
private HashMap introspectionCache = new HashMap(33);
-
+
/**
* Template name stack. The stack top contains the current template name.
*/
@@ -92,7 +92,7 @@
templateNameStack.pop();
return;
}
-
+
/**
* get the current template name
*
@@ -127,12 +127,12 @@
{
return ( IntrospectionCacheData ) introspectionCache.get( key );
}
-
+
/**
* places an IntrospectionCache Data (@see IntrospectionCacheData)
* element in the cache for specified key
*
- * @param key key
+ * @param key key
* @param o IntrospectionCacheData object to place in cache
*/
public void icachePut( Object key, IntrospectionCacheData o )
@@ -182,7 +182,7 @@
EventCartridge temp = eventCartridge;
eventCartridge = ec;
-
+
return temp;
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalEventContext.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalEventContext.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalEventContext.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalEventContext.java Tue Sep 19 14:00:14 2006
@@ -1,5 +1,3 @@
-
-
package org.apache.velocity.context;
/*
@@ -22,7 +20,7 @@
/**
* Interface for event support. Note that this is a public internal
- * interface, as it is something that will be accessed from outside
+ * interface, as it is something that will be accessed from outside
* of the .context package.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalHousekeepingContext.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalHousekeepingContext.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalHousekeepingContext.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalHousekeepingContext.java Tue Sep 19 14:00:14 2006
@@ -21,9 +21,9 @@
import org.apache.velocity.runtime.resource.Resource;
/**
- * interface to encapsulate the 'stuff' for internal operation of velocity.
+ * interface to encapsulate the 'stuff' for internal operation of velocity.
* We use the context as a thread-safe storage : we take advantage of the
- * fact that it's a visitor of sorts to all nodes (that matter) of the
+ * fact that it's a visitor of sorts to all nodes (that matter) of the
* AST during init() and render().
*
* Currently, it carries the template name for namespace
@@ -46,7 +46,7 @@
* remove the current template name from stack
*/
void popCurrentTemplateName();
-
+
/**
* get the current template name
*
@@ -69,12 +69,12 @@
* @return cache object
*/
IntrospectionCacheData icacheGet( Object key );
-
+
/**
* places an IntrospectionCache Data (@see IntrospectionCacheData)
* element in the cache for specified key
*
- * @param key key
+ * @param key key
* @param o IntrospectionCacheData object to place in cache
*/
void icachePut( Object key, IntrospectionCacheData o );
@@ -82,18 +82,18 @@
/**
* temporary fix to enable #include() to figure out
* current encoding.
- *
+ *
* @return The current resource.
*/
Resource getCurrentResource();
-
-
+
+
/**
* @param r
*/
void setCurrentResource( Resource r );
-
-
+
+
/**
* Checks to see if rendering should be allowed. Defaults to true but will
* return false after a #stop directive.
@@ -105,7 +105,7 @@
/**
* Set whether rendering is allowed. Defaults to true but is set to
* false after a #stop directive.
- * @param v
+ * @param v
*/
void setAllowRendering(boolean v);
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java Tue Sep 19 14:00:14 2006
@@ -18,9 +18,9 @@
/**
* interface for internal context wrapping functionality
- *
+ *
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id$
+ * @version $Id$
*/
public interface InternalWrapperContext
{
@@ -33,7 +33,7 @@
/**
* Returns the base full context impl.
* @return The base full context impl.
- *
+ *
*/
- InternalContextAdapter getBaseContext();
+ InternalContextAdapter getBaseContext();
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/VMContext.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/VMContext.java?view=diff&rev=447969&r1=447968&r2=447969
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/VMContext.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/VMContext.java Tue Sep 19 14:00:14 2006
@@ -36,9 +36,9 @@
* Further, this context also supports the 'VM local context' mode, where
* any get() or put() of references that aren't args to the VM are considered
* local to the vm, protecting the global context.
- *
+ *
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id$
+ * @version $Id$
*/
public class VMContext implements InternalContextAdapter
{
@@ -59,8 +59,8 @@
/**
* CTOR, wraps an ICA
- * @param inner
- * @param rsvc
+ * @param inner
+ * @param rsvc
*/
public VMContext( InternalContextAdapter inner, RuntimeServices rsvc )
{
@@ -94,8 +94,8 @@
* be modified w/o damaging the VMProxyArg, and leaving the
* dynamic ones, as they modify context rather than their own
* state
- * @param vmpa VMProxyArg to add
- * @throws MethodInvocationException
+ * @param vmpa VMProxyArg to add
+ * @throws MethodInvocationException
*/
public void addVMProxyArg( VMProxyArg vmpa ) throws MethodInvocationException
{
@@ -117,7 +117,7 @@
}
/**
- * Impl of the Context.put() method.
+ * Impl of the Context.put() method.
*
* @param key name of item to set
* @param value object to set to key
@@ -140,7 +140,7 @@
if(localcontextscope)
{
/*
- * if we have localcontextscope mode, then just
+ * if we have localcontextscope mode, then just
* put in the local context
*/
@@ -151,7 +151,7 @@
/*
* ok, how about the local context?
*/
-
+
if (localcontext.containsKey( key ))
{
return localcontext.put( key, value);
@@ -162,28 +162,28 @@
* otherwise, let them push it into the 'global' context
*/
- return innerContext.put( key, value );
+ return innerContext.put( key, value );
}
}
}
}
/**
- * Impl of the Context.gut() method.
+ * Impl of the Context.gut() method.
*
* @param key name of item to get
* @return stored object or null
*/
- public Object get( String key )
+ public Object get( String key )
{
/*
* first, see if it's a VMPA
*/
-
+
Object o = null;
-
+
VMProxyArg vmpa = (VMProxyArg) vmproxyhash.get( key );
-
+
if( vmpa != null )
{
o = vmpa.getObject( wrappedContext );
@@ -193,7 +193,7 @@
if(localcontextscope)
{
/*
- * if we have localcontextscope mode, then just
+ * if we have localcontextscope mode, then just
* put in the local context
*/
@@ -204,9 +204,9 @@
/*
* try the local context
*/
-
+
o = localcontext.get( key );
-
+
if ( o == null)
{
/*
@@ -217,10 +217,10 @@
}
}
}
-
+
return o;
}
-
+
/**
* @see org.apache.velocity.context.Context#containsKey(java.lang.Object)
*/
@@ -228,7 +228,7 @@
{
return false;
}
-
+
/**
* @see org.apache.velocity.context.Context#getKeys()
*/
@@ -260,7 +260,7 @@
{
innerContext.popCurrentTemplateName();
}
-
+
/**
* @see org.apache.velocity.context.InternalHousekeepingContext#getCurrentTemplateName()
*/
@@ -284,7 +284,7 @@
{
return innerContext.icacheGet( key );
}
-
+
/**
* @see org.apache.velocity.context.InternalHousekeepingContext#icachePut(java.lang.Object, org.apache.velocity.util.introspection.IntrospectionCacheData)
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org