Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,15 @@ package org.apache.velocity.runtime.reso * under the License. */ +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.RuntimeServices; + import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Map.Entry; - -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.RuntimeServices; import java.util.concurrent.ConcurrentHashMap; /**
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManager.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManager.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManager.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManager.java Sun Jul 17 23:33:09 2016 @@ -19,10 +19,9 @@ package org.apache.velocity.runtime.reso * under the License. */ -import org.apache.velocity.runtime.RuntimeServices; - -import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.runtime.RuntimeServices; /** * Class to manage the text resource for the Velocity Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java Sun Jul 17 23:33:09 2016 @@ -19,13 +19,6 @@ package org.apache.velocity.runtime.reso * under the License. */ -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Vector; - -import org.slf4j.Logger; - import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; @@ -36,6 +29,12 @@ import org.apache.velocity.runtime.resou import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.ExtProperties; import org.apache.velocity.util.StringUtils; +import org.slf4j.Logger; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,16 +19,16 @@ package org.apache.velocity.runtime.reso * under the License. */ -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; - import org.apache.commons.lang3.StringUtils; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.ExtProperties; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; + /** * ClasspathResourceLoader is a simple loader that will load * templates from the classpath. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,6 +19,15 @@ package org.apache.velocity.runtime.reso * under the License. */ +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.runtime.resource.Resource; +import org.apache.velocity.util.ExtProperties; +import org.apache.velocity.util.StringUtils; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.sql.DataSource; import java.io.IOException; import java.io.InputStream; import java.io.Reader; @@ -28,16 +37,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.resource.Resource; -import org.apache.velocity.util.ExtProperties; -import org.apache.velocity.util.StringUtils; - /** * <P>This is a simple template file loader that loads templates * from a DataSource instead of plain files. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,6 +19,12 @@ package org.apache.velocity.runtime.reso * under the License. */ +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.runtime.resource.Resource; +import org.apache.velocity.util.ExtProperties; +import org.apache.velocity.util.StringUtils; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -31,13 +37,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.io.UnicodeInputStream; -import org.apache.velocity.runtime.resource.Resource; -import org.apache.velocity.util.ExtProperties; -import org.apache.velocity.util.StringUtils; - /** * A loader for templates stored on the file system. Treats the template * as relative to the configured root path. If the root path is empty Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.runtime.reso * under the License. */ +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.runtime.RuntimeServices; +import org.slf4j.Logger; + import java.io.IOException; import java.io.InputStream; import java.net.JarURLConnection; import java.net.URL; import java.util.Enumeration; +import java.util.Hashtable; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import java.util.Hashtable; - -import org.slf4j.Logger; - -import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.exception.VelocityException; /** * A small wrapper around a Jar Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.runtime.reso * under the License. */ +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.runtime.resource.Resource; +import org.apache.velocity.util.ExtProperties; +import org.apache.velocity.util.StringUtils; + import java.io.IOException; import java.io.InputStream; - import java.io.Reader; +import java.util.HashMap; import java.util.Hashtable; -import java.util.Vector; import java.util.Map; -import java.util.HashMap; - -import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.util.StringUtils; -import org.apache.velocity.runtime.resource.Resource; -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.util.ExtProperties; +import java.util.Vector; /** * <p> Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,23 +19,15 @@ package org.apache.velocity.runtime.reso * under the License. */ -import java.io.InputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.UnsupportedEncodingException; - -import org.apache.velocity.io.UnicodeInputStream; -import org.apache.velocity.runtime.RuntimeConstants; -import org.slf4j.Logger; - -import org.apache.velocity.runtime.RuntimeServices; -import org.apache.velocity.runtime.resource.Resource; -import org.apache.velocity.runtime.resource.ResourceCacheImpl; +import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.ExtProperties; -import org.apache.commons.collections.ExtendedProperties; + +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; /** * This is abstract class the all text resource loaders should Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,26 +19,26 @@ package org.apache.velocity.runtime.reso * under the License. */ -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.io.Reader; -import java.io.UnsupportedEncodingException; - +import org.apache.commons.lang3.StringUtils; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.util.StringResource; import org.apache.velocity.runtime.resource.util.StringResourceRepository; import org.apache.velocity.runtime.resource.util.StringResourceRepositoryImpl; -import org.apache.commons.lang3.StringUtils; import org.apache.velocity.util.ClassUtils; import org.apache.velocity.util.ExtProperties; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + /** * Resource loader that works with Strings. Users should manually add * resources to the repository that is used by the resource loader instance. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,18 +19,19 @@ package org.apache.velocity.runtime.reso * under the License. */ -import java.io.InputStream; +import org.apache.commons.lang3.StringUtils; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.runtime.resource.Resource; +import org.apache.velocity.util.ExtProperties; + import java.io.IOException; +import java.io.InputStream; import java.io.Reader; import java.lang.reflect.Method; import java.net.URL; import java.net.URLConnection; import java.util.HashMap; -import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.runtime.resource.Resource; -import org.apache.velocity.util.ExtProperties; -import org.apache.commons.lang3.StringUtils; /** * This is a simple URL-based loader. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java Sun Jul 17 23:33:09 2016 @@ -19,10 +19,11 @@ package org.apache.velocity.runtime.reso * under the License. */ +import org.apache.velocity.runtime.resource.loader.StringResourceLoader; + import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.velocity.runtime.resource.loader.StringResourceLoader; /** * Default implementation of StringResourceRepository. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java Sun Jul 17 23:33:09 2016 @@ -19,51 +19,10 @@ package org.apache.velocity.runtime.visi * under the License. */ -import java.io.Writer; - import org.apache.velocity.context.InternalContextAdapter; -import org.apache.velocity.runtime.directive.Stop; -import org.apache.velocity.runtime.parser.node.ASTAddNode; -import org.apache.velocity.runtime.parser.node.ASTAndNode; -import org.apache.velocity.runtime.parser.node.ASTAssignment; -import org.apache.velocity.runtime.parser.node.ASTBlock; -import org.apache.velocity.runtime.parser.node.ASTComment; -import org.apache.velocity.runtime.parser.node.ASTDirective; -import org.apache.velocity.runtime.parser.node.ASTDivNode; -import org.apache.velocity.runtime.parser.node.ASTEQNode; -import org.apache.velocity.runtime.parser.node.ASTElseIfStatement; -import org.apache.velocity.runtime.parser.node.ASTElseStatement; -import org.apache.velocity.runtime.parser.node.ASTEscape; -import org.apache.velocity.runtime.parser.node.ASTEscapedDirective; -import org.apache.velocity.runtime.parser.node.ASTExpression; -import org.apache.velocity.runtime.parser.node.ASTFalse; -import org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral; -import org.apache.velocity.runtime.parser.node.ASTGENode; -import org.apache.velocity.runtime.parser.node.ASTGTNode; -import org.apache.velocity.runtime.parser.node.ASTIdentifier; -import org.apache.velocity.runtime.parser.node.ASTIfStatement; -import org.apache.velocity.runtime.parser.node.ASTIntegerLiteral; -import org.apache.velocity.runtime.parser.node.ASTIntegerRange; -import org.apache.velocity.runtime.parser.node.ASTLENode; -import org.apache.velocity.runtime.parser.node.ASTLTNode; -import org.apache.velocity.runtime.parser.node.ASTMap; -import org.apache.velocity.runtime.parser.node.ASTMethod; -import org.apache.velocity.runtime.parser.node.ASTModNode; -import org.apache.velocity.runtime.parser.node.ASTMulNode; -import org.apache.velocity.runtime.parser.node.ASTNENode; -import org.apache.velocity.runtime.parser.node.ASTNotNode; -import org.apache.velocity.runtime.parser.node.ASTObjectArray; -import org.apache.velocity.runtime.parser.node.ASTOrNode; -import org.apache.velocity.runtime.parser.node.ASTReference; -import org.apache.velocity.runtime.parser.node.ASTSetDirective; -import org.apache.velocity.runtime.parser.node.ASTStringLiteral; -import org.apache.velocity.runtime.parser.node.ASTSubtractNode; -import org.apache.velocity.runtime.parser.node.ASTText; -import org.apache.velocity.runtime.parser.node.ASTTrue; -import org.apache.velocity.runtime.parser.node.ASTWord; -import org.apache.velocity.runtime.parser.node.ASTprocess; -import org.apache.velocity.runtime.parser.node.ParserVisitor; -import org.apache.velocity.runtime.parser.node.SimpleNode; +import org.apache.velocity.runtime.parser.node.*; + +import java.io.Writer; /** * This is the base class for all visitors. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java Sun Jul 17 23:33:09 2016 @@ -19,48 +19,8 @@ package org.apache.velocity.runtime.visi * under the License. */ -import org.apache.velocity.runtime.directive.Stop; import org.apache.velocity.runtime.parser.Token; -import org.apache.velocity.runtime.parser.node.ASTAddNode; -import org.apache.velocity.runtime.parser.node.ASTAndNode; -import org.apache.velocity.runtime.parser.node.ASTAssignment; -import org.apache.velocity.runtime.parser.node.ASTBlock; -import org.apache.velocity.runtime.parser.node.ASTDirective; -import org.apache.velocity.runtime.parser.node.ASTDivNode; -import org.apache.velocity.runtime.parser.node.ASTEQNode; -import org.apache.velocity.runtime.parser.node.ASTElseIfStatement; -import org.apache.velocity.runtime.parser.node.ASTElseStatement; -import org.apache.velocity.runtime.parser.node.ASTEscape; -import org.apache.velocity.runtime.parser.node.ASTEscapedDirective; -import org.apache.velocity.runtime.parser.node.ASTExpression; -import org.apache.velocity.runtime.parser.node.ASTFalse; -import org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral; -import org.apache.velocity.runtime.parser.node.ASTGENode; -import org.apache.velocity.runtime.parser.node.ASTGTNode; -import org.apache.velocity.runtime.parser.node.ASTIdentifier; -import org.apache.velocity.runtime.parser.node.ASTIfStatement; -import org.apache.velocity.runtime.parser.node.ASTIntegerLiteral; -import org.apache.velocity.runtime.parser.node.ASTIntegerRange; -import org.apache.velocity.runtime.parser.node.ASTLENode; -import org.apache.velocity.runtime.parser.node.ASTLTNode; -import org.apache.velocity.runtime.parser.node.ASTMap; -import org.apache.velocity.runtime.parser.node.ASTMethod; -import org.apache.velocity.runtime.parser.node.ASTModNode; -import org.apache.velocity.runtime.parser.node.ASTMulNode; -import org.apache.velocity.runtime.parser.node.ASTNENode; -import org.apache.velocity.runtime.parser.node.ASTNotNode; -import org.apache.velocity.runtime.parser.node.ASTObjectArray; -import org.apache.velocity.runtime.parser.node.ASTOrNode; -import org.apache.velocity.runtime.parser.node.ASTReference; -import org.apache.velocity.runtime.parser.node.ASTSetDirective; -import org.apache.velocity.runtime.parser.node.ASTStringLiteral; -import org.apache.velocity.runtime.parser.node.ASTSubtractNode; -import org.apache.velocity.runtime.parser.node.ASTText; -import org.apache.velocity.runtime.parser.node.ASTTrue; -import org.apache.velocity.runtime.parser.node.ASTWord; -import org.apache.velocity.runtime.parser.node.ASTprocess; -import org.apache.velocity.runtime.parser.node.Node; -import org.apache.velocity.runtime.parser.node.SimpleNode; +import org.apache.velocity.runtime.parser.node.*; /** * This class is simply a visitor implementation Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ArrayIterator.java Sun Jul 17 23:33:09 2016 @@ -19,9 +19,9 @@ package org.apache.velocity.util; * under the License. */ +import java.lang.reflect.Array; import java.util.Iterator; import java.util.NoSuchElementException; -import java.lang.reflect.Array; /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ClassUtils.java Sun Jul 17 23:33:09 2016 @@ -19,17 +19,17 @@ package org.apache.velocity.util; * under the License. */ -import java.io.InputStream; - import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.runtime.parser.node.SimpleNode; import org.apache.velocity.runtime.parser.node.ASTMethod.MethodCacheKey; +import org.apache.velocity.runtime.parser.node.SimpleNode; import org.apache.velocity.util.introspection.Info; import org.apache.velocity.util.introspection.IntrospectionCacheData; import org.apache.velocity.util.introspection.VelMethod; +import java.io.InputStream; + /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/DuckType.java Sun Jul 17 23:33:09 2016 @@ -23,8 +23,8 @@ import java.lang.reflect.Array; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.math.BigDecimal; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * Support for getAs<Type>() convention for rendering (String), evaluating (Boolean) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/EnumerationIterator.java Sun Jul 17 23:33:09 2016 @@ -19,8 +19,8 @@ package org.apache.velocity.util; * under the License. */ -import java.util.Iterator; import java.util.Enumeration; +import java.util.Iterator; /** * An Iterator wrapper for an Enumeration. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java Sun Jul 17 23:33:09 2016 @@ -19,6 +19,10 @@ package org.apache.velocity.util; * under the License. */ +import org.apache.velocity.runtime.directive.Directive; +import org.apache.velocity.runtime.parser.node.Node; +import org.apache.velocity.util.introspection.Info; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileReader; @@ -29,10 +33,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.velocity.runtime.directive.Directive; -import org.apache.velocity.runtime.parser.node.Node; -import org.apache.velocity.util.introspection.Info; - /** * This class provides some methods for dynamically * invoking methods in objects, and some string Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java Sun Jul 17 23:33:09 2016 @@ -20,13 +20,13 @@ package org.apache.velocity.util.introsp */ +import org.slf4j.Logger; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; - /** * A cache of introspection information for a specific class instance. * Keys {@link java.lang.reflect.Field} objects by the field names. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java Sun Jul 17 23:33:09 2016 @@ -19,14 +19,14 @@ package org.apache.velocity.util.introsp * under the License. */ +import org.slf4j.Logger; + import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; - /** * A cache of introspection information for a specific class instance. * Keys {@link java.lang.reflect.Method} objects by a concatenation of the Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Introspector.java Sun Jul 17 23:33:09 2016 @@ -19,10 +19,10 @@ package org.apache.velocity.util.introsp * under the License. */ -import java.lang.reflect.Method; - import org.slf4j.Logger; +import java.lang.reflect.Method; + /** * This basic function of this class is to return a Method * object for a particular class given the name of a method Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorBase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,11 @@ package org.apache.velocity.util.introsp * under the License. */ +import org.slf4j.Logger; + import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.slf4j.Logger; - /** * Lookup a a Method object for a particular class given the name of a method * and its parameters. Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCacheImpl.java Sun Jul 17 23:33:09 2016 @@ -19,13 +19,13 @@ package org.apache.velocity.util.introsp * under the License. */ +import org.slf4j.Logger; + import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; - /** * This is the internal introspector cache implementation. * Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java Sun Jul 17 23:33:09 2016 @@ -19,10 +19,10 @@ package org.apache.velocity.util.introsp * under the License. */ -import java.lang.reflect.Method; - import org.slf4j.Logger; +import java.lang.reflect.Method; + /** * <p>Prevent "dangerous" classloader/reflection related calls. Use this * introspector for situations in which template writers are numerous Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java Sun Jul 17 23:33:09 2016 @@ -19,12 +19,12 @@ package org.apache.velocity.util.introsp * under the License. */ -import java.util.Iterator; - import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.RuntimeServicesAware; +import java.util.Iterator; + /** * Use a custom introspector that prevents classloader related method * calls. Use this introspector for situations in which template Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java Sun Jul 17 23:33:09 2016 @@ -19,16 +19,6 @@ package org.apache.velocity.util.introsp * under the License. */ -import java.lang.reflect.Array; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Map; - -import org.slf4j.Logger; - import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.parser.node.AbstractExecutor; import org.apache.velocity.runtime.parser.node.BooleanPropertyExecutor; @@ -42,6 +32,14 @@ import org.apache.velocity.runtime.parse import org.apache.velocity.util.ArrayIterator; import org.apache.velocity.util.ArrayListWrapper; import org.apache.velocity.util.EnumerationIterator; +import org.slf4j.Logger; + +import java.lang.reflect.Array; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Map; /** * Implementation of Uberspect to provide the default introspective Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectPublicFields.java Sun Jul 17 23:33:09 2016 @@ -19,14 +19,13 @@ package org.apache.velocity.util.introspection; -import java.util.Iterator; - -import org.slf4j.Logger; - import org.apache.velocity.runtime.parser.node.PublicFieldExecutor; import org.apache.velocity.runtime.parser.node.SetPublicFieldExecutor; import org.apache.velocity.util.introspection.UberspectImpl.VelGetterImpl; import org.apache.velocity.util.introspection.UberspectImpl.VelSetterImpl; +import org.slf4j.Logger; + +import java.util.Iterator; /** * Implementation of Uberspect to additionally provide access to public fields. Modified: velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt Sun Jul 17 23:33:09 2016 @@ -79,6 +79,7 @@ package org.apache.velocity.runtime.pars import java.io.*; import java.util.*; +import org.apache.velocity.Template; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.parser.node.*; @@ -108,9 +109,9 @@ public class Parser private Map macroNames = new HashMap(); /** - * Name of current template we are parsing. Passed to us in parse() + * Current template we are parsing. Passed to us in parse() */ - public String currentTemplateName = ""; + public Template currentTemplate = null; /** * Set to true if the property @@ -163,12 +164,12 @@ public class Parser * method and re-initializing the lexer with * the new stream that we want parsed. */ - public SimpleNode parse( Reader reader, String templateName ) + public SimpleNode parse( Reader reader, Template template ) throws ParseException { SimpleNode sn = null; - currentTemplateName = templateName; + currentTemplate = template; try { @@ -196,14 +197,14 @@ public class Parser * thrown by the Macro class when something is amiss in the * Macro specification */ - rsvc.getLog().error("Parser Error: " + templateName, mee); + rsvc.getLog().error("Parser Error: " + template.getName(), mee); throw mee; } catch (ParseException pe) { - rsvc.getLog().error("Parser Exception: " + templateName, pe); + rsvc.getLog().error("Parser Exception: " + template.getName(), pe); throw new TemplateParseException (pe.currentToken, - pe.expectedTokenSequences, pe.tokenImage, currentTemplateName); + pe.expectedTokenSequences, pe.tokenImage, currentTemplate.getName()); } catch (TokenMgrError tme) { @@ -211,12 +212,12 @@ public class Parser } catch (Exception e) { - String msg = "Parser Error: " + templateName; + String msg = "Parser Error: " + template.getName(); rsvc.getLog().error(msg, e); throw new VelocityException(msg, e); } - currentTemplateName = ""; + currentTemplate = null; return sn; } @@ -268,7 +269,7 @@ public class Parser if (strictEscape || isDirective(dirTag) || macroNames.containsKey(dirTag) - || rsvc.isVelocimacro(dirTag, currentTemplateName)) + || rsvc.isVelocimacro(dirTag, currentTemplate)) { bRecognizedDirective = true; } @@ -1328,7 +1329,7 @@ void Escape() : {} if (strictEscape || isDirective(nTag) || macroNames.containsKey(nTag) - || rsvc.isVelocimacro(nTag, currentTemplateName)) + || rsvc.isVelocimacro(nTag, currentTemplate)) { control = true; } @@ -1511,7 +1512,7 @@ SimpleNode Directive() : /* * if null, then not a real directive, but maybe a Velocimacro */ - isVM = rsvc.isVelocimacro(directiveName, currentTemplateName); + isVM = rsvc.isVelocimacro(directiveName, currentTemplate); directiveType = Directive.LINE; } @@ -1554,7 +1555,7 @@ SimpleNode Directive() : if (isVM) { throw new MacroParseException("Invalid argument " - + (argPos+1) + " in macro call " + t.image, currentTemplateName, t); + + (argPos+1) + " in macro call " + t.image, currentTemplate.getName(), t); } } @@ -1566,7 +1567,7 @@ SimpleNode Directive() : { // We only allow line comments in macro definitions for now throw new MacroParseException("A Line comment is not allowed in " + t.image - + " arguments", currentTemplateName, t); + + " arguments", currentTemplate.getName(), t); } } @@ -1582,7 +1583,7 @@ SimpleNode Directive() : { if (d != null) { - d.checkArgs(argtypes, t, currentTemplateName); + d.checkArgs(argtypes, t, currentTemplate.getName()); } if (directiveType == Directive.LINE) @@ -1615,7 +1616,7 @@ SimpleNode Directive() : if (d != null) { - d.checkArgs(argtypes, t, currentTemplateName); + d.checkArgs(argtypes, t, currentTemplate.getName()); } /* Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/io/UnicodeInputStreamTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/io/UnicodeInputStreamTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/io/UnicodeInputStreamTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/io/UnicodeInputStreamTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,16 +19,15 @@ package org.apache.velocity.io; * under the License. */ -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.InputStreamReader; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.commons.lang3.ArrayUtils; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.io.InputStreamReader; + /** * Test the UnicodeInputStream. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,19 +19,18 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Test use of an absolute path with the FileResourceLoader * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArithmeticTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArithmeticTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArithmeticTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArithmeticTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,14 @@ package org.apache.velocity.test; * under the License. */ -import java.math.BigDecimal; -import java.math.BigInteger; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.velocity.runtime.parser.node.MathUtils; +import java.math.BigDecimal; +import java.math.BigInteger; + /** * Test arithmetic operations. Introduced after extending from Integer-only * to Number-handling. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java Sun Jul 17 23:33:09 2016 @@ -20,8 +20,8 @@ package org.apache.velocity.test; */ import java.lang.reflect.Array; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,10 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; - import junit.framework.TestCase; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -33,6 +29,10 @@ import org.apache.velocity.runtime.resou import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.StringUtils; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; + /** * Base test case that provides utility methods for * the rest of the tests. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,17 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; @@ -44,6 +35,14 @@ import org.apache.velocity.app.event.imp import org.apache.velocity.context.Context; import org.apache.velocity.runtime.RuntimeConstants; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; + /** * Tests the operation of the built in event handlers. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,21 +19,19 @@ package org.apache.velocity.test; * under the License. */ -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.StringWriter; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.commons.io.IOUtils; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.introspection.IntrospectorCacheImpl; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.StringWriter; + /** * Tests if we can hand Velocity an arbitrary class for logging. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Load templates from the Classpath. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommentsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommentsTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommentsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommentsTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,14 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; +import java.io.StringWriter; + /** * Test comments * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommonsExtPropTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommonsExtPropTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommonsExtPropTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/CommonsExtPropTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,14 +19,13 @@ package org.apache.velocity.test; * under the License. */ +import junit.framework.TestSuite; +import org.apache.commons.collections.ExtendedProperties; + import java.io.FileWriter; import java.util.Iterator; import java.util.Vector; -import junit.framework.TestSuite; - -import org.apache.commons.collections.ExtendedProperties; - /** * Tests for the Commons ExtendedProperties class. This is an identical Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,21 +19,20 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.Vector; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.Vector; + /** * Tests if we are context safe : can we switch objects in the context * and re-merge the template safely. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,19 +19,18 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Tests input encoding handling. The input target is UTF-8, having * chinese and and a spanish enyay (n-twiddle) Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,6 +19,14 @@ package org.apache.velocity.test; * under the License. */ +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.app.event.implement.EscapeHtmlReference; +import org.apache.velocity.context.Context; +import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.runtime.RuntimeConstants; + import java.io.BufferedWriter; import java.io.FileOutputStream; import java.io.OutputStreamWriter; @@ -27,13 +35,6 @@ import java.io.Writer; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.app.event.implement.EscapeHtmlReference; -import org.apache.velocity.context.Context; -import org.apache.velocity.exception.ParseErrorException; -import org.apache.velocity.runtime.RuntimeConstants; /** * Test #evaluate directive. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,10 +19,7 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; -import java.io.Writer; import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.app.event.EventCartridge; import org.apache.velocity.app.event.MethodExceptionEventHandler; import org.apache.velocity.app.event.ReferenceInsertionEventHandler; @@ -32,7 +29,6 @@ import org.apache.velocity.runtime.Runti import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.util.ContextAware; import org.apache.velocity.util.RuntimeServicesAware; -import org.apache.velocity.test.misc.TestLogger; /** * Tests event handling for all event handlers except IncludeEventHandler. This is tested Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExceptionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExceptionTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExceptionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExceptionTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; @@ -34,6 +31,8 @@ import org.apache.velocity.test.misc.Exc import org.apache.velocity.test.misc.ExceptionGeneratingResourceLoader; import org.apache.velocity.test.provider.TestProvider; +import java.io.StringWriter; + /** * Test case for miscellaneous Exception related issues. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,26 +19,22 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; - import junit.framework.Test; import junit.framework.TestSuite; - -import org.slf4j.Logger; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; + /** * Tests event handling for all event handlers when multiple event handlers are * assigned for each type. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ForeachTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ForeachTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ForeachTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ForeachTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,13 +19,13 @@ package org.apache.velocity.test; * under the License. */ +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.test.provider.ForeachMethodCallHelper; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.test.provider.ForeachMethodCallHelper; - /** * This class tests the Foreach loop. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/GetAsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/GetAsTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/GetAsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/GetAsTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,9 +19,9 @@ package org.apache.velocity.test; * under the License. */ -import org.apache.velocity.util.TemplateString; import org.apache.velocity.util.TemplateBoolean; import org.apache.velocity.util.TemplateNumber; +import org.apache.velocity.util.TemplateString; /** * Test objects with getAs<Type>() methods. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -31,7 +28,8 @@ import org.apache.velocity.app.VelocityE import org.apache.velocity.context.Context; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.test.TemplateTestBase; + +import java.io.StringWriter; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,14 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -38,6 +32,11 @@ import org.apache.velocity.runtime.Runti import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.RuntimeServicesAware; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Tests event handling * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,8 +19,9 @@ package org.apache.velocity.test; * under the License. */ -import java.util.ArrayList; import org.apache.velocity.runtime.RuntimeConstants; + +import java.util.ArrayList; /** * Test index syntax e.g, $foo[1] */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,18 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; -import org.apache.velocity.test.TemplateTestBase; import org.apache.velocity.test.misc.UberspectTestException; import org.apache.velocity.util.introspection.Info; +import java.io.StringWriter; + Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Tests if the VM template-locality is working. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,7 @@ package org.apache.velocity.test; * under the License. */ -import java.io.IOException; -import java.io.StringWriter; - import junit.framework.TestCase; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.exception.MethodInvocationException; @@ -31,6 +27,9 @@ import org.apache.velocity.exception.Par import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.util.introspection.IntrospectionCacheData; +import java.io.IOException; +import java.io.StringWriter; + /** * Checks that arrays are cached correctly in the Introspector. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector2TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,14 @@ package org.apache.velocity.test; * under the License. */ -import java.lang.reflect.Method; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; +import java.lang.reflect.Method; + /** * Test case for the Velocity Introspector which * tests the ability to find a 'best match' Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/Introspector3TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,14 @@ package org.apache.velocity.test; * under the License. */ -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.runtime.RuntimeSingleton; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + /** * Simple introspector test case for primitive problem found in 1.3 * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,13 +19,12 @@ package org.apache.velocity.test; * under the License. */ -import java.lang.reflect.Method; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.runtime.RuntimeSingleton; +import java.lang.reflect.Method; + /** * Test case for the Velocity Introspector which uses * the Java Reflection API to determine the correct Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,13 +19,9 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.app.event.EventCartridge; @@ -36,6 +32,9 @@ import org.apache.velocity.runtime.Runti import org.apache.velocity.util.RuntimeServicesAware; import org.apache.velocity.util.introspection.Info; +import java.io.StringWriter; +import java.io.Writer; + /** * Tests event handling for all event handlers except IncludeEventHandler. This is tested * separately due to its complexity. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import org.apache.velocity.exception.MethodInvocationException; -import org.apache.velocity.exception.VelocityException; import org.apache.velocity.exception.ParseErrorException; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.parser.ParseException; + /** * Test Macro comment functionality */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,9 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import org.apache.velocity.exception.MethodInvocationException; -import org.apache.velocity.exception.VelocityException; -import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.runtime.RuntimeConstants; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java Sun Jul 17 23:33:09 2016 @@ -21,14 +21,13 @@ package org.apache.velocity.test; import junit.framework.Test; import junit.framework.TestSuite; - +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.test.misc.TestLogger; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import java.io.*; +import java.io.StringWriter; /** * Make sure that a forward referenced macro inside another macro definition does Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java Sun Jul 17 23:33:09 2016 @@ -20,7 +20,6 @@ package org.apache.velocity.test; */ import junit.framework.TestCase; - import org.apache.commons.lang3.ArrayUtils; import org.apache.velocity.runtime.parser.node.ASTMethod; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,17 +19,16 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.test.misc.TestLogger; +import java.io.StringWriter; + /** * Tests if we can hand Velocity an arbitrary class for logging. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,22 +19,20 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Test a reported bug in which method overloading throws IllegalArgumentException * after a null return value. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MiscTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MiscTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MiscTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MiscTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,14 @@ package org.apache.velocity.test; * under the License. */ -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.runtime.RuntimeInstance; import org.apache.velocity.util.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * Test case for any miscellaneous stuff. If it isn't big, and doesn't fit * anywhere else, it goes here
