Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -53,7 +53,7 @@ public class ASTIncludeStatement extends { return visitor.visit(this, data); } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) @@ -64,5 +64,5 @@ public class ASTIncludeStatement extends cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens return obj; } - + }
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIndex.java Thu Jan 26 01:57:00 2017 @@ -44,7 +44,7 @@ import org.apache.velocity.util.introspe * "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. */ /** @@ -70,45 +70,45 @@ public class ASTIndex extends SimpleNode { super(p, i); } - + public Object init(InternalContextAdapter context, Object data) throws TemplateInitException { - super.init(context, data); + super.init(context, data); strictRef = rsvc.getBoolean(RuntimeConstants.RUNTIME_REFERENCES_STRICT, false); cleanupParserAndTokens(); return data; - } + } + - private final static Object[] noParams = {}; - private final static Class[] noTypes = {}; + private final static Class[] noTypes = {}; /** - * If argument is an Integer and negative, then return (o.size() - argument). + * If argument is an Integer and negative, then return (o.size() - argument). * Otherwise return the original argument. We use this to calculate the true * index of a negative index e.g., $foo[-1]. If no size() method is found on the * 'o' object, then we throw an VelocityException. * @param context Used to access the method cache. * @param node ASTNode used for error reporting. */ - public static Object adjMinusIndexArg(Object argument, Object o, + public static Object adjMinusIndexArg(Object argument, Object o, InternalContextAdapter context, SimpleNode node) { if (argument instanceof Integer && ((Integer)argument).intValue() < 0) { // The index value is a negative number, $foo[-1], so we want to actually // Index [size - value], so try and call the size method. - VelMethod method = ClassUtils.getMethod("size", noParams, noTypes, + VelMethod method = ClassUtils.getMethod("size", noParams, noTypes, o, context, node, false); if (method == null) { // The object doesn't have a size method, so there is no notion of "at the end" throw new VelocityException( "A 'size()' method required for negative value " - + ((Integer)argument).intValue() + " does not exist for class '" + + ((Integer)argument).intValue() + " does not exist for class '" + o.getClass().getName() + "' at " + StringUtils.formatFileString(node)); - } + } Object size = null; try @@ -120,8 +120,8 @@ public class ASTIndex extends SimpleNode throw new VelocityException("Error trying to calls the 'size()' method on '" + o.getClass().getName() + "' at " + StringUtils.formatFileString(node), e); } - - int sizeint = 0; + + int sizeint = 0; try { sizeint = ((Integer)size).intValue(); @@ -129,18 +129,18 @@ public class ASTIndex extends SimpleNode catch (ClassCastException e) { // If size() doesn't return an Integer we want to report a pretty error - throw new VelocityException("Method 'size()' on class '" + throw new VelocityException("Method 'size()' on class '" + o.getClass().getName() + "' returned '" + size.getClass().getName() + "' when Integer was expected at " + StringUtils.formatFileString(node)); } - + argument = Integer.valueOf(sizeint + ((Integer)argument).intValue()); } - + // Nothing to do, return the original argument return argument; } - + public Object execute(Object o, InternalContextAdapter context) throws MethodInvocationException { @@ -150,11 +150,11 @@ public class ASTIndex extends SimpleNode Object [] params = {argument}; Class[] paramClasses = {argument == null ? null : argument.getClass()}; - VelMethod method = ClassUtils.getMethod(methodName, params, paramClasses, + VelMethod method = ClassUtils.getMethod(methodName, params, paramClasses, o, context, this, strictRef); if (method == null) return null; - + try { /* @@ -187,11 +187,11 @@ public class ASTIndex extends SimpleNode catch( Exception e ) { String msg = "Error invoking method 'get(" - + (argument == null ? "null" : argument.getClass().getName()) + + (argument == null ? "null" : argument.getClass().getName()) + ")' in " + o.getClass().getName() + " at " + StringUtils.formatFileString(this); log.error(msg, e); throw new VelocityException(msg, e); } - } + } } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -143,7 +143,7 @@ public class ASTIntegerRange extends Sim return elements; } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLENode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.Parser; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.Parser; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -85,7 +85,7 @@ public class ASTMap extends SimpleNode return objectMap; } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -151,7 +151,3 @@ public abstract class ASTMathNode extend public abstract Number perform(Number left, Number right, InternalContextAdapter context); } - - - - Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java Thu Jan 26 01:57:00 2017 @@ -122,7 +122,7 @@ public class ASTMethod extends SimpleNod strictRef = rsvc.getBoolean(RuntimeConstants.RUNTIME_REFERENCES_STRICT, false); cleanupParserAndTokens(); - + return data; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTModNode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -76,7 +76,7 @@ public class ASTModNode extends ASTMathN } return MathUtils.modulo(left, right); } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) @@ -87,7 +87,7 @@ public class ASTModNode extends ASTMathN cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens return obj; } - + @Override public String getLiteralOperator() { @@ -95,4 +95,3 @@ public class ASTModNode extends ASTMathN } } - Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -58,7 +58,7 @@ public class ASTMulNode extends ASTMathN { return MathUtils.multiply(left, right); } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) @@ -69,7 +69,7 @@ public class ASTMulNode extends ASTMathN cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens return obj; } - + @Override public String getLiteralOperator() { @@ -77,7 +77,3 @@ public class ASTMulNode extends ASTMathN } } - - - - Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNENode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNENode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNENode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNENode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -75,7 +75,7 @@ public class ASTNotNode extends SimpleNo { return (jjtGetChild(0).evaluate( context ) ? Boolean.FALSE : Boolean.TRUE) ; } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -76,7 +76,7 @@ public class ASTObjectArray extends Simp return objectArray; } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) @@ -87,5 +87,5 @@ public class ASTObjectArray extends Simp cleanupParserAndTokens(); // drop reference to Parser and all JavaCC Tokens return obj; } - + } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -112,8 +112,3 @@ public class ASTOrNode extends ASTLogica return false; } } - - - - - Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.Parser; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.event.EventHandlerUtil; @@ -78,19 +78,19 @@ public class ASTReference extends Simple * Indicates if we are running in strict reference mode. */ public boolean strictRef = false; - + /** * non null Indicates if we are setting an index reference e.g, $foo[2], which basically * means that the last syntax of the reference are brackets. */ private ASTIndex astIndex = null; - + /** * Indicates if we are using modified escape behavior in strict mode. * mainly we allow \$abc -> to render as $abc */ public boolean strictEscape = false; - + private int numChildren = 0; protected Info uberInfo; @@ -127,10 +127,10 @@ public class ASTReference extends Simple throws TemplateInitException { super.init(context, data); - + strictEscape = rsvc.getBoolean(RuntimeConstants.RUNTIME_REFERENCES_STRICT_ESCAPE, false); strictRef = rsvc.getBoolean(RuntimeConstants.RUNTIME_REFERENCES_STRICT, false); - + /* * the only thing we can do in init() is getRoot() * as that is template based, not context based, @@ -140,10 +140,10 @@ public class ASTReference extends Simple rootString = rsvc.useStringInterning() ? getRoot().intern() : getRoot(); numChildren = jjtGetNumChildren(); - + // This is an expensive call, so get it now. literal = literal(); - + /* * and if appropriate... */ @@ -156,7 +156,7 @@ public class ASTReference extends Simple else identifier = lastNode.getFirstTokenImage(); } - + /* * make an uberinfo - saves new's later on @@ -171,14 +171,14 @@ public class ASTReference extends Simple /** * In the case we are referencing a variable with #if($foo) or - * #if( ! $foo) then we allow variables to be undefined and we + * #if( ! $foo) then we allow variables to be undefined and we * set strictRef to false so that if the variable is undefined - * an exception is not thrown. + * an exception is not thrown. */ if (strictRef && numChildren == 0) { logOnNull = false; // Strict mode allows nulls - + Node node = this.jjtGetParent(); if (node instanceof ASTNotNode // #if( ! $foo) || node instanceof ASTExpression // #if( $foo ) @@ -199,7 +199,7 @@ public class ASTReference extends Simple } saveTokenImages(); cleanupParserAndTokens(); - + return data; } @@ -254,7 +254,7 @@ public class ASTReference extends Simple return EventHandlerUtil.invalidGetMethod(rsvc, context, "$" + rootString, null, null, uberInfo); } - + /* * otherwise, simply return null */ @@ -276,7 +276,7 @@ public class ASTReference extends Simple try { - Object previousResult = result; + Object previousResult = result; int failedChild = -1; for (int i = 0; i < numChildren; i++) { @@ -287,10 +287,10 @@ public class ASTReference extends Simple * to call a method or property on a null value. */ String name = jjtGetChild(i).getFirstTokenImage(); - throw new VelocityException("Attempted to access '" + throw new VelocityException("Attempted to access '" + name + "' on a null value at " + StringUtils.formatFileString(uberInfo.getTemplateName(), - + jjtGetChild(i).getLine(), jjtGetChild(i).getColumn())); + + jjtGetChild(i).getLine(), jjtGetChild(i).getColumn())); } previousResult = result; result = jjtGetChild(i).execute(result,context); @@ -356,9 +356,9 @@ public class ASTReference extends Simple } } } - + } - + return result; } catch(MethodInvocationException mie) @@ -392,7 +392,7 @@ public class ASTReference extends Simple { /** * If we are in strict mode and the variable is escaped, then don't bother to - * retreive the value since we won't use it. And if the var is not defined + * retreive the value since we won't use it. And if the var is not defined * it will throw an exception. Set value to TRUE to fall through below with * simply printing $foo, and not \$foo */ @@ -414,7 +414,7 @@ public class ASTReference extends Simple if (escaped) { localNullString = getNullString(context); - + if (value == null) { writer.write(escPrefix); @@ -431,7 +431,7 @@ public class ASTReference extends Simple /* * the normal processing - * + * * if we have an event cartridge, get a new value object */ @@ -439,7 +439,7 @@ public class ASTReference extends Simple String toString = null; if (value != null) - { + { if (value instanceof Renderable) { Renderable renderable = (Renderable)value; @@ -469,34 +469,34 @@ public class ASTReference extends Simple } if (value == null || toString == null) - { + { if (strictRef) { if (referenceType != QUIET_REFERENCE) { - log.error("Prepend the reference with '$!' e.g., $!{}" + + log.error("Prepend the reference with '$!' e.g., $!{}" + " if you want Velocity to ignore the reference when it evaluates to null", literal().substring(1)); if (value == null) { - throw new VelocityException("Reference " + literal() - + " evaluated to null when attempting to render at " + throw new VelocityException("Reference " + literal() + + " evaluated to null when attempting to render at " + StringUtils.formatFileString(this)); } else // toString == null { // This will probably rarely happen, but when it does we want to // inform the user that toString == null so they don't pull there - // hair out wondering why Velocity thinks the value is null. + // hair out wondering why Velocity thinks the value is null. throw new VelocityException("Reference " + literal() + " evaluated to object " + value.getClass().getName() + " whose toString() method returned null at " + StringUtils.formatFileString(this)); } - } + } return true; } - + /* * write prefix twice, because it's schmoo, so the \ don't escape each * other... @@ -507,7 +507,7 @@ public class ASTReference extends Simple // If in strict escape mode then we only print escape once. // Yea, I know.. brittle stuff writer.write(escPrefix); - } + } writer.write(escPrefix); writer.write(morePrefix); writer.write(localNullString); @@ -534,19 +534,19 @@ public class ASTReference extends Simple { writer.write(toString); } - + return true; } } /** * This method helps to implement the "render literal if null" functionality. - * + * * VelocimacroProxy saves references to macro arguments (AST nodes) so that if we have a macro * #foobar($a $b) then there is key "$a.literal" which points to the literal presentation of the * argument provided to variable $a. If the value of $a is null, we render the string that was * provided as the argument. - * + * * @param context * @return */ @@ -583,7 +583,7 @@ public class ASTReference extends Simple } catch(Exception e) { - throw new VelocityException("Reference evaluation threw an exception at " + throw new VelocityException("Reference evaluation threw an exception at " + StringUtils.formatFileString(this), e); } } @@ -597,7 +597,7 @@ public class ASTReference extends Simple return (computableReference ? execute(null, context) : null); } - + /** * Utility class to handle nulls when printing a class type */ @@ -605,8 +605,8 @@ public class ASTReference extends Simple { return clazz == null ? "null" : clazz.getName(); } - - + + /** * Sets the value of a complex reference (something like $foo.bar) * Currently used by ASTSetReference() @@ -655,11 +655,11 @@ public class ASTReference extends Simple if (strictRef) { String name = jjtGetChild(i+1).getFirstTokenImage(); - throw new MethodInvocationException("Attempted to access '" + throw new MethodInvocationException("Attempted to access '" + name + "' on a null value", null, name, uberInfo.getTemplateName(), jjtGetChild(i+1).getLine(), jjtGetChild(i+1).getColumn()); - } - + } + log.error("reference set is not a valid reference at {}", StringUtils.formatFileString(uberInfo)); return false; @@ -673,30 +673,30 @@ public class ASTReference extends Simple // the brackets. This means that we need to call a more general method // of the form set(Integer, <something>), or put(Object, <something), where // the first parameter is the index value and the second is the LHS of the set. - + Object argument = astIndex.jjtGetChild(0).value(context); // If negative, turn -1 into (size - 1) - argument = ASTIndex.adjMinusIndexArg(argument, result, context, astIndex); + argument = ASTIndex.adjMinusIndexArg(argument, result, context, astIndex); Object [] params = {argument, value}; - Class[] paramClasses = {params[0] == null ? null : params[0].getClass(), + Class[] paramClasses = {params[0] == null ? null : params[0].getClass(), params[1] == null ? null : params[1].getClass()}; String methodName = "set"; - VelMethod method = ClassUtils.getMethod(methodName, params, paramClasses, + VelMethod method = ClassUtils.getMethod(methodName, params, paramClasses, result, context, astIndex, false); - + if (method == null) { // If we can't find a 'set' method, lets try 'put', This warrents a little - // investigation performance wise... if the user is using the hash + // investigation performance wise... if the user is using the hash // form $foo["blaa"], then it may be expensive to first try and fail on 'set' // then go to 'put'? The problem is that getMethod will try the cache, then // perform introspection on 'result' for 'set' methodName = "put"; - method = ClassUtils.getMethod(methodName, params, paramClasses, + method = ClassUtils.getMethod(methodName, params, paramClasses, result, context, astIndex, false); - } - + } + if (method == null) { // couldn't find set or put method, so bail @@ -705,14 +705,14 @@ public class ASTReference extends Simple throw new VelocityException( "Found neither a 'set' or 'put' method with param types '(" + printClass(paramClasses[0]) + "," + printClass(paramClasses[1]) - + ")' on class '" + result.getClass().getName() + + ")' on class '" + result.getClass().getName() + "' at " + StringUtils.formatFileString(astIndex)); } return false; } - + try - { + { method.invoke(result, params); } catch(RuntimeException e) @@ -724,17 +724,17 @@ public class ASTReference extends Simple { throw new MethodInvocationException( "Exception calling method '" - + methodName + "(" + + methodName + "(" + printClass(paramClasses[0]) + "," + printClass(paramClasses[1]) + ")' in " + result.getClass(), - e.getCause(), identifier, astIndex.getTemplateName(), astIndex.getLine(), + e.getCause(), identifier, astIndex.getTemplateName(), astIndex.getLine(), astIndex.getColumn()); } - + return true; } - - + + /* * We support two ways of setting the value in a #set($ref.foo = $value ) : * 1) ref.setFoo( value ) @@ -816,13 +816,13 @@ public class ASTReference extends Simple { if (strictEscape) { - // If we are in strict escape mode, then we consider this type of + // If we are in strict escape mode, then we consider this type of // pattern a non-reference, and we print it out as schmoo... nullString = literal(); escaped = true; return nullString; } - + /* * lets do all the work here. I would argue that if this occurrs, * it's not a reference at all, so preceeding \ characters in front @@ -941,7 +941,7 @@ public class ASTReference extends Simple * we are working with. */ - // FIXME: this is the key to render nulls as literals, we need to look at context(refname+".literal") + // FIXME: this is the key to render nulls as literals, we need to look at context(refname+".literal") nullString = literal(); if (t.image.startsWith("$!")) @@ -1010,7 +1010,7 @@ public class ASTReference extends Simple * @return The evaluated value of the variable. * @throws MethodInvocationException */ - public Object getVariableValue(InternalContextAdapter context, String variable) + public Object getVariableValue(InternalContextAdapter context, String variable) { Object obj = null; try @@ -1023,7 +1023,7 @@ public class ASTReference extends Simple variable, StringUtils.formatFileString(uberInfo)); throw e; } - + if (obj == null && strictRef) { if (!context.containsKey(variable)) @@ -1032,9 +1032,9 @@ public class ASTReference extends Simple variable, StringUtils.formatFileString(uberInfo)); throw new MethodInvocationException("Variable $" + variable + " has not been set", null, identifier, - uberInfo.getTemplateName(), uberInfo.getLine(), uberInfo.getColumn()); + uberInfo.getTemplateName(), uberInfo.getLine(), uberInfo.getColumn()); } } - return obj; + return obj; } } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.event.EventHandlerUtil; @@ -106,9 +106,9 @@ public class ASTSetDirective extends Sim /* * init the tree correctly */ - + super.init( context, data ); - + /* * handle '$' and '#' chars prefix */ @@ -126,12 +126,12 @@ public class ASTSetDirective extends Sim uberInfo = new Info(getTemplateName(), getLine(), getColumn()); - + right = getRightHandSide(); left = getLeftHandSide(); - + strictRef = rsvc.getBoolean(RuntimeConstants.RUNTIME_REFERENCES_STRICT, false); - + /* * grab this now. No need to redo each time */ @@ -160,10 +160,10 @@ public class ASTSetDirective extends Sim } isInitialized = true; - + cleanupParserAndTokens(); } - + return data; } @@ -251,11 +251,11 @@ public class ASTSetDirective extends Sim return left.setValue(context, value); } - - + + /** * returns the ASTReference that is the LHS of the set statememt - * + * * @return left hand side of #set statement */ private ASTReference getLeftHandSide() @@ -265,7 +265,7 @@ public class ASTSetDirective extends Sim /** * returns the RHS Node of the set statement - * + * * @return right hand side of #set statement */ private Node getRightHandSide() Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -64,6 +64,3 @@ public class ASTSubtractNode extends AST return MathUtils.subtract(left, right); } } - - - Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -91,7 +91,7 @@ public class ASTText extends SimpleNode } builder.append(NodeUtils.tokenLiteral(t)); ctext = builder.toString(); - + cleanupParserAndTokens(); return data; @@ -107,10 +107,3 @@ public class ASTText extends SimpleNode return true; } } - - - - - - - Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -71,17 +71,17 @@ public class ASTTextblock extends Simple throws TemplateInitException { Token t = getFirstToken(); - + String text = t.image; - + // t.image is in format: #[[ <string> ]]# // we must strip away the hash tags text = text.substring(START.length(), text.length() - END.length()); ctext = text.toCharArray(); - + cleanupParserAndTokens(); - + return data; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -70,7 +70,7 @@ public class ASTTrue extends SimpleNode { return value; } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -53,7 +53,7 @@ public class ASTVariable extends SimpleN { return visitor.visit(this, data); } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -52,7 +52,7 @@ public class ASTWord extends SimpleNode { return visitor.visit(this, data); } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.context.InternalContextAdapter; @@ -52,7 +52,7 @@ public class ASTprocess extends SimpleNo { return visitor.visit(this, data); } - + /** * @throws TemplateInitException * @see org.apache.velocity.runtime.parser.node.Node#init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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/runtime/parser/node/BooleanPropertyExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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; @@ -95,7 +95,7 @@ public class BooleanPropertyExecutor ext setMethod(getIntrospector().getMethod(clazz, sb.toString(), params)); } - + if (isAlive()) { if( getMethod().getReturnType() != Boolean.TYPE && Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/GetExecutor.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapGetExecutor.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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; @@ -27,14 +27,14 @@ import java.util.Map; /** * GetExecutor that is smart about Maps. If it detects one, it does not - * use Reflection but a cast to access the getter. + * use Reflection but a cast to access the getter. * * @author <a href="mailto:henn...@apache.org";>Henning P. Schmiedehausen</a> * @version $Id$ * @since 1.5 */ public class MapGetExecutor - extends AbstractExecutor + extends AbstractExecutor { private final String property; private final boolean isAlive; @@ -101,5 +101,5 @@ public class MapGetExecutor { return instance; } - } + } } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MapSetExecutor.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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; @@ -26,14 +26,14 @@ import java.util.Map; /** * SetExecutor that is smart about Maps. If it detects one, it does not - * use Reflection but a cast to access the setter. + * use Reflection but a cast to access the setter. * * @author <a href="mailto:henn...@apache.org";>Henning P. Schmiedehausen</a> * @version $Id$ * @since 1.5 */ public class MapSetExecutor - extends SetExecutor + extends SetExecutor { private final String property; @@ -79,5 +79,5 @@ public class MapSetExecutor public Object execute(final Object o, final Object arg) { return ((Map) o).put(property, arg); - } + } } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/MathUtils.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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.math.BigDecimal; @@ -218,7 +218,7 @@ public abstract class MathUtils /** * Wrap the result in the object of the bigger type. - * + * * @param value result of operation (as a long) - used to check size * @param op1 first operand of binary operation * @param op2 second operand of binary operation @@ -235,7 +235,7 @@ public abstract class MathUtils /** * Find the common Number-type to be used in calculations. - * + * * @param op1 first operand of binary operation * @param op2 second operand of binary operation * @return constant indicating type of Number to use in calculations Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PutExecutor.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetExecutor.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.pars * "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/runtime/resource/ContentResource.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ContentResource.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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.ResourceNotFoundException; @@ -43,7 +43,7 @@ public class ContentResource extends Res public ContentResource() { super(); - + setType(ResourceManager.RESOURCE_CONTENT); } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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.ParseErrorException; @@ -272,7 +272,7 @@ public abstract class Resource { return data; } - + /** * Sets the type of this Resource (RESOURCE_TEMPLATE or RESOURCE_CONTENT) * @since 1.6 @@ -281,7 +281,7 @@ public abstract class Resource { this.type = type; } - + /** * @return type code of the Resource * @since 1.6 Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCache.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCache.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCache.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCache.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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.RuntimeServices; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceFactory.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceFactory.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceFactory.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceFactory.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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.ParseErrorException; @@ -79,5 +79,3 @@ public interface ResourceManager public String getLoaderNameForResource(String resourceName ); } - - 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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.ResourceNotFoundException; @@ -170,10 +170,3 @@ public class JarHolder return urlpath; } } - - - - - - - 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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.ResourceNotFoundException; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.reso * "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; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResource.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResource.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResource.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResource.java Thu Jan 26 01:57:00 2017 @@ -32,7 +32,7 @@ public final class StringResource { /** template body */ private String body; - + /** encoding */ private String encoding; @@ -88,7 +88,7 @@ public final class StringResource /** * Returns the encoding of this String resource. - * + * * @return The encoding of this String resource. */ public String getEncoding() { @@ -97,7 +97,7 @@ public final class StringResource /** * Sets the encoding of this string resource. - * + * * @param encoding The new encoding of this resource. */ public void setEncoding(final String encoding) Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepository.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepository.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepository.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepository.java Thu Jan 26 01:57:00 2017 @@ -58,18 +58,18 @@ public interface StringResourceRepositor * @param name The string name to remove from the repository. */ void removeStringResource(String name); - + /** * Sets the default encoding of the repository. Encodings can also be stored per * template string. The default implementation does this correctly. - * + * * @param encoding The encoding to use. */ void setEncoding(String encoding); - + /** * Returns the current encoding of this repository. - * + * * @return The current encoding of this repository. */ String getEncoding(); 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -46,7 +46,7 @@ public class StringResourceRepositoryImp * Current Repository encoding. */ private String encoding = RuntimeConstants.ENCODING_DEFAULT; - + /** * @see StringResourceRepository#getStringResource(java.lang.String) */ 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.visi * "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.context.InternalContextAdapter; 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.runtime.visi * "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.Token; 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=1780307&r1=1780306&r2=1780307&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 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 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=1780307&r1=1780306&r2=1780307&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 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.context.InternalContextAdapter; @@ -168,7 +168,7 @@ public class ClassUtils { * @param node ASTNode, used for error reporting. * @param strictRef If no method is found, throw an exception, never return null in this case * @return VelMethod object if the object is found, null if not matching method is found - */ + */ public static VelMethod getMethod(String methodName, Object[] params, Class[] paramClasses, Object o, InternalContextAdapter context, SimpleNode node, boolean strictRef) @@ -193,7 +193,7 @@ public class ClassUtils { * get the method from the cache */ method = (VelMethod) icd.thingy; - } + } else { /* @@ -233,14 +233,14 @@ public class ClassUtils { + o.getClass().getName() + "' does not contain method " + methodName + "(" + plist + ")", null, methodName, node .getTemplateName(), node.getLine(), node.getColumn()); - } + } else { return null; } } - } + } catch (MethodInvocationException mie) { /* @@ -250,14 +250,14 @@ public class ClassUtils { */ throw mie; - } + } catch (RuntimeException e) { /** * pass through application level runtime exceptions */ throw e; - } + } catch (Exception e) { /* @@ -269,5 +269,5 @@ public class ClassUtils { return method; } - + } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ContextAware.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ContextAware.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ContextAware.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ContextAware.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.context.Context; 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=1780307&r1=1780306&r2=1780307&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 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 java.lang.reflect.Array; 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=1780307&r1=1780306&r2=1780307&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 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 java.util.Enumeration; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/Pair.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/Pair.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/Pair.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/Pair.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/RuntimeServicesAware.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/RuntimeServicesAware.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/RuntimeServicesAware.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/RuntimeServicesAware.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.RuntimeServices; @@ -24,7 +24,7 @@ import org.apache.velocity.runtime.Runti /** * Use this interface to automatically - * have the method setRuntimeServices called at initialization. + * have the method setRuntimeServices called at initialization. * Applies to EventHandler and Uberspect implementations. * * @author <a href="mailto:wglass@wgl...@forio.com";>Will Glass-Husain</a> Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/SimplePool.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/SimplePool.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/SimplePool.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/SimplePool.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. */ /**
