Author: henning
Date: Tue Sep 19 15:03:40 2006
New Revision: 447993
URL: http://svn.apache.org/viewvc?view=rev&rev=447993
Log:
minor fixes suggested by PMD. Typos fixed.
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/anakia/Escape.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/context/InternalContextBase.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Include.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java
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=447993&r1=447992&r2=447993
==============================================================================
---
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 15:03:40 2006
@@ -73,7 +73,8 @@
stEntity = LINE_SEPARATOR;
break;
default :
- /* no-op */ ;
+ /* no-op */
+ break;
}
if (stEntity != null)
{
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=447993&r1=447992&r2=447993
==============================================================================
---
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 15:03:40 2006
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.lang.Class;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.HashMap;
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=447993&r1=447992&r2=447993
==============================================================================
---
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 15:03:40 2006
@@ -81,7 +81,6 @@
public void pushCurrentTemplateName( String s )
{
templateNameStack.push(s);
- return;
}
/**
@@ -90,7 +89,6 @@
public void popCurrentTemplateName()
{
templateNameStack.pop();
- return;
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
Tue Sep 19 15:03:40 2006
@@ -312,8 +312,6 @@
trace("Velocimacro : initialization complete.");
}
-
- return;
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Include.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Include.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Include.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Include.java
Tue Sep 19 15:03:40 2006
@@ -274,6 +274,5 @@
writer.write(msg);
writer.write(outputMsgEnd);
}
- return;
}
}
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
Tue Sep 19 15:03:40 2006
@@ -107,8 +107,6 @@
* block to hang off of this but we don't want to
* init it... it's useless...
*/
-
- return;
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
Tue Sep 19 15:03:40 2006
@@ -260,7 +260,6 @@
*/
setupMacro( callingArgs, callingArgTypes );
- return;
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
Tue Sep 19 15:03:40 2006
@@ -151,7 +151,6 @@
public void setDirectiveName( String str )
{
directiveName = str;
- return;
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Tue Sep 19 15:03:40 2006
@@ -154,7 +154,7 @@
+ timestampColumn + "\"");
}
- log.trace("DataSourceResourceLoader initalized.");
+ log.trace("DataSourceResourceLoader initialized.");
}
else if (dataSourceName != null)
{
@@ -167,7 +167,7 @@
+ timestampColumn + "\"");
}
- log.trace("DataSourceResourceLoader initalized.");
+ log.trace("DataSourceResourceLoader initialized.");
}
else
{
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
Tue Sep 19 15:03:40 2006
@@ -24,7 +24,6 @@
import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader;
/**
* This is a simple URL-based loader.
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
Tue Sep 19 15:03:40 2006
@@ -406,7 +406,6 @@
*/
protected void requestCleanup( HttpServletRequest request,
HttpServletResponse response, Context context )
{
- return;
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java?view=diff&rev=447993&r1=447992&r2=447993
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java
Tue Sep 19 15:03:40 2006
@@ -63,8 +63,6 @@
}
l.add(method);
-
- return;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
