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 16:41:04 UTC
svn commit: r124657 - in jakarta/velocity/trunk/src/java/org/apache/velocity: runtime/parser/node runtime/resource runtime/resource/loader test texen
Author: wglass
Date: Sat Jan 8 07:41:02 2005
New Revision: 124657
URL: http://svn.apache.org/viewcvs?view=rev&rev=124657
Log:
Fixed brackets to be in accordance with coding style guidelines
Modified:
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/ASTReference.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
jakarta/velocity/trunk/src/java/org/apache/velocity/test/ResourceLoaderInstanceTest.java (contents, props changed)
jakarta/velocity/trunk/src/java/org/apache/velocity/texen/Generator.java
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=124657&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java&r1=124656&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java&r2=124657
==============================================================================
--- 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 Sat Jan 8 07:41:02 2005
@@ -117,7 +117,8 @@
}
else
{
- if (context.getAllowRendering()) {
+ if (context.getAllowRendering())
+ {
writer.write( "#");
writer.write( directiveName );
}
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=124657&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java&r1=124656&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java&r2=124657
==============================================================================
--- 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 Sat Jan 8 07:41:02 2005
@@ -63,7 +63,8 @@
public boolean render( InternalContextAdapter context, Writer writer)
throws IOException
{
- if (context.getAllowRendering()) {
+ if (context.getAllowRendering())
+ {
writer.write(ctext);
}
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=124657&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java&r1=124656&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java&r2=124657
==============================================================================
--- 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 Sat Jan 8 07:41:02 2005
@@ -233,7 +233,8 @@
{
if (value == null)
{
- if (context.getAllowRendering()) {
+ if (context.getAllowRendering())
+ {
writer.write(escPrefix);
writer.write("\\");
writer.write(nullString);
@@ -241,7 +242,8 @@
}
else
{
- if (context.getAllowRendering()) {
+ if (context.getAllowRendering())
+ {
writer.write(escPrefix);
writer.write(nullString);
}
@@ -273,7 +275,8 @@
* write prefix twice, because it's schmoo, so the \ don't escape each other...
*/
- if (context.getAllowRendering()) {
+ if (context.getAllowRendering())
+ {
writer.write(escPrefix);
writer.write(escPrefix);
writer.write(morePrefix);
@@ -296,7 +299,8 @@
* non-null processing
*/
- if (context.getAllowRendering()) {
+ if (context.getAllowRendering())
+ {
writer.write(escPrefix);
writer.write(morePrefix);
writer.write(value.toString());
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?view=diff&rev=124657&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java&r1=124656&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java&r2=124657
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java Sat Jan 8 07:41:02 2005
@@ -133,10 +133,14 @@
+ " This is a critical value. Please adjust configuration.");
continue;
- } else if ( loaderInstance != null ) {
+ }
+ else if ( loaderInstance != null )
+ {
resourceLoader = loaderInstance;
- } else {
+ }
+ else
+ {
resourceLoader = ResourceLoaderFactory.getLoader( rsvc, loaderClass);
}
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=124657&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java&r1=124656&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java&r2=124657
==============================================================================
--- 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 Sat Jan 8 07:41:02 2005
@@ -145,14 +145,17 @@
+ 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);
rsvc.info("Resource Loader Initalized.");
- } else {
+ }
+ else
+ {
rsvc.info("DataSourceResourceLoader not properly initialized. ");
}
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/test/ResourceLoaderInstanceTest.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/test/ResourceLoaderInstanceTest.java?view=diff&rev=124657&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/test/ResourceLoaderInstanceTest.java&r1=124656&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/test/ResourceLoaderInstanceTest.java&r2=124657
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/test/ResourceLoaderInstanceTest.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/test/ResourceLoaderInstanceTest.java Sat Jan 8 07:41:02 2005
@@ -32,7 +32,7 @@
* Test that an instance of a ResourceLoader can be successfully passed in.
*
* @author <a href="mailto:wglass@apache.org">Will Glass-Husain</a>
- * @version $Id: MultipleFileResourcePathTest.java,v 1.10 2004/03/19 17:13:38 dlr Exp $
+ * @version $Id$
*/
public class ResourceLoaderInstanceTest extends BaseTestCase
{
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/texen/Generator.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/texen/Generator.java?view=diff&rev=124657&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/texen/Generator.java&r1=124656&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/texen/Generator.java&r2=124657
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/texen/Generator.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/texen/Generator.java Sat Jan 8 07:41:02 2005
@@ -278,7 +278,8 @@
if (encoding == null || encoding.length() == 0 || encoding.equals("8859-1") || encoding.equals("8859_1")) {
writer = new FileWriter(path);
}
- else {
+ else
+ {
writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(path), encoding));
}
return writer;
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org