geirm 01/03/19 10:27:21
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTAddNode.java ASTAssignment.java ASTComment.java
ASTDivNode.java
Log:
license, date and wrap : no functional
Revision Changes Path
1.5 +3 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java
Index: ASTAddNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASTAddNode.java 2001/03/19 17:17:43 1.4
+++ ASTAddNode.java 2001/03/19 18:27:17 1.5
@@ -63,7 +63,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTAddNode.java,v 1.4 2001/03/19 17:17:43 geirm Exp $
+ * @version $Id: ASTAddNode.java,v 1.5 2001/03/19 18:27:17 geirm Exp $
*/
import org.apache.velocity.context.InternalContextAdapter;
@@ -111,7 +111,8 @@
if (left == null || right == null)
{
- Runtime.error( ( left == null ? "Left" : "Right" ) + " side of addition
operation has null value."
+ Runtime.error( ( left == null ? "Left" : "Right" )
+ + " side of addition operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " +
getLine()
+ ", column " + getColumn() + "]");
1.3 +3 -4
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java
Index: ASTAssignment.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTAssignment.java 2001/01/03 05:23:22 1.2
+++ ASTAssignment.java 2001/03/19 18:27:17 1.3
@@ -1,9 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTAssignment.java */
+package org.apache.velocity.runtime.parser.node;
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-package org.apache.velocity.runtime.parser.node;
import org.apache.velocity.runtime.parser.Parser;
1.3 +4 -5
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java
Index: ASTComment.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTComment.java 2001/01/03 05:24:33 1.2
+++ ASTComment.java 2001/03/19 18:27:18 1.3
@@ -1,8 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTComment.java */
+package org.apache.velocity.runtime.parser.node;
+
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -52,8 +53,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
-package org.apache.velocity.runtime.parser.node;
import org.apache.velocity.runtime.parser.Parser;
1.5 +5 -5
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java
Index: ASTDivNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASTDivNode.java 2001/03/19 17:17:45 1.4
+++ ASTDivNode.java 2001/03/19 18:27:19 1.5
@@ -1,7 +1,5 @@
package org.apache.velocity.runtime.parser.node;
-/* Generated By:JJTree: Do not edit this line. ASTDivNode.java */
-
/*
* The Apache Software License, Version 1.1
*
@@ -70,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTDivNode.java,v 1.4 2001/03/19 17:17:45 geirm Exp $
+ * @version $Id: ASTDivNode.java,v 1.5 2001/03/19 18:27:19 geirm Exp $
*/
public class ASTDivNode extends SimpleNode
{
@@ -111,9 +109,11 @@
if (left == null || right == null)
{
- Runtime.error( ( left == null ? "Left" : "Right" ) + " side of division
operation has null value."
+ Runtime.error( ( left == null ? "Left" : "Right" )
+ + " side of division operation has null value."
+ " Operation not possible. "
- + context.getCurrentTemplateName() + " [line " +
getLine()
+ + context.getCurrentTemplateName()
+ + " [line " + getLine()
+ ", column " + getColumn() + "]");
return null;
}
