You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by dl...@apache.org on 2002/10/10 18:30:55 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/directive Include.java
dlr 2002/10/10 09:30:54
Modified: src/java/org/apache/velocity/runtime/directive Include.java
Log:
Broke long lines -- nothing to see here, move along.
Revision Changes Path
1.24 +20 -12 jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Include.java
Index: Include.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Include.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -u -r1.23 -r1.24
--- Include.java 22 Oct 2001 03:53:24 -0000 1.23
+++ Include.java 10 Oct 2002 16:30:54 -0000 1.24
@@ -129,7 +129,8 @@
* simple init - init the tree and get the elementKey from
* the AST
*/
- public void init( RuntimeServices rs, InternalContextAdapter context, Node node)
+ public void init(RuntimeServices rs, InternalContextAdapter context,
+ Node node)
throws Exception
{
super.init( rs, context, node );
@@ -152,7 +153,8 @@
*/
public boolean render(InternalContextAdapter context,
Writer writer, Node node)
- throws IOException, MethodInvocationException, ResourceNotFoundException
+ throws IOException, MethodInvocationException,
+ ResourceNotFoundException
{
/*
* get our arguments and check them
@@ -197,7 +199,8 @@
*/
private boolean renderOutput( Node node, InternalContextAdapter context,
Writer writer )
- throws IOException, MethodInvocationException, ResourceNotFoundException
+ throws IOException, MethodInvocationException,
+ ResourceNotFoundException
{
String arg = "";
@@ -229,8 +232,9 @@
try
{
/*
- * get the resource, and assume that we use the encoding of the current template
- * the 'current resource' can be null if we are processing a stream....
+ * get the resource, and assume that we use the encoding
+ * of the current template the 'current resource' can be
+ * null if we are processing a stream....
*/
String encoding = null;
@@ -241,7 +245,8 @@
}
else
{
- encoding = (String) rsvc.getProperty( RuntimeConstants.INPUT_ENCODING);
+ encoding =
+ (String) rsvc.getProperty(RuntimeConstants.INPUT_ENCODING);
}
resource = rsvc.getContent(arg, encoding);
@@ -252,16 +257,19 @@
* the arg wasn't found. Note it and throw
*/
- rsvc.error("#include(): cannot find resource '" + arg + "', called from template "
- + context.getCurrentTemplateName() + " at (" + getLine() + ", " + getColumn() + ")" );
+ rsvc.error("#include(): cannot find resource '" + arg +
+ "', called from template " +
+ context.getCurrentTemplateName() + " at (" +
+ getLine() + ", " + getColumn() + ")" );
throw rnfe;
}
catch (Exception e)
{
- rsvc.error("#include(): arg = '" + arg + "', called from template "
- + context.getCurrentTemplateName() + " at (" + getLine() + ", " + getColumn()
- + ") : " + e);
+ rsvc.error("#include(): arg = '" + arg +
+ "', called from template " +
+ context.getCurrentTemplateName() + " at (" +
+ getLine() + ", " + getColumn() + ") : " + e);
}
if ( resource == null )
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>