Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringBuilderWriter.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringBuilderWriter.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringBuilderWriter.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringBuilderWriter.java Thu Jan 26 01:57:00 2017 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -56,7 +56,7 @@ public class StringBuilderWriter extends /** * Constructs a new instance with the specified {@link StringBuilder}. - * + * * <p>If {@code builder} is null a new instance with default capacity will be created.</p> * * @param builder The String builder. May be null. @@ -104,7 +104,7 @@ public class StringBuilderWriter extends } /** - * Closing this writer has no effect. + * Closing this writer has no effect. */ @Override public void close() { @@ -112,7 +112,7 @@ public class StringBuilderWriter extends } /** - * Flushing this writer has no effect. + * Flushing this writer has no effect. */ @Override public void flush() { @@ -122,7 +122,7 @@ public class StringBuilderWriter extends /** * Writes a String to the {@link StringBuilder}. - * + * * @param value The value to write */ @Override
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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.runtime.directive.Directive; @@ -157,37 +157,37 @@ public class StringUtils /** * Creates a string that formats the template filename with line number - * and column of the given Directive. We use this routine to provide a cosistent format for displaying + * and column of the given Directive. We use this routine to provide a cosistent format for displaying * file errors. */ public static final String formatFileString(Directive directive) { - return formatFileString(directive.getTemplateName(), directive.getLine(), directive.getColumn()); + return formatFileString(directive.getTemplateName(), directive.getLine(), directive.getColumn()); } /** * Creates a string that formats the template filename with line number - * and column of the given Node. We use this routine to provide a cosistent format for displaying + * and column of the given Node. We use this routine to provide a cosistent format for displaying * file errors. */ public static final String formatFileString(Node node) { - return formatFileString(node.getTemplateName(), node.getLine(), node.getColumn()); + return formatFileString(node.getTemplateName(), node.getLine(), node.getColumn()); } - + /** * Simply creates a string that formats the template filename with line number - * and column. We use this routine to provide a cosistent format for displaying + * and column. We use this routine to provide a cosistent format for displaying * file errors. */ public static final String formatFileString(Info info) { return formatFileString(info.getTemplateName(), info.getLine(), info.getColumn()); } - + /** * Simply creates a string that formats the template filename with line number - * and column. We use this routine to provide a cosistent format for displaying + * and column. We use this routine to provide a cosistent format for displaying * file errors. * @param template File name of template, can be null * @param linenum Line number within the file Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateBoolean.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateBoolean.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateBoolean.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateBoolean.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateNumber.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateNumber.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateNumber.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateNumber.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateString.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateString.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateString.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/TemplateString.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java Thu Jan 26 01:57:00 2017 @@ -24,7 +24,7 @@ import java.util.Iterator; /** * Default implementation of a {@link ChainableUberspector chainable uberspector} that forwards all calls to the wrapped * uberspector (when that is possible). It should be used as the base class for all chainable uberspectors. - * + * * @version $Id: $ * @since 1.6 * @see ChainableUberspector @@ -36,7 +36,7 @@ public abstract class AbstractChainableU /** * {@inheritDoc} - * + * * @see ChainableUberspector#wrap(org.apache.velocity.util.introspection.Uberspect) * @see #inner */ @@ -47,7 +47,7 @@ public abstract class AbstractChainableU /** * init - the chainable uberspector is responsible for the initialization of the wrapped uberspector - * + * * @see org.apache.velocity.util.introspection.Uberspect#init() */ //@Override @@ -65,7 +65,7 @@ public abstract class AbstractChainableU /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getIterator(java.lang.Object, * org.apache.velocity.util.introspection.Info) */ @@ -78,7 +78,7 @@ public abstract class AbstractChainableU /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getMethod(java.lang.Object, java.lang.String, * java.lang.Object[], org.apache.velocity.util.introspection.Info) */ @@ -90,7 +90,7 @@ public abstract class AbstractChainableU /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getPropertyGet(java.lang.Object, java.lang.String, * org.apache.velocity.util.introspection.Info) */ @@ -102,7 +102,7 @@ public abstract class AbstractChainableU /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getPropertySet(java.lang.Object, java.lang.String, * java.lang.Object, org.apache.velocity.util.introspection.Info) */ Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ChainableUberspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ChainableUberspector.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ChainableUberspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ChainableUberspector.java Thu Jan 26 01:57:00 2017 @@ -22,7 +22,7 @@ package org.apache.velocity.util.introsp /** * Interface that marks uberspectors as chainable, meaning that multiple uberspectors can be * combined in a chain (using the Decorator pattern). - * + * * @version $Id: $ * @since 1.6 */ @@ -30,7 +30,7 @@ public interface ChainableUberspector ex { /** * Specify the decorated Uberspector - * + * * @param inner The decorated uberspector. */ public void wrap(Uberspect inner); Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java Thu Jan 26 01:57:00 2017 @@ -286,7 +286,7 @@ public class ConversionHandlerImpl imple }; standardConverterMap.put(new Pair<>(Integer.class, String.class), stringToInteger); standardConverterMap.put(new Pair<>(Integer.TYPE, String.class), stringToInteger); - + /* narrowing towards long */ Converter<Long> narrowingToLong = new Converter<Long>() { @@ -337,7 +337,7 @@ public class ConversionHandlerImpl imple }; standardConverterMap.put(new Pair<>(Long.class, String.class), stringToLong); standardConverterMap.put(new Pair<>(Long.TYPE, String.class), stringToLong); - + /* narrowing towards float */ Converter<Float> narrowingToFloat = new Converter<Float>() { @@ -467,7 +467,7 @@ public class ConversionHandlerImpl imple standardConverterMap.put(new Pair<>(Long.class, Boolean.TYPE), booleanToLong); standardConverterMap.put(new Pair<>(Long.TYPE, Boolean.class), booleanToLong); standardConverterMap.put(new Pair<>(Long.TYPE, Boolean.TYPE), booleanToLong); - + /* to string */ toString = new Converter<String>() { Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/DeprecatedCheckUberspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/DeprecatedCheckUberspector.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/DeprecatedCheckUberspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/DeprecatedCheckUberspector.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.lang.reflect.Method; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Info.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.runtime.parser.node.Node; @@ -51,14 +51,14 @@ public class Info { this(node.getTemplateName(), node.getLine(), node.getColumn()); } - + /** * Force callers to set the location information. */ private Info() { } - + /** * @return The template name. */ Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectionUtils.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.util.HashMap; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.slf4j.Logger; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.slf4j.Logger; @@ -73,7 +73,7 @@ public abstract class IntrospectorBase introspectorCache = new IntrospectorCache(log, conversionHandler); this.conversionHandler = conversionHandler; } - + /** * Gets the method defined by <code>name</code> and * <code>params</code> for the Class <code>c</code>. @@ -94,7 +94,7 @@ public abstract class IntrospectorBase { throw new IllegalArgumentException ("class object is null!"); } - + if (params == null) { throw new IllegalArgumentException("params object is null!"); @@ -142,7 +142,7 @@ public abstract class IntrospectorBase /** * Return the internal IntrospectorCache object. - * + * * @return The internal IntrospectorCache object. * @since 1.5 */ Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/IntrospectorCache.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.commons.lang3.Conversion; @@ -60,7 +60,7 @@ public final class IntrospectorCache * Keep the names of the classes in another map. This is needed for a multi-classloader environment where it is possible * to have Class 'Foo' loaded by a classloader and then get asked to introspect on 'Foo' from another class loader. While these * two Class objects have the same name, a <code>classMethodMaps.get(Foo.class)</code> will return null. For that case, we - * keep a set of class names to recognize this case. + * keep a set of class names to recognize this case. */ private final Set classNameCache = new HashSet(); Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/LinkingUberspector.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.util.Iterator; @@ -29,7 +29,7 @@ import java.util.Iterator; * then this utility class is used to provide a basic default chaining where the * first non-null result is kept for each introspection call. * </p> - * + * * @since 1.6 * @see ChainableUberspector * @version $Id: LinkingUberspector.java 10959 2008-07-01 00:12:29Z sdumitriu $ @@ -52,7 +52,7 @@ public class LinkingUberspector extends * <p> * Init both wrapped uberspectors * </p> - * + * * @see org.apache.velocity.util.introspection.Uberspect#init() */ //@Override @@ -64,7 +64,7 @@ public class LinkingUberspector extends /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getIterator(java.lang.Object, * org.apache.velocity.util.introspection.Info) */ @@ -78,7 +78,7 @@ public class LinkingUberspector extends /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getMethod(java.lang.Object, java.lang.String, * java.lang.Object[], org.apache.velocity.util.introspection.Info) */ @@ -91,7 +91,7 @@ public class LinkingUberspector extends /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getPropertyGet(java.lang.Object, java.lang.String, * org.apache.velocity.util.introspection.Info) */ @@ -104,7 +104,7 @@ public class LinkingUberspector extends /** * {@inheritDoc} - * + * * @see org.apache.velocity.util.introspection.Uberspect#getPropertySet(java.lang.Object, java.lang.String, * java.lang.Object, org.apache.velocity.util.introspection.Info) */ Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/MethodMap.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.lang.reflect.Method; @@ -286,7 +286,7 @@ public class MethodMap } } } - + if (equivalentMatches != null) { System.out.println("ambiguous: "+equivalentMatches); @@ -409,7 +409,7 @@ public class MethodMap /** * Returns true if the supplied method is applicable to actual * argument types. - * + * * @param method method that will be called * @param classes arguments to method * @return true if method is applicable to arguments Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorControl.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** @@ -30,8 +30,8 @@ public interface SecureIntrospectorContr { /** - * Determine which methods and classes to prevent from executing. - * + * Determine which methods and classes to prevent from executing. + * * @param clazz Class for which method is being called * @param method method being called. This may be null in the case of a call to iterator, get, or set method * 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.runtime.RuntimeConstants; @@ -26,16 +26,16 @@ import org.apache.velocity.util.RuntimeS import java.util.Iterator; /** - * Use a custom introspector that prevents classloader related method - * calls. Use this introspector for situations in which template - * writers are numerous or untrusted. Specifically, this introspector + * Use a custom introspector that prevents classloader related method + * calls. Use this introspector for situations in which template + * writers are numerous or untrusted. Specifically, this introspector * prevents creation of arbitrary objects or reflection on objects. - * + * * <p>To use this introspector, set the following property: * <pre> * runtime.introspector.uberspect = org.apache.velocity.util.introspection.SecureUberspector * </pre> - * + * * @author <a href="mailto:[email protected]";>Will Glass-Husain</a> * @version $Id$ * @since 1.5 @@ -54,14 +54,14 @@ public class SecureUberspector extends U String [] badClasses = rsvc.getConfiguration() .getStringArray(RuntimeConstants.INTROSPECTOR_RESTRICT_CLASSES); - + introspector = new SecureIntrospectorImpl(badClasses, badPackages, log); } - + /** * Get an iterator from the given object. Since the superclass method * this secure version checks for execute permission. - * + * * @param obj object to iterate over * @param i line, column, template info * @return Iterator for object Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Uberspect.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Uberspect.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Uberspect.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Uberspect.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.util.Iterator; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.exception.VelocityException; @@ -216,14 +216,14 @@ public class UberspectImpl implements Ub try { return (Iterator)iter.invoke(obj); - } + } catch (IllegalAccessException e) { // Cannot invoke this method, just give up } catch (Exception e) { - throw new VelocityException("Error invoking the method 'iterator' on class '" + throw new VelocityException("Error invoking the method 'iterator' on class '" + obj.getClass().getName() +"'", e); } } @@ -343,7 +343,7 @@ public class UberspectImpl implements Ub /* * Let's see if we are a map... */ - if (!executor.isAlive()) + if (!executor.isAlive()) { executor = new MapGetExecutor(log, obj, identifier); } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelMethod.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.lang.reflect.InvocationTargetException; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertyGet.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertyGet.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertyGet.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertyGet.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertySet.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertySet.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertySet.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/VelPropertySet.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ /** 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -1680,8 +1680,8 @@ boolean Directive() : /* * and the following block if the PD needs it */ - ((( - LOOKAHEAD( { getToken(1).kind != END && ( !newlineBeforeStatement || getToken(1).kind != WHITESPACE || getToken(2).kind != END ) }) newlineBeforeStatement = Statement(newlineBeforeStatement))* + ((( + LOOKAHEAD( { getToken(1).kind != END && ( !newlineBeforeStatement || getToken(1).kind != WHITESPACE || getToken(2).kind != END ) }) newlineBeforeStatement = Statement(newlineBeforeStatement))* { block = jjtThis; block.setPrefix(blockPrefix); @@ -1927,9 +1927,9 @@ boolean IfStatement() : ] ( LOOKAHEAD( { - (getToken(1).kind != ELSEIF && getToken(1).kind != ELSE && getToken(1).kind != END) && + (getToken(1).kind != ELSEIF && getToken(1).kind != ELSE && getToken(1).kind != END) && (!afterNewline || getToken(1).kind != WHITESPACE || (getToken(2).kind != ELSEIF && getToken(2).kind != ELSE && getToken(2).kind != END)) - }) + }) afterNewline = Statement(afterNewline) )* { lastBlock = jjtThis; @@ -2295,4 +2295,3 @@ void PrimaryExpression() #void : {} ------ */ - Modified: velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/directive.properties URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/directive.properties?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/directive.properties (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/defaults/directive.properties Thu Jan 26 01:57:00 2017 @@ -13,7 +13,7 @@ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. +# under the License. directive.1=org.apache.velocity.runtime.directive.Foreach directive.2=org.apache.velocity.runtime.directive.Include directive.3=org.apache.velocity.runtime.directive.Parse 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.Test; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.lang.reflect.Array; @@ -205,5 +205,3 @@ public class ArrayMethodsTestCase extend } } - - Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BlockMacroTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BlockMacroTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BlockMacroTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BlockMacroTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.runtime.RuntimeConstants; @@ -35,7 +35,7 @@ public class BlockMacroTestCase extends { String template = "#macro(foo $txt) Yeah, $txt! $bodyContent $bodyContent#end #@foo(\"woohoo\")jee#end"; String result = " Yeah, woohoo! jee jee"; - + assertEvalEquals(result, template); } @@ -43,7 +43,7 @@ public class BlockMacroTestCase extends { String template = "#macro(foo $txt) Yeah, $txt! $bodyContent#end #@foo(\"woohoo\")#foreach($i in [1..3])$i:#{end}#end"; String result = " Yeah, woohoo! 1:2:3:"; - + assertEvalEquals(result, template); } @@ -51,7 +51,7 @@ public class BlockMacroTestCase extends { String template = "#macro(foo $txt) Yeah, $txt! $bodyContent#end #@foo(\"woohoo\")#end"; String result = " Yeah, woohoo! "; - + assertEvalEquals(result, template); } @@ -59,7 +59,7 @@ public class BlockMacroTestCase extends { String template = "#macro(foo) Yeah! $bodyContent#end #@foo()#end"; String result = " Yeah! "; - + assertEvalEquals(result, template); } @@ -68,7 +68,7 @@ public class BlockMacroTestCase extends engine.setProperty(RuntimeConstants.VM_BODY_REFERENCE, "myBody"); String template = "#macro(foo) Yeah! $myBody#end #@foo()#end"; String result = " Yeah! "; - + assertEvalEquals(result, template); } @@ -86,7 +86,7 @@ public class BlockMacroTestCase extends assertEvalException("#@foo#end"); assertEvalException("#@foo()#end"); } - + public void testVelocity690() { assertEvalEquals(" output ", "#macro(foo) output #end#@foo #end"); @@ -94,12 +94,12 @@ public class BlockMacroTestCase extends assertEvalEquals("#[output)", "#macro(foo2)#[$bodyContent)#end#{@foo2}output#end"); assertEvalException("#macro(foo) output #end#@foo"); } - + public void testVelocity675() throws Exception { - assertEvalEquals("#@foo#end", "#@foo#end"); + assertEvalEquals("#@foo#end", "#@foo#end"); } - + public void testVelocity685() throws Exception { engine.setProperty(RuntimeConstants.VM_ARGUMENTS_STRICT, Boolean.TRUE); @@ -139,4 +139,3 @@ public class BlockMacroTestCase extends assertTmplEquals("cbabc", "a"); } } - Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.app.VelocityEngine; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -296,10 +296,10 @@ public class BuiltInEventHandlerTestCase assertEquals("Jimmy\\'s",writer.toString()); **/ - + log("Escape selected references (global configuration)"); - + } 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.Test; @@ -29,7 +29,7 @@ import java.io.StringWriter; /** * Test comments - * + * * @author <a href="mailto:[email protected]";>Will Glass-Husain</a> * @version $Id$ */ @@ -40,7 +40,7 @@ public class CommentsTestCase extends Ba { return new TestSuite(CommentsTestCase.class); } - + /** * Default constructor. * @param name @@ -50,7 +50,7 @@ public class CommentsTestCase extends Ba super(name); } - + /** * Test multiline comments * @throws Exception @@ -60,8 +60,8 @@ public class CommentsTestCase extends Ba { VelocityEngine ve = new VelocityEngine(); ve.init(); - - Context context = new VelocityContext(); + + Context context = new VelocityContext(); StringWriter writer = new StringWriter(); ve.evaluate(context, writer, "test","abc #* test\r\ntest2*#\r\ndef"); assertEquals("abc \r\ndef", writer.toString()); @@ -76,17 +76,17 @@ public class CommentsTestCase extends Ba { VelocityEngine ve = new VelocityEngine(); ve.init(); - - Context context = new VelocityContext(); + + Context context = new VelocityContext(); StringWriter writer = new StringWriter(); ve.evaluate(context, writer, "test","123 ## test test\r\nabc"); - assertEquals("123 abc", writer.toString()); - - context = new VelocityContext(); + assertEquals("123 abc", writer.toString()); + + context = new VelocityContext(); writer = new StringWriter(); ve.evaluate(context, writer, "test","123 \r\n## test test\r\nabc"); - assertEquals("123 \r\nabc", writer.toString()); - + assertEquals("123 \r\nabc", writer.toString()); + } /** @@ -98,11 +98,11 @@ public class CommentsTestCase extends Ba { VelocityEngine ve = new VelocityEngine(); ve.init(); - - Context context = new VelocityContext(); + + Context context = new VelocityContext(); StringWriter writer = new StringWriter(); ve.evaluate(context, writer, "test","test\r\n## #* *# ${user \r\nabc"); - assertEquals("test\r\nabc", writer.toString()); - + assertEquals("test\r\nabc", writer.toString()); + } } 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.TestSuite; @@ -176,11 +176,3 @@ public class CommonsExtPropTestCase exte result.write("\n"); } } - - - - - - - - Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.VelocityContext; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/DefineTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/DefineTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/DefineTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/DefineTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.Template; @@ -38,13 +38,13 @@ import java.util.Map; /** * Test #evaluate directive. - * + * * @author <a href="mailto:[email protected]";>Will Glass-Husain</a> * @version $Id$ */ public class EvaluateTestCase extends BaseTestCase { - + /** * VTL file extension. */ @@ -142,7 +142,7 @@ public class EvaluateTestCase extends Ba /** * Test that the event handlers work in #evaluate (since they are - * attached to the context). Only need to check one - they all + * attached to the context). Only need to check one - they all * work the same. * @throws Exception */ @@ -152,17 +152,17 @@ public class EvaluateTestCase extends Ba VelocityEngine ve = new VelocityEngine(); ve.setProperty(RuntimeConstants.EVENTHANDLER_REFERENCEINSERTION, EscapeHtmlReference.class.getName()); ve.init(); - + Context context = new VelocityContext(); context.put("lt","<"); context.put("gt",">"); StringWriter writer = new StringWriter(); ve.evaluate(context, writer, "test","${lt}test${gt} #evaluate('${lt}test2${gt}')"); assertEquals("<test> <test2>", writer.toString()); - + } - - + + /** * Test errors are thrown * @throws Exception @@ -172,12 +172,12 @@ public class EvaluateTestCase extends Ba { VelocityEngine ve = new VelocityEngine(); ve.init(); - + Context context = new VelocityContext(); - + // no arguments StringWriter writer = new StringWriter(); - try + try { ve.evaluate(context, writer, "test", "#evaluate()"); @@ -189,10 +189,10 @@ public class EvaluateTestCase extends Ba assertEquals(1,e.getLineNumber()); assertEquals(1,e.getColumnNumber()); } - + // too many arguments writer = new StringWriter(); - try + try { ve.evaluate(context, writer, "test", "#evaluate('aaa' 'bbb')"); @@ -204,10 +204,10 @@ public class EvaluateTestCase extends Ba assertEquals(1,e.getLineNumber()); assertEquals(17,e.getColumnNumber()); } - + // argument not a string or reference writer = new StringWriter(); - try + try { ve.evaluate(context, writer, "test", "#evaluate(10)"); @@ -219,10 +219,10 @@ public class EvaluateTestCase extends Ba assertEquals(1,e.getLineNumber()); assertEquals(11,e.getColumnNumber()); } - + // checking line/col for parse error writer = new StringWriter(); - try + try { String eval = "this is a multiline\n\n\n\n\n test #foreach() with an error"; context.put("eval",eval); @@ -236,9 +236,9 @@ public class EvaluateTestCase extends Ba assertEquals("test",e.getTemplateName()); assertEquals(2,e.getLineNumber()); assertEquals(15,e.getColumnNumber()); - } + } } - + /** * Test a file parses with no errors and compare to existing file. * @param basefilename @@ -250,7 +250,7 @@ public class EvaluateTestCase extends Ba info("Test file: "+basefilename); VelocityEngine ve = engine; ve.addProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); - + for (Iterator i = properties.keySet().iterator(); i.hasNext();) { String key = (String) i.next(); @@ -258,24 +258,24 @@ public class EvaluateTestCase extends Ba ve.addProperty(key, value); info("Add property: "+key+" = "+value); } - + ve.init(); - + Template template; FileOutputStream fos; Writer fwriter; - + template = ve.getTemplate( getFileName(null, basefilename, TMPL_FILE_EXT) ); - + fos = new FileOutputStream ( getFileName(RESULTS_DIR, basefilename, RESULT_FILE_EXT)); - + fwriter = new BufferedWriter( new OutputStreamWriter(fos) ); - + template.merge(context, fwriter); fwriter.flush(); fwriter.close(); - + if (!isMatch(RESULTS_DIR, COMPARE_DIR, basefilename, RESULT_FILE_EXT, CMP_FILE_EXT)) { String result = getFileContents(RESULTS_DIR, basefilename, RESULT_FILE_EXT); @@ -285,7 +285,7 @@ public class EvaluateTestCase extends Ba "-----Result-----\n"+ result + "----Expected----\n"+ compare + "----------------"; - + fail(msg); } } 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.VelocityContext; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.Test; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.VelocityContext; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.Test; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.runtime.RuntimeConstants; @@ -49,9 +49,9 @@ public class ForeachTestCase extends Bas engine.setProperty(RuntimeConstants.MAX_NUMBER_LOOPS, new Integer(3)); - assertEvalEquals("1 2 3 ", "#foreach ($item in [1..10])$item #end"); + assertEvalEquals("1 2 3 ", "#foreach ($item in [1..10])$item #end"); } - + /** * Tests proper method execution during a Foreach loop over a Collection * with items of varying classes. @@ -65,7 +65,7 @@ public class ForeachTestCase extends Bas context.put("helper", new ForeachMethodCallHelper()); context.put("col", col); - assertEvalEquals("int 100 str STRVALUE ", "#foreach ( $item in $col )$helper.getFoo($item) #end"); + assertEvalEquals("int 100 str STRVALUE ", "#foreach ( $item in $col )$helper.getFoo($item) #end"); } /** @@ -78,7 +78,7 @@ public class ForeachTestCase extends Bas { context.put("iterable", new MyIterable()); - assertEvalEquals("1 2 3 ", "#foreach ($i in $iterable)$i #end"); + assertEvalEquals("1 2 3 ", "#foreach ($i in $iterable)$i #end"); } public void testNotReallyIterableIteratorMethod() @@ -86,7 +86,7 @@ public class ForeachTestCase extends Bas { context.put("nri", new NotReallyIterable()); - assertEvalEquals("", "#foreach ($i in $nri)$i #end"); + assertEvalEquals("", "#foreach ($i in $nri)$i #end"); } public void testVelocityHasNextProperty() @@ -97,8 +97,8 @@ public class ForeachTestCase extends Bas list.add("test2"); list.add("test3"); context.put("list", list); - assertEvalEquals("test1 SEPARATOR test2 SEPARATOR test3 ", "#foreach ($value in $list)$value #if( $foreach.hasNext )SEPARATOR #end#end"); - } + assertEvalEquals("test1 SEPARATOR test2 SEPARATOR test3 ", "#foreach ($value in $list)$value #if( $foreach.hasNext )SEPARATOR #end#end"); + } public void testNestedVelocityHasNextProperty() throws Exception @@ -115,9 +115,9 @@ public class ForeachTestCase extends Bas list2.add("a3"); context.put("list2", list2); - assertEvalEquals("test1 (a1;a2;a3)-test2 (a1;a2;a3)-test3 (a1;a2;a3)-test4 (a1;a2;a3)", "#foreach ($value in $list)$value (#foreach ($val in $list2)$val#if( $foreach.hasNext );#end#end)#if( $foreach.hasNext )-#end#end"); - } - + assertEvalEquals("test1 (a1;a2;a3)-test2 (a1;a2;a3)-test3 (a1;a2;a3)-test4 (a1;a2;a3)", "#foreach ($value in $list)$value (#foreach ($val in $list2)$val#if( $foreach.hasNext );#end#end)#if( $foreach.hasNext )-#end#end"); + } + public static class MyIterable { private List foo; @@ -129,7 +129,7 @@ public class ForeachTestCase extends Bas foo.add(new Long(2)); foo.add("3"); } - + public Iterator iterator() { return foo.iterator(); 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.util.TemplateBoolean; @@ -143,5 +143,3 @@ public class GetAsTestCase extends BaseT } } - - Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import java.util.Collections; @@ -91,5 +91,3 @@ public class IfEmptyTestCase extends Bas } } - - Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.VelocityContext; @@ -98,5 +98,3 @@ public class IfNullTestCase extends Base } } - - 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import org.apache.velocity.runtime.RuntimeConstants; @@ -37,12 +37,12 @@ public class IndexTestCase extends BaseT { super.setUp(); engine.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, Boolean.TRUE); - + context.put("NULL", null); context.put("red", "blue"); - + int[] a = {1, 2, 3}; - context.put("a", a); + context.put("a", a); String[] str = {"a", "ab", "abc"}; context.put("str", str); @@ -90,10 +90,10 @@ public class IndexTestCase extends BaseT assertEvalEquals("BIG TRUEaBIG FALSE", "$foo[true]a$foo[false]"); assertEvalEquals("junk foobar ", "$foo[\"junk\"]"); assertEvalEquals("GOT NULL", "#set($i=$NULL)$boo[$i]"); - + assertEvalEquals("321", "$a[-1]$a[ -2]$a[-3 ]"); assertEvalEquals("67xx", "#set($hash={1:11, 5:67, 23:2})$hash[5]$!hash[6]#if(!$hash[1000])xx#end"); - + // Some cases that should be evaluated as text assertEvalEquals("[]", "[]"); assertEvalEquals("$[]", "$[]"); @@ -121,8 +121,8 @@ public class IndexTestCase extends BaseT assertEvalEquals("2112", "#set($a[-1] = 2112)$a[2]"); assertEvalEquals("3344","#set($hash = {1:11, 2:22, 5:66})#set($hash[2]=33)#set($hash[3]=44)$hash[2]$hash[3]"); } - - + + public void testErrorHandling() { assertEvalExceptionAt("$boo['throwex']", 1, 5); @@ -131,8 +131,8 @@ public class IndexTestCase extends BaseT assertEvalExceptionAt("#set($foo[1] = 3)", 1, 10); assertEvalExceptionAt("$a[500]", 1, 3); } - - + + public static class Foo { public Object bar = null; @@ -148,7 +148,7 @@ public class IndexTestCase extends BaseT else return "BIG FALSE"; } - + public String get(String str) { return str + " foobar "; @@ -165,6 +165,6 @@ public class IndexTestCase extends BaseT throw new RuntimeException("Generated Exception"); return obj; - } - } + } + } } 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.TestCase; @@ -36,14 +36,14 @@ import java.io.StringWriter; * @author <a href="Alexey Pachenko">[email protected]</a> * @version $Id$ */ -public class IntrospectionCacheDataTestCase extends TestCase +public class IntrospectionCacheDataTestCase extends TestCase { - - private static class CacheHitCountingVelocityContext extends VelocityContext + + private static class CacheHitCountingVelocityContext extends VelocityContext { public int cacheHit = 0; - - public IntrospectionCacheData icacheGet(Object key) + + public IntrospectionCacheData icacheGet(Object key) { final IntrospectionCacheData result = super.icacheGet(key); if (result != null) { @@ -51,11 +51,11 @@ public class IntrospectionCacheDataTestC } return result; } - + } - - public void testCache() throws ParseErrorException, MethodInvocationException, - ResourceNotFoundException, IOException + + public void testCache() throws ParseErrorException, MethodInvocationException, + ResourceNotFoundException, IOException { CacheHitCountingVelocityContext context = new CacheHitCountingVelocityContext(); context.put("this", this); @@ -64,17 +64,17 @@ public class IntrospectionCacheDataTestC assertEquals("[a][b]", w.toString()); assertTrue(context.cacheHit > 0); } - - - /** + + + /** * For use when acting as a context reference. - * + * * @param value * @return */ - public String exec(String value) + public String exec(String value) { return "[" + value + "]"; } - + } 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.Test; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.Test; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test; * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. */ import junit.framework.Test; @@ -44,7 +44,7 @@ public class IntrospectorTestCase extend private static MethodProvider mp; private Introspector introspector; - + public void setUp() { mp = new MethodProvider();
