You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by wg...@apache.org on 2005/01/08 07:13:35 UTC
svn commit: r124633 - in jakarta/velocity/trunk/src/java/org/apache/velocity/runtime: parser/node resource/loader
Author: wglass
Date: Fri Jan 7 22:13:34 2005
New Revision: 124633
URL: http://svn.apache.org/viewcvs?view=rev&rev=124633
Log:
moved brackets to be in conformance with coding guidelines
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java (contents, props changed)
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java Fri Jan 7 22:13:34 2005
@@ -82,8 +82,10 @@
{
if (context.getAllowRendering())
- writer.write(carr);
-
+ {
+ writer.write(carr);
+ }
+
return true;
}
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java Fri Jan 7 22:13:34 2005
@@ -118,9 +118,9 @@
else
{
if (context.getAllowRendering()) {
- writer.write( "#");
- writer.write( directiveName );
- }
+ writer.write( "#");
+ writer.write( directiveName );
+ }
}
return true;
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java Fri Jan 7 22:13:34 2005
@@ -64,7 +64,7 @@
throws IOException
{
if (context.getAllowRendering()) {
- writer.write(ctext);
+ writer.write(ctext);
}
return true;
}
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java Fri Jan 7 22:13:34 2005
@@ -54,8 +54,9 @@
public boolean render(InternalContextAdapter context, Writer writer)
throws IOException
{
- if (context.getAllowRendering()) {
- writer.write(getFirstToken().image);
+ if (context.getAllowRendering())
+ {
+ writer.write(getFirstToken().image);
}
return true;
}
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java Fri Jan 7 22:13:34 2005
@@ -213,8 +213,9 @@
if (referenceType == RUNT)
{
- if (context.getAllowRendering()) {
- writer.write(rootString);
+ if (context.getAllowRendering())
+ {
+ writer.write(rootString);
}
return true;
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java Fri Jan 7 22:13:34 2005
@@ -33,7 +33,7 @@
* what controls the generation of this class.
*
* @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
- * @version $Id: ASTStop.java,v 1.10 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTStop extends SimpleNode
{
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java Fri Jan 7 22:13:34 2005
@@ -58,8 +58,9 @@
public boolean render( InternalContextAdapter context, Writer writer)
throws IOException
{
- if (context.getAllowRendering()) {
- writer.write(ctext);
+ if (context.getAllowRendering())
+ {
+ writer.write(ctext);
}
return true;
}
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java Fri Jan 7 22:13:34 2005
@@ -118,10 +118,13 @@
{
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
- if (classLoader == null) {
+ if (classLoader == null)
+ {
classLoader = this.getClass().getClassLoader();
result = classLoader.getResourceAsStream( name );
- } else {
+ }
+ else
+ {
result= classLoader.getResourceAsStream( name );
/**
@@ -129,7 +132,8 @@
* old method when resource is not found.
*/
- if (result == null) {
+ if (result == null)
+ {
classLoader = this.getClass().getClassLoader();
result = classLoader.getResourceAsStream( name );
}
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?view=diff&rev=124633&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java&r1=124632&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java&r2=124633
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java Fri Jan 7 22:13:34 2005
@@ -138,13 +138,15 @@
templateColumn = configuration.getString("resource.templatecolumn");
timestampColumn = configuration.getString("resource.timestampcolumn");
- if (dataSource != null) {
+ if (dataSource != null)
+ {
rsvc.info("Resources Loaded using dataSource instance with table: " + tableName);
rsvc.info("Resource Loader using columns: " + keyColumn + ", "
+ templateColumn + " and " + timestampColumn);
rsvc.info("Resource Loader Initalized.");
- } else if (dataSourceName != null) {
+ } else if (dataSourceName != null)
+ {
rsvc.info("Resources Loaded From: " + dataSourceName + "/" + tableName);
rsvc.info("Resource Loader using columns: " + keyColumn + ", "
+ templateColumn + " and " + timestampColumn);
@@ -161,7 +163,8 @@
* specifying the data source name via properties.
* @param source
*/
- public void setDataSource(DataSource source) {
+ public void setDataSource(DataSource source)
+ {
dataSource = source;
}
@@ -204,9 +207,12 @@
if (rs.next())
{
InputStream ascStream = rs.getAsciiStream(templateColumn);
- if (ascStream != null)
+ if (ascStream != null)
+ {
return new BufferedInputStream(ascStream);
- else {
+ }
+ else
+ {
String msg = "DataSourceResourceLoader Error: cannot find resource "
+ name;
rsvc.error(msg);
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org