You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by dl...@apache.org on 2005/06/22 01:22:27 UTC
svn commit: r191743 [2/5] - in /jakarta/velocity/core/trunk: build/xsl/
contrib/temporary/localdirective/ contrib/temporary/stderrlogsystem/
contrib/temporary/struts-velocity/
contrib/temporary/struts-velocity/src/java/org/apache/velocity/struts/
contr...
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalEventContext.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalEventContext.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalEventContext.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalEventContext.java Tue Jun 21 16:22:20 2005
@@ -26,7 +26,7 @@
* of the .context package.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: InternalEventContext.java,v 1.4 2004/03/19 17:13:33 dlr Exp $
+ * @version $Id$
*/
public interface InternalEventContext
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/InternalWrapperContext.java Tue Jun 21 16:22:20 2005
@@ -20,7 +20,7 @@
* interface for internal context wrapping functionality
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: InternalWrapperContext.java,v 1.4 2004/03/19 17:13:33 dlr Exp $
+ * @version $Id$
*/
public interface InternalWrapperContext
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/convert/WebMacro.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/convert/WebMacro.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/convert/WebMacro.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/convert/WebMacro.java Tue Jun 21 16:22:20 2005
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: WebMacro.java,v 1.22 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class WebMacro
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/MethodInvocationException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/MethodInvocationException.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/MethodInvocationException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/MethodInvocationException.java Tue Jun 21 16:22:20 2005
@@ -25,7 +25,7 @@
* information, consult the runtime log.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: MethodInvocationException.java,v 1.4 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class MethodInvocationException extends VelocityException
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java Tue Jun 21 16:22:20 2005
@@ -25,7 +25,7 @@
* information, consult the runtime log.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ParseErrorException.java,v 1.4 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class ParseErrorException extends VelocityException
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ResourceNotFoundException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ResourceNotFoundException.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ResourceNotFoundException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ResourceNotFoundException.java Tue Jun 21 16:22:20 2005
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: ResourceNotFoundException.java,v 1.5 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class ResourceNotFoundException extends VelocityException
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/VelocityException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/VelocityException.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/VelocityException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/VelocityException.java Tue Jun 21 16:22:20 2005
@@ -21,7 +21,7 @@
* application layer.
*
* @author <a href="mailto:kdowney@amberarcher.com">Kyle F. Downey</a>
- * @version $Id: VelocityException.java,v 1.4 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class VelocityException extends Exception
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java Tue Jun 21 16:22:20 2005
@@ -26,7 +26,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author Anil K. Vijendran
- * @version $Id: VelocityWriter.java,v 1.12 2004/03/20 03:35:50 dlr Exp $
+ * @version $Id$
*/
public final class VelocityWriter extends Writer
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/Runtime.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/Runtime.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/Runtime.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/Runtime.java Tue Jun 21 16:22:20 2005
@@ -85,7 +85,7 @@
* @see org.apache.velocity.runtime.RuntimeSingleton
* @deprecated Use RuntimeInstance or RuntimeSingleton instead.
*
- * @version $Id: Runtime.java,v 1.118 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class Runtime implements RuntimeConstants
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeLogger.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeLogger.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeLogger.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeLogger.java Tue Jun 21 16:22:20 2005
@@ -20,7 +20,7 @@
* Interface for internal runtime logging services that are needed by the
*
* @author <a href="mailto:geirm@apache.org">Geir Magusson Jr.</a>
- * @version $Id: RuntimeLogger.java,v 1.3 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public interface RuntimeLogger
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeServices.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeServices.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeServices.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeServices.java Tue Jun 21 16:22:20 2005
@@ -45,7 +45,7 @@
* Currently implemented by RuntimeInstance.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magusson Jr.</a>
- * @version $Id: RuntimeServices.java,v 1.9 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public interface RuntimeServices extends RuntimeLogger
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeSingleton.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeSingleton.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeSingleton.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeSingleton.java Tue Jun 21 16:22:20 2005
@@ -88,7 +88,7 @@
*
* @see org.apache.velocity.runtime.RuntimeInstance
*
- * @version $Id: RuntimeSingleton.java,v 1.9 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class RuntimeSingleton implements RuntimeConstants
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java Tue Jun 21 16:22:20 2005
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="mailto:JFernandez@viquity.com">Jose Alberto Fernandez</a>
- * @version $Id: VelocimacroManager.java,v 1.19 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class VelocimacroManager
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/compiler/Compiler.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/compiler/Compiler.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/compiler/Compiler.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/compiler/Compiler.java Tue Jun 21 16:22:20 2005
@@ -23,7 +23,7 @@
* The start of a velocity template compiler. Incomplete.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: Compiler.java,v 1.8 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public class Compiler implements InstructionConstants
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java Tue Jun 21 16:22:20 2005
@@ -126,7 +126,7 @@
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
* @author <a href="mailto:kjohnson@transparent.com>Kent Johnson</a>
- * @version $Id: Configuration.java,v 1.36 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*
* @deprecated As of version 1.1, please use ExtendedProperties from
* the Jakarta Commons Collections component.
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Directive.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Directive.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Directive.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Directive.java Tue Jun 21 16:22:20 2005
@@ -33,7 +33,7 @@
* Base class for all directives used in Velocity.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: Directive.java,v 1.20 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public abstract class Directive implements DirectiveConstants, Cloneable
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/DirectiveConstants.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/DirectiveConstants.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/DirectiveConstants.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/DirectiveConstants.java Tue Jun 21 16:22:20 2005
@@ -20,7 +20,7 @@
* Base class for all directives used in Velocity.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: DirectiveConstants.java,v 1.6 2004/03/19 17:13:34 dlr Exp $
+ * @version $Id$
*/
public interface DirectiveConstants
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java Tue Jun 21 16:22:20 2005
@@ -63,7 +63,7 @@
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:kav@kav.dk">Kasper Nielsen</a>
- * @version $Id: Include.java,v 1.28 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class Include extends InputBase
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java Tue Jun 21 16:22:20 2005
@@ -30,7 +30,7 @@
* that during render().
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: Literal.java,v 1.9 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class Literal extends Directive
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java Tue Jun 21 16:22:20 2005
@@ -24,7 +24,7 @@
* For internal use in parser - not to be passed to app level
*
* @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
- * @version $Id: MacroParseException.java,v 1.3 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class MacroParseException extends ParseException
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java Tue Jun 21 16:22:20 2005
@@ -51,7 +51,7 @@
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:Christoph.Reck@dlr.de">Christoph Reck</a>
- * @version $Id: Parse.java,v 1.29 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class Parse extends InputBase
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/ParseDirectiveException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/ParseDirectiveException.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/ParseDirectiveException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/ParseDirectiveException.java Tue Jun 21 16:22:20 2005
@@ -22,7 +22,7 @@
* Exception for #parse() problems
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ParseDirectiveException.java,v 1.6 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class ParseDirectiveException extends Exception
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java Tue Jun 21 16:22:20 2005
@@ -42,7 +42,7 @@
* a proxy Directive-derived object to fit with the current directive system
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: VelocimacroProxy.java,v 1.29 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class VelocimacroProxy extends Directive
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/exception/ReferenceException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/exception/ReferenceException.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/exception/ReferenceException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/exception/ReferenceException.java Tue Jun 21 16:22:20 2005
@@ -22,7 +22,7 @@
* Exception thrown when a bad reference is found.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ReferenceException.java,v 1.7 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class ReferenceException extends Exception
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java Tue Jun 21 16:22:20 2005
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: AvalonLogSystem.java,v 1.14 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class AvalonLogSystem implements LogSystem
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java Tue Jun 21 16:22:20 2005
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:geirm@apache.org>Geir Magnusson Jr.</a>
* @author <a href="mailto:dlr@finemaltcoding.com>Daniel L. Rall</a>
- * @version $Id: Log4JLogSystem.java,v 1.14 2004/03/20 03:35:50 dlr Exp $
+ * @version $Id$
* @since Velocity 1.5
*/
public class Log4JLogSystem implements LogSystem
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogSystem.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogSystem.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogSystem.java Tue Jun 21 16:22:20 2005
@@ -23,7 +23,7 @@
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: LogSystem.java,v 1.9 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public interface LogSystem
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/NullLogSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/NullLogSystem.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/NullLogSystem.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/NullLogSystem.java Tue Jun 21 16:22:20 2005
@@ -22,7 +22,7 @@
* Logger used in case of failure. Does nothing.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: NullLogSystem.java,v 1.3 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class NullLogSystem implements LogSystem
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java Tue Jun 21 16:22:20 2005
@@ -28,7 +28,7 @@
* know as this was a good idea...
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: PrimordialLogSystem.java,v 1.6 2004/03/19 17:13:35 dlr Exp $
+ * @version $Id$
*/
public class PrimordialLogSystem implements LogSystem
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java Tue Jun 21 16:22:20 2005
@@ -39,7 +39,7 @@
* version :)
*
* @author <a href="mailto:geirm@apache.org>Geir Magnusson Jr.</a>
- * @version $Id: SimpleLog4JLogSystem.java,v 1.11 2004/05/21 09:39:57 geirm Exp $
+ * @version $Id$
* @deprecated Use Log4JLogSystem instead for compatibility with
* modern Log4J versions.
*/
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java Tue Jun 21 16:22:20 2005
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTAndNode.java,v 1.10 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTAndNode extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java Tue Jun 21 16:22:20 2005
@@ -36,7 +36,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTElseIfStatement.java,v 1.11 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTElseIfStatement extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java Tue Jun 21 16:22:20 2005
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTElseStatement.java,v 1.10 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTElseStatement extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java Tue Jun 21 16:22:20 2005
@@ -1,92 +1,92 @@
-package org.apache.velocity.runtime.parser.node;
-
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-
-import java.math.BigDecimal;
-
-
-/**
- * Handles floating point numbers. The value will be either a Double
- * or a BigDecimal.
- *
- * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
- */
-public class ASTFloatingPointLiteral extends SimpleNode
-{
-
- // This may be of type Double or BigDecimal
- private Number value = null;
-
- public ASTFloatingPointLiteral(int id)
- {
- super(id);
- }
-
- public ASTFloatingPointLiteral(Parser p, int id)
- {
- super(p, id);
- }
-
-
- /** Accept the visitor. **/
- public Object jjtAccept(ParserVisitor visitor, Object data)
- {
- return visitor.visit(this, data);
- }
-
- /**
- * Initialization method - doesn't do much but do the object
- * creation. We only need to do it once.
- */
- public Object init( InternalContextAdapter context, Object data)
- throws Exception
- {
- /*
- * init the tree correctly
- */
-
- super.init( context, data );
-
- /**
- * Determine the size of the item and make it a Double or BigDecimal as appropriate.
- */
- String str = getFirstToken().image;
- try
- {
- value = new Double( str );
-
- } catch ( NumberFormatException E1 )
- {
-
- // if there's still an Exception it will propogate out
- value = new BigDecimal( str );
-
- }
-
- return data;
- }
-
- public Object value( InternalContextAdapter context)
- {
- return value;
- }
-
-
-}
+package org.apache.velocity.runtime.parser.node;
+
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.Parser;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Handles floating point numbers. The value will be either a Double
+ * or a BigDecimal.
+ *
+ * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
+ */
+public class ASTFloatingPointLiteral extends SimpleNode
+{
+
+ // This may be of type Double or BigDecimal
+ private Number value = null;
+
+ public ASTFloatingPointLiteral(int id)
+ {
+ super(id);
+ }
+
+ public ASTFloatingPointLiteral(Parser p, int id)
+ {
+ super(p, id);
+ }
+
+
+ /** Accept the visitor. **/
+ public Object jjtAccept(ParserVisitor visitor, Object data)
+ {
+ return visitor.visit(this, data);
+ }
+
+ /**
+ * Initialization method - doesn't do much but do the object
+ * creation. We only need to do it once.
+ */
+ public Object init( InternalContextAdapter context, Object data)
+ throws Exception
+ {
+ /*
+ * init the tree correctly
+ */
+
+ super.init( context, data );
+
+ /**
+ * Determine the size of the item and make it a Double or BigDecimal as appropriate.
+ */
+ String str = getFirstToken().image;
+ try
+ {
+ value = new Double( str );
+
+ } catch ( NumberFormatException E1 )
+ {
+
+ // if there's still an Exception it will propogate out
+ value = new BigDecimal( str );
+
+ }
+
+ return data;
+ }
+
+ public Object value( InternalContextAdapter context)
+ {
+ return value;
+ }
+
+
+}
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java Tue Jun 21 16:22:20 2005
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTIdentifier.java,v 1.21 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTIdentifier extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java Tue Jun 21 16:22:20 2005
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTIfStatement.java,v 1.11 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java Tue Jun 21 16:22:20 2005
@@ -1,95 +1,95 @@
-package org.apache.velocity.runtime.parser.node;
-
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import java.math.BigInteger;
-
-/**
- * Handles integer numbers. The value will be either an Integer, a Long, or a BigInteger.
- *
- * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
- */
-public class ASTIntegerLiteral extends SimpleNode
-{
-
- // This may be of type Integer, Long or BigInteger
- private Number value = null;
-
- public ASTIntegerLiteral(int id)
- {
- super(id);
- }
-
- public ASTIntegerLiteral(Parser p, int id)
- {
- super(p, id);
- }
-
- /** Accept the visitor. **/
- public Object jjtAccept(ParserVisitor visitor, Object data)
- {
- return visitor.visit(this, data);
- }
-
- /**
- * Initialization method - doesn't do much but do the object
- * creation. We only need to do it once.
- */
- public Object init( InternalContextAdapter context, Object data)
- throws Exception
- {
- /*
- * init the tree correctly
- */
-
- super.init( context, data );
-
- /**
- * Determine the size of the item and make it an Integer, Long, or BigInteger as appropriate.
- */
- String str = getFirstToken().image;
- try
- {
- value = new Integer( str );
- }
- catch ( NumberFormatException E1 )
- {
- try
- {
-
- value = new Long( str );
-
- }
- catch ( NumberFormatException E2 )
- {
-
- // if there's still an Exception it will propogate out
- value = new BigInteger( str );
- }
- }
-
- return data;
- }
-
- public Object value( InternalContextAdapter context)
- {
- return value;
- }
-
-}
+package org.apache.velocity.runtime.parser.node;
+
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.Parser;
+import java.math.BigInteger;
+
+/**
+ * Handles integer numbers. The value will be either an Integer, a Long, or a BigInteger.
+ *
+ * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
+ */
+public class ASTIntegerLiteral extends SimpleNode
+{
+
+ // This may be of type Integer, Long or BigInteger
+ private Number value = null;
+
+ public ASTIntegerLiteral(int id)
+ {
+ super(id);
+ }
+
+ public ASTIntegerLiteral(Parser p, int id)
+ {
+ super(p, id);
+ }
+
+ /** Accept the visitor. **/
+ public Object jjtAccept(ParserVisitor visitor, Object data)
+ {
+ return visitor.visit(this, data);
+ }
+
+ /**
+ * Initialization method - doesn't do much but do the object
+ * creation. We only need to do it once.
+ */
+ public Object init( InternalContextAdapter context, Object data)
+ throws Exception
+ {
+ /*
+ * init the tree correctly
+ */
+
+ super.init( context, data );
+
+ /**
+ * Determine the size of the item and make it an Integer, Long, or BigInteger as appropriate.
+ */
+ String str = getFirstToken().image;
+ try
+ {
+ value = new Integer( str );
+ }
+ catch ( NumberFormatException E1 )
+ {
+ try
+ {
+
+ value = new Long( str );
+
+ }
+ catch ( NumberFormatException E2 )
+ {
+
+ // if there's still an Exception it will propogate out
+ value = new BigInteger( str );
+ }
+ }
+
+ return data;
+ }
+
+ public Object value( InternalContextAdapter context)
+ {
+ return value;
+ }
+
+}
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java Tue Jun 21 16:22:20 2005
@@ -29,7 +29,7 @@
*
* This class was originally generated from Parset.jjt.
*
- * @version $Id: ASTMap.java,v 1.2 2004/02/27 18:43:17 dlr Exp $
+ * @version $Id$
*/
public class ASTMap extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java Tue Jun 21 16:22:20 2005
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTOrNode.java,v 1.8 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTOrNode extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java Tue Jun 21 16:22:20 2005
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTSetDirective.java,v 1.24 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTSetDirective extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java Tue Jun 21 16:22:20 2005
@@ -1,67 +1,67 @@
-package org.apache.velocity.runtime.parser.node;
-
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.Writer;
-import java.io.IOException;
-
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
-
-/**
- * This class is responsible for handling the #stop directive
- *
- * Please look at the Parser.jjt file which is
- * what controls the generation of this class.
- *
- * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
- * @version $Id$
- */
-public class ASTStop extends SimpleNode
-{
- public ASTStop(int id)
- {
- super(id);
- }
-
- public ASTStop(Parser p, int id)
- {
- super(p, id);
- }
-
- /** Accept the visitor. **/
- public Object jjtAccept(ParserVisitor visitor, Object data)
- {
- return visitor.visit(this, data);
- }
-
- /**
- * Do not output anything, just shut off the rendering.
- */
- public boolean render( InternalContextAdapter context, Writer writer)
- throws IOException, MethodInvocationException, ParseErrorException, ResourceNotFoundException
- {
- context.setAllowRendering(false);
-
- return true;
- }
-}
-
+package org.apache.velocity.runtime.parser.node;
+
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.Writer;
+import java.io.IOException;
+
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.Parser;
+
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+
+/**
+ * This class is responsible for handling the #stop directive
+ *
+ * Please look at the Parser.jjt file which is
+ * what controls the generation of this class.
+ *
+ * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
+ * @version $Id$
+ */
+public class ASTStop extends SimpleNode
+{
+ public ASTStop(int id)
+ {
+ super(id);
+ }
+
+ public ASTStop(Parser p, int id)
+ {
+ super(p, id);
+ }
+
+ /** Accept the visitor. **/
+ public Object jjtAccept(ParserVisitor visitor, Object data)
+ {
+ return visitor.visit(this, data);
+ }
+
+ /**
+ * Do not output anything, just shut off the rendering.
+ */
+ public boolean render( InternalContextAdapter context, Writer writer)
+ throws IOException, MethodInvocationException, ParseErrorException, ResourceNotFoundException
+ {
+ context.setAllowRendering(false);
+
+ return true;
+ }
+}
+
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java Tue Jun 21 16:22:20 2005
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: ASTStringLiteral.java,v 1.19 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class ASTStringLiteral extends SimpleNode
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java Tue Jun 21 16:22:20 2005
@@ -29,7 +29,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
- * @version $Id: AbstractExecutor.java,v 1.14 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public abstract class AbstractExecutor
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java Tue Jun 21 16:22:20 2005
@@ -30,7 +30,7 @@
* by is<Property>
*
* @author <a href="geirm@apache.org">Geir Magnusson Jr.</a>
- * @version $Id: BooleanPropertyExecutor.java,v 1.5 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class BooleanPropertyExecutor extends PropertyExecutor
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java Tue Jun 21 16:22:20 2005
@@ -32,7 +32,7 @@
* the case.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: GetExecutor.java,v 1.10 2004/03/19 17:13:36 dlr Exp $
+ * @version $Id$
*/
public class GetExecutor extends AbstractExecutor
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java Tue Jun 21 16:22:20 2005
@@ -1,444 +1,444 @@
-package org.apache.velocity.runtime.parser.node;
-
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * Utility-class for all arithmetic-operations.<br><br>
- *
- * All operations (+ - / *) return a Number which type is the type of the bigger argument.<br>
- * Example:<br>
- * <code>add ( new Integer(10), new Integer(1))</code> will return an <code>Integer</code>-Object with the value 11<br>
- * <code>add ( new Long(10), new Integer(1))</code> will return an <code>Long</code>-Object with the value 11<br>
- * <code>add ( new Integer(10), new Float(1))</code> will return an <code>Float</code>-Object with the value 11<br><br>
- *
- * Overflow checking:<br>
- * For integral values (byte, short, int) there is an implicit overflow correction (the next "bigger"
- * type will be returned). For example, if you call <code>add (new Integer (Integer.MAX_VALUE), 1)</code> a
- * <code>Long</code>-object will be returned with the correct value of <code>Integer.MAX_VALUE+1</code>.<br>
- * In addition to that the methods <code>multiply</code>,<code>add</code> and <code>substract</code> implement overflow
- * checks for <code>long</code>-values. That means that if an overflow occurs while working with long values a BigInteger
- * will be returned.<br>
- * For all other operations and types (such as Float and Double) there is no overflow checking.
- *
- * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
- */
-
-public abstract class MathUtils
-{
-
- /**
- * A BigDecimal representing the number 0
- */
- protected static BigDecimal DECIMAL_ZERO = new BigDecimal ( 0 );
- protected static BigInteger INT_ZERO = BigInteger.valueOf( 0 );
-
- /**
- * The constants are used to determine in which context we have to calculate.
- */
- protected static final int BASE_LONG = 0;
- protected static final int BASE_FLOAT = 1;
- protected static final int BASE_DOUBLE = 2;
- protected static final int BASE_BIGINTEGER = 3;
- protected static final int BASE_BIGDECIMAL = 4;
-
- /**
- * The <code>Class</code>-object is key, the maximum-value is the value
- */
- protected static Map ints = new HashMap();
- static
- {
- ints.put (Byte.class, BigDecimal.valueOf (Byte.MAX_VALUE));
- ints.put (Short.class, BigDecimal.valueOf (Short.MAX_VALUE));
- ints.put (Integer.class, BigDecimal.valueOf (Integer.MAX_VALUE));
- ints.put (Long.class, BigDecimal.valueOf (Long.MAX_VALUE));
- ints.put (BigInteger.class, BigDecimal.valueOf (-1));
- }
-
- /**
- * The "size" of the number-types - ascending.
- */
- protected static List typesBySize = new ArrayList();
- static
- {
- typesBySize.add (Byte.class);
- typesBySize.add (Short.class);
- typesBySize.add (Integer.class);
- typesBySize.add (Long.class);
- typesBySize.add (Float.class);
- typesBySize.add (Double.class);
- }
-
- /**
- * Convert the given Number to a BigDecimal
- */
- public static BigDecimal toBigDecimal (Number n)
- {
-
- if (n instanceof BigDecimal)
- {
- return (BigDecimal)n;
- }
-
- if (n instanceof BigInteger)
- {
- return new BigDecimal ( (BigInteger)n );
- }
-
- return new BigDecimal ( ((Number)n).doubleValue() );
-
- }
-
- /**
- * Convert the given Number to a BigInteger
- */
- public static BigInteger toBigInteger (Number n)
- {
-
- if (n instanceof BigInteger)
- {
- return (BigInteger)n;
- }
-
- return BigInteger.valueOf ( ((Number)n).longValue() );
-
- }
-
- /**
- * Compare the given Number to 0.
- */
- public static boolean isZero (Number n)
- {
- if (isInteger( n ) )
- {
- if (n instanceof BigInteger)
- {
- return ((BigInteger)n).compareTo (INT_ZERO) == 0;
- }
- return n.doubleValue() == 0;
- }
- if (n instanceof Float)
- {
- return n.floatValue() == 0f;
- }
- if (n instanceof Double)
- {
- return n.doubleValue() == 0d;
- }
- return toBigDecimal( n ).compareTo( DECIMAL_ZERO) == 0;
- }
-
- /**
- * Test, whether the given object is an integer value
- * (Byte, Short, Integer, Long, BigInteger)
- */
- public static boolean isInteger (Number n)
- {
- return ints.containsKey (n.getClass());
- }
-
- /**
- * Wrap the given primitive into the given class if the value is in the
- * range of the destination type. If not the next bigger type will be chosen.
- */
- public static Number wrapPrimitive (long value, Class type)
- {
- if (type == Byte.class)
- {
- if (value > Byte.MAX_VALUE || value < Byte.MIN_VALUE)
- {
- type = Short.class;
- }
- else
- {
- return new Byte ((byte)value);
- }
- }
- if (type == Short.class)
- {
- if (value > Short.MAX_VALUE || value < Short.MIN_VALUE)
- {
- type = Integer.class;
- }
- else
- {
- return new Short((short)value);
- }
- }
- if (type == Integer.class)
- {
- if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE)
- {
- type = Long.class;
- }
- else
- {
- return new Integer ((int)value);
- }
- }
- if (type == Long.class)
- {
- return new Long (value);
- }
- return BigInteger.valueOf( value);
- }
-
- /**
- * Wrap the result in the object of the bigger type.
- */
- private static Number wrapPrimitive (long value, Number op1, Number op2)
- {
- if ( typesBySize.indexOf( op1.getClass()) > typesBySize.indexOf( op2.getClass()))
- {
- return wrapPrimitive( value, op1.getClass());
- }
- return wrapPrimitive( value, op2.getClass());
- }
-
- /**
- * Find the common Number-type to be used in calculations.
- */
- private static int findCalculationBase (Number op1, Number op2)
- {
-
- boolean op1Int = isInteger(op1);
- boolean op2Int = isInteger(op2);
-
- if ( (op1 instanceof BigDecimal || op2 instanceof BigDecimal) ||
- ( (!op1Int || !op2Int) && (op1 instanceof BigInteger || op2 instanceof BigInteger)) )
- {
- return BASE_BIGDECIMAL;
- }
-
- if (op1Int && op2Int) {
- if (op1 instanceof BigInteger || op2 instanceof BigInteger)
- {
- return BASE_BIGINTEGER;
- }
- return BASE_LONG;
- }
-
- if ((op1 instanceof Double) || (op2 instanceof Double))
- {
- return BASE_DOUBLE;
- }
- return BASE_FLOAT;
- }
-
- /**
- * Add two numbers and return the correct value / type.
- * Overflow detection is done for integer values (byte, short, int, long) only!
- */
- public static Number add (Number op1, Number op2)
- {
-
- int calcBase = findCalculationBase( op1, op2);
- switch (calcBase)
- {
- case BASE_BIGINTEGER:
- return toBigInteger( op1 ).add( toBigInteger( op2 ));
- case BASE_LONG:
- long l1 = op1.longValue();
- long l2 = op2.longValue();
- long result = l1+l2;
-
- // Overflow check
- if ((result ^ l1) < 0 && (result ^ l2) < 0)
- {
- return toBigInteger( op1).add( toBigInteger( op2));
- }
- return wrapPrimitive( result, op1, op2);
- case BASE_FLOAT:
- return new Float (op1.floatValue()+op2.floatValue());
- case BASE_DOUBLE:
- return new Double (op1.doubleValue()+op2.doubleValue());
-
- // Default is BigDecimal operation
- default:
- return toBigDecimal( op1 ).add( toBigDecimal( op2 ));
- }
- }
-
- /**
- * Subtract two numbers and return the correct value / type.
- * Overflow detection is done for integer values (byte, short, int, long) only!
- */
- public static Number subtract (Number op1, Number op2) {
-
- int calcBase = findCalculationBase( op1, op2);
- switch (calcBase) {
- case BASE_BIGINTEGER:
- return toBigInteger( op1 ).subtract( toBigInteger( op2 ));
- case BASE_LONG:
- long l1 = op1.longValue();
- long l2 = op2.longValue();
- long result = l1-l2;
-
- // Overflow check
- if ((result ^ l1) < 0 && (result ^ ~l2) < 0) {
- return toBigInteger( op1).subtract( toBigInteger( op2));
- }
- return wrapPrimitive( result, op1, op2);
- case BASE_FLOAT:
- return new Float (op1.floatValue()-op2.floatValue());
- case BASE_DOUBLE:
- return new Double (op1.doubleValue()-op2.doubleValue());
-
- // Default is BigDecimal operation
- default:
- return toBigDecimal( op1 ).subtract( toBigDecimal( op2 ));
- }
- }
-
- /**
- * Multiply two numbers and return the correct value / type.
- * Overflow detection is done for integer values (byte, short, int, long) only!
- */
- public static Number multiply (Number op1, Number op2) {
-
- int calcBase = findCalculationBase( op1, op2);
- switch (calcBase) {
- case BASE_BIGINTEGER:
- return toBigInteger( op1 ).multiply( toBigInteger( op2 ));
- case BASE_LONG:
- long l1 = op1.longValue();
- long l2 = op2.longValue();
- long result = l1*l2;
-
- // Overflow detection
- if ((l2 != 0) && (result / l2 != l1)) {
- return toBigInteger( op1).multiply( toBigInteger( op2));
- }
- return wrapPrimitive( result, op1, op2);
- case BASE_FLOAT:
- return new Float (op1.floatValue()*op2.floatValue());
- case BASE_DOUBLE:
- return new Double (op1.doubleValue()*op2.doubleValue());
-
- // Default is BigDecimal operation
- default:
- return toBigDecimal( op1 ).multiply( toBigDecimal( op2 ));
- }
- }
-
- /**
- * Divide two numbers. The result will be returned as Integer-type if and only if
- * both sides of the division operator are Integer-types. Otherwise a Float, Double,
- * or BigDecimal will be returned.
- */
- public static Number divide (Number op1, Number op2) {
-
- int calcBase = findCalculationBase( op1, op2);
- switch (calcBase) {
- case BASE_BIGINTEGER:
- BigInteger b1 = toBigInteger( op1 );
- BigInteger b2 = toBigInteger( op2 );
- return b1.divide( b2);
-
- case BASE_LONG:
- long l1 = op1.longValue();
- long l2 = op2.longValue();
- return wrapPrimitive( l1 / l2, op1, op2);
-
- case BASE_FLOAT:
- return new Float (op1.floatValue()/op2.floatValue());
- case BASE_DOUBLE:
- return new Double (op1.doubleValue()/op2.doubleValue());
-
- // Default is BigDecimal operation
- default:
- return toBigDecimal( op1 ).divide( toBigDecimal( op2 ), BigDecimal.ROUND_HALF_DOWN);
- }
- }
-
- /**
- * Modulo two numbers.
- *
- * @throws ArithmeticException If at least one parameter is a BigDecimal
- */
- public static Number modulo (Number op1, Number op2) throws ArithmeticException {
-
- int calcBase = findCalculationBase( op1, op2);
- switch (calcBase) {
- case BASE_BIGINTEGER:
- return toBigInteger( op1 ).mod( toBigInteger( op2 ));
- case BASE_LONG:
- return wrapPrimitive( op1.longValue() % op2.longValue(), op1, op2);
- case BASE_FLOAT:
- return new Float (op1.floatValue() % op2.floatValue());
- case BASE_DOUBLE:
- return new Double (op1.doubleValue() % op2.doubleValue());
-
- // Default is BigDecimal operation
- default:
- throw new ArithmeticException( "Cannot calculate the modulo of BigDecimals.");
- }
- }
-
- /**
- * Compare two numbers.
- * @return 1 if n1 > n2, -1 if n1 < n2 and 0 if equal.
- */
- public static int compare (Number op1, Number op2) {
-
- int calcBase = findCalculationBase( op1, op2);
- switch (calcBase) {
- case BASE_BIGINTEGER:
- return toBigInteger( op1 ).compareTo( toBigInteger( op2 ));
- case BASE_LONG:
- long l1 = op1.longValue();
- long l2 = op2.longValue();
- if (l1 < l2) {
- return -1;
- }
- if (l1 > l2) {
- return 1;
- }
- return 0;
- case BASE_FLOAT:
- float f1 = op1.floatValue();
- float f2 = op2.floatValue();
- if (f1 < f2) {
- return -1;
- }
- if (f1 > f2) {
- return 1;
- }
- return 0;
- case BASE_DOUBLE:
- double d1 = op1.doubleValue();
- double d2 = op2.doubleValue();
- if (d1 < d2) {
- return -1;
- }
- if (d1 > d2) {
- return 1;
- }
- return 0;
-
- // Default is BigDecimal operation
- default:
- return toBigDecimal( op1 ).compareTo( toBigDecimal ( op2 ));
- }
- }
-}
+package org.apache.velocity.runtime.parser.node;
+
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Utility-class for all arithmetic-operations.<br><br>
+ *
+ * All operations (+ - / *) return a Number which type is the type of the bigger argument.<br>
+ * Example:<br>
+ * <code>add ( new Integer(10), new Integer(1))</code> will return an <code>Integer</code>-Object with the value 11<br>
+ * <code>add ( new Long(10), new Integer(1))</code> will return an <code>Long</code>-Object with the value 11<br>
+ * <code>add ( new Integer(10), new Float(1))</code> will return an <code>Float</code>-Object with the value 11<br><br>
+ *
+ * Overflow checking:<br>
+ * For integral values (byte, short, int) there is an implicit overflow correction (the next "bigger"
+ * type will be returned). For example, if you call <code>add (new Integer (Integer.MAX_VALUE), 1)</code> a
+ * <code>Long</code>-object will be returned with the correct value of <code>Integer.MAX_VALUE+1</code>.<br>
+ * In addition to that the methods <code>multiply</code>,<code>add</code> and <code>substract</code> implement overflow
+ * checks for <code>long</code>-values. That means that if an overflow occurs while working with long values a BigInteger
+ * will be returned.<br>
+ * For all other operations and types (such as Float and Double) there is no overflow checking.
+ *
+ * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
+ */
+
+public abstract class MathUtils
+{
+
+ /**
+ * A BigDecimal representing the number 0
+ */
+ protected static BigDecimal DECIMAL_ZERO = new BigDecimal ( 0 );
+ protected static BigInteger INT_ZERO = BigInteger.valueOf( 0 );
+
+ /**
+ * The constants are used to determine in which context we have to calculate.
+ */
+ protected static final int BASE_LONG = 0;
+ protected static final int BASE_FLOAT = 1;
+ protected static final int BASE_DOUBLE = 2;
+ protected static final int BASE_BIGINTEGER = 3;
+ protected static final int BASE_BIGDECIMAL = 4;
+
+ /**
+ * The <code>Class</code>-object is key, the maximum-value is the value
+ */
+ protected static Map ints = new HashMap();
+ static
+ {
+ ints.put (Byte.class, BigDecimal.valueOf (Byte.MAX_VALUE));
+ ints.put (Short.class, BigDecimal.valueOf (Short.MAX_VALUE));
+ ints.put (Integer.class, BigDecimal.valueOf (Integer.MAX_VALUE));
+ ints.put (Long.class, BigDecimal.valueOf (Long.MAX_VALUE));
+ ints.put (BigInteger.class, BigDecimal.valueOf (-1));
+ }
+
+ /**
+ * The "size" of the number-types - ascending.
+ */
+ protected static List typesBySize = new ArrayList();
+ static
+ {
+ typesBySize.add (Byte.class);
+ typesBySize.add (Short.class);
+ typesBySize.add (Integer.class);
+ typesBySize.add (Long.class);
+ typesBySize.add (Float.class);
+ typesBySize.add (Double.class);
+ }
+
+ /**
+ * Convert the given Number to a BigDecimal
+ */
+ public static BigDecimal toBigDecimal (Number n)
+ {
+
+ if (n instanceof BigDecimal)
+ {
+ return (BigDecimal)n;
+ }
+
+ if (n instanceof BigInteger)
+ {
+ return new BigDecimal ( (BigInteger)n );
+ }
+
+ return new BigDecimal ( ((Number)n).doubleValue() );
+
+ }
+
+ /**
+ * Convert the given Number to a BigInteger
+ */
+ public static BigInteger toBigInteger (Number n)
+ {
+
+ if (n instanceof BigInteger)
+ {
+ return (BigInteger)n;
+ }
+
+ return BigInteger.valueOf ( ((Number)n).longValue() );
+
+ }
+
+ /**
+ * Compare the given Number to 0.
+ */
+ public static boolean isZero (Number n)
+ {
+ if (isInteger( n ) )
+ {
+ if (n instanceof BigInteger)
+ {
+ return ((BigInteger)n).compareTo (INT_ZERO) == 0;
+ }
+ return n.doubleValue() == 0;
+ }
+ if (n instanceof Float)
+ {
+ return n.floatValue() == 0f;
+ }
+ if (n instanceof Double)
+ {
+ return n.doubleValue() == 0d;
+ }
+ return toBigDecimal( n ).compareTo( DECIMAL_ZERO) == 0;
+ }
+
+ /**
+ * Test, whether the given object is an integer value
+ * (Byte, Short, Integer, Long, BigInteger)
+ */
+ public static boolean isInteger (Number n)
+ {
+ return ints.containsKey (n.getClass());
+ }
+
+ /**
+ * Wrap the given primitive into the given class if the value is in the
+ * range of the destination type. If not the next bigger type will be chosen.
+ */
+ public static Number wrapPrimitive (long value, Class type)
+ {
+ if (type == Byte.class)
+ {
+ if (value > Byte.MAX_VALUE || value < Byte.MIN_VALUE)
+ {
+ type = Short.class;
+ }
+ else
+ {
+ return new Byte ((byte)value);
+ }
+ }
+ if (type == Short.class)
+ {
+ if (value > Short.MAX_VALUE || value < Short.MIN_VALUE)
+ {
+ type = Integer.class;
+ }
+ else
+ {
+ return new Short((short)value);
+ }
+ }
+ if (type == Integer.class)
+ {
+ if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE)
+ {
+ type = Long.class;
+ }
+ else
+ {
+ return new Integer ((int)value);
+ }
+ }
+ if (type == Long.class)
+ {
+ return new Long (value);
+ }
+ return BigInteger.valueOf( value);
+ }
+
+ /**
+ * Wrap the result in the object of the bigger type.
+ */
+ private static Number wrapPrimitive (long value, Number op1, Number op2)
+ {
+ if ( typesBySize.indexOf( op1.getClass()) > typesBySize.indexOf( op2.getClass()))
+ {
+ return wrapPrimitive( value, op1.getClass());
+ }
+ return wrapPrimitive( value, op2.getClass());
+ }
+
+ /**
+ * Find the common Number-type to be used in calculations.
+ */
+ private static int findCalculationBase (Number op1, Number op2)
+ {
+
+ boolean op1Int = isInteger(op1);
+ boolean op2Int = isInteger(op2);
+
+ if ( (op1 instanceof BigDecimal || op2 instanceof BigDecimal) ||
+ ( (!op1Int || !op2Int) && (op1 instanceof BigInteger || op2 instanceof BigInteger)) )
+ {
+ return BASE_BIGDECIMAL;
+ }
+
+ if (op1Int && op2Int) {
+ if (op1 instanceof BigInteger || op2 instanceof BigInteger)
+ {
+ return BASE_BIGINTEGER;
+ }
+ return BASE_LONG;
+ }
+
+ if ((op1 instanceof Double) || (op2 instanceof Double))
+ {
+ return BASE_DOUBLE;
+ }
+ return BASE_FLOAT;
+ }
+
+ /**
+ * Add two numbers and return the correct value / type.
+ * Overflow detection is done for integer values (byte, short, int, long) only!
+ */
+ public static Number add (Number op1, Number op2)
+ {
+
+ int calcBase = findCalculationBase( op1, op2);
+ switch (calcBase)
+ {
+ case BASE_BIGINTEGER:
+ return toBigInteger( op1 ).add( toBigInteger( op2 ));
+ case BASE_LONG:
+ long l1 = op1.longValue();
+ long l2 = op2.longValue();
+ long result = l1+l2;
+
+ // Overflow check
+ if ((result ^ l1) < 0 && (result ^ l2) < 0)
+ {
+ return toBigInteger( op1).add( toBigInteger( op2));
+ }
+ return wrapPrimitive( result, op1, op2);
+ case BASE_FLOAT:
+ return new Float (op1.floatValue()+op2.floatValue());
+ case BASE_DOUBLE:
+ return new Double (op1.doubleValue()+op2.doubleValue());
+
+ // Default is BigDecimal operation
+ default:
+ return toBigDecimal( op1 ).add( toBigDecimal( op2 ));
+ }
+ }
+
+ /**
+ * Subtract two numbers and return the correct value / type.
+ * Overflow detection is done for integer values (byte, short, int, long) only!
+ */
+ public static Number subtract (Number op1, Number op2) {
+
+ int calcBase = findCalculationBase( op1, op2);
+ switch (calcBase) {
+ case BASE_BIGINTEGER:
+ return toBigInteger( op1 ).subtract( toBigInteger( op2 ));
+ case BASE_LONG:
+ long l1 = op1.longValue();
+ long l2 = op2.longValue();
+ long result = l1-l2;
+
+ // Overflow check
+ if ((result ^ l1) < 0 && (result ^ ~l2) < 0) {
+ return toBigInteger( op1).subtract( toBigInteger( op2));
+ }
+ return wrapPrimitive( result, op1, op2);
+ case BASE_FLOAT:
+ return new Float (op1.floatValue()-op2.floatValue());
+ case BASE_DOUBLE:
+ return new Double (op1.doubleValue()-op2.doubleValue());
+
+ // Default is BigDecimal operation
+ default:
+ return toBigDecimal( op1 ).subtract( toBigDecimal( op2 ));
+ }
+ }
+
+ /**
+ * Multiply two numbers and return the correct value / type.
+ * Overflow detection is done for integer values (byte, short, int, long) only!
+ */
+ public static Number multiply (Number op1, Number op2) {
+
+ int calcBase = findCalculationBase( op1, op2);
+ switch (calcBase) {
+ case BASE_BIGINTEGER:
+ return toBigInteger( op1 ).multiply( toBigInteger( op2 ));
+ case BASE_LONG:
+ long l1 = op1.longValue();
+ long l2 = op2.longValue();
+ long result = l1*l2;
+
+ // Overflow detection
+ if ((l2 != 0) && (result / l2 != l1)) {
+ return toBigInteger( op1).multiply( toBigInteger( op2));
+ }
+ return wrapPrimitive( result, op1, op2);
+ case BASE_FLOAT:
+ return new Float (op1.floatValue()*op2.floatValue());
+ case BASE_DOUBLE:
+ return new Double (op1.doubleValue()*op2.doubleValue());
+
+ // Default is BigDecimal operation
+ default:
+ return toBigDecimal( op1 ).multiply( toBigDecimal( op2 ));
+ }
+ }
+
+ /**
+ * Divide two numbers. The result will be returned as Integer-type if and only if
+ * both sides of the division operator are Integer-types. Otherwise a Float, Double,
+ * or BigDecimal will be returned.
+ */
+ public static Number divide (Number op1, Number op2) {
+
+ int calcBase = findCalculationBase( op1, op2);
+ switch (calcBase) {
+ case BASE_BIGINTEGER:
+ BigInteger b1 = toBigInteger( op1 );
+ BigInteger b2 = toBigInteger( op2 );
+ return b1.divide( b2);
+
+ case BASE_LONG:
+ long l1 = op1.longValue();
+ long l2 = op2.longValue();
+ return wrapPrimitive( l1 / l2, op1, op2);
+
+ case BASE_FLOAT:
+ return new Float (op1.floatValue()/op2.floatValue());
+ case BASE_DOUBLE:
+ return new Double (op1.doubleValue()/op2.doubleValue());
+
+ // Default is BigDecimal operation
+ default:
+ return toBigDecimal( op1 ).divide( toBigDecimal( op2 ), BigDecimal.ROUND_HALF_DOWN);
+ }
+ }
+
+ /**
+ * Modulo two numbers.
+ *
+ * @throws ArithmeticException If at least one parameter is a BigDecimal
+ */
+ public static Number modulo (Number op1, Number op2) throws ArithmeticException {
+
+ int calcBase = findCalculationBase( op1, op2);
+ switch (calcBase) {
+ case BASE_BIGINTEGER:
+ return toBigInteger( op1 ).mod( toBigInteger( op2 ));
+ case BASE_LONG:
+ return wrapPrimitive( op1.longValue() % op2.longValue(), op1, op2);
+ case BASE_FLOAT:
+ return new Float (op1.floatValue() % op2.floatValue());
+ case BASE_DOUBLE:
+ return new Double (op1.doubleValue() % op2.doubleValue());
+
+ // Default is BigDecimal operation
+ default:
+ throw new ArithmeticException( "Cannot calculate the modulo of BigDecimals.");
+ }
+ }
+
+ /**
+ * Compare two numbers.
+ * @return 1 if n1 > n2, -1 if n1 < n2 and 0 if equal.
+ */
+ public static int compare (Number op1, Number op2) {
+
+ int calcBase = findCalculationBase( op1, op2);
+ switch (calcBase) {
+ case BASE_BIGINTEGER:
+ return toBigInteger( op1 ).compareTo( toBigInteger( op2 ));
+ case BASE_LONG:
+ long l1 = op1.longValue();
+ long l2 = op2.longValue();
+ if (l1 < l2) {
+ return -1;
+ }
+ if (l1 > l2) {
+ return 1;
+ }
+ return 0;
+ case BASE_FLOAT:
+ float f1 = op1.floatValue();
+ float f2 = op2.floatValue();
+ if (f1 < f2) {
+ return -1;
+ }
+ if (f1 > f2) {
+ return 1;
+ }
+ return 0;
+ case BASE_DOUBLE:
+ double d1 = op1.doubleValue();
+ double d2 = op2.doubleValue();
+ if (d1 < d2) {
+ return -1;
+ }
+ if (d1 > d2) {
+ return 1;
+ }
+ return 0;
+
+ // Default is BigDecimal operation
+ default:
+ return toBigDecimal( op1 ).compareTo( toBigDecimal ( op2 ));
+ }
+ }
+}
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ContentResource.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ContentResource.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ContentResource.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ContentResource.java Tue Jun 21 16:22:20 2005
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ContentResource.java,v 1.12 2004/03/19 17:13:37 dlr Exp $
+ * @version $Id$
*/
public class ContentResource extends Resource
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/Resource.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/Resource.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/Resource.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/Resource.java Tue Jun 21 16:22:20 2005
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Resource.java,v 1.16 2004/03/20 03:35:51 dlr Exp $
+ * @version $Id$
*/
public abstract class Resource
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCache.java Tue Jun 21 16:22:20 2005
@@ -24,7 +24,7 @@
* for the included ResourceManager
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ResourceCache.java,v 1.3 2004/03/19 17:13:37 dlr Exp $
+ * @version $Id$
*/
public interface ResourceCache
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java Tue Jun 21 16:22:20 2005
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: ResourceCacheImpl.java,v 1.7 2004/03/20 03:35:51 dlr Exp $
+ * @version $Id$
*/
public class ResourceCacheImpl implements ResourceCache
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceFactory.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceFactory.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceFactory.java Tue Jun 21 16:22:20 2005
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ResourceFactory.java,v 1.7 2004/03/19 17:13:37 dlr Exp $
+ * @version $Id$
*/
public class ResourceFactory
{
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org