Author: henning
Date: Sat Sep 16 03:34:39 2006
New Revision: 446850
URL: http://svn.apache.org/viewvc?view=rev&rev=446850
Log:
A number of TODO markers once we drop 1.3 compatibility.
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/HoldingLogChute.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java?view=diff&rev=446850&r1=446849&r2=446850
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
Sat Sep 16 03:34:39 2006
@@ -393,6 +393,7 @@
while (!maxNbrLoopsExceeded && i.hasNext())
{
+ // TODO: JDK 1.4+ -> valueOf()
context.put(counterName , new Integer(counter));
Object value = i.next();
context.put(elementKey, value);
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/HoldingLogChute.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/HoldingLogChute.java?view=diff&rev=446850&r1=446849&r2=446850
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/HoldingLogChute.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/HoldingLogChute.java
Sat Sep 16 03:34:39 2006
@@ -49,6 +49,7 @@
synchronized(this)
{
Object[] data = new Object[2];
+ // TODO: JDK 1.4+ -> valueOf()
data[0] = new Integer(level);
data[1] = message;
pendingMessages.addElement(data);
@@ -67,6 +68,7 @@
synchronized(this)
{
Object[] data = new Object[3];
+ // TODO: JDK 1.4+ -> valueOf()
data[0] = new Integer(level);
data[1] = message;
data[2] = t;
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java?view=diff&rev=446850&r1=446849&r2=446850
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
Sat Sep 16 03:34:39 2006
@@ -53,10 +53,11 @@
* Since the value of the expression is simply the boolean
* result of evaluate(), lets return that.
*/
- public Object value(InternalContextAdapter context )
+ public Object value(InternalContextAdapter context)
throws MethodInvocationException
{
- return new Boolean( evaluate( context ) );
+ // TODO: JDK 1.4+ -> valueOf()
+ return new Boolean(evaluate(context));
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java?view=diff&rev=446850&r1=446849&r2=446850
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
Sat Sep 16 03:34:39 2006
@@ -131,7 +131,8 @@
for(int i =0; i < num; i++)
{
- foo.add( new Integer( val ));
+ // TODO: JDK 1.4+ -> valueOf()
+ foo.add(new Integer(val));
val += delta;
}
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java?view=diff&rev=446850&r1=446849&r2=446850
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
Sat Sep 16 03:34:39 2006
@@ -57,7 +57,8 @@
public Object value(InternalContextAdapter context )
throws MethodInvocationException
{
- return new Boolean( evaluate( context ) );
+ // TODO: JDK 1.4+ -> valueOf()
+ return new Boolean(evaluate(context));
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java?view=diff&rev=446850&r1=446849&r2=446850
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/MathUtils.java
Sat Sep 16 03:34:39 2006
@@ -170,6 +170,7 @@
}
else
{
+ // TODO: JDK 1.4+ -> valueOf()
return new Byte ((byte)value);
}
}
@@ -181,6 +182,7 @@
}
else
{
+ // TODO: JDK 1.4+ -> valueOf()
return new Short((short)value);
}
}
@@ -192,11 +194,13 @@
}
else
{
+ // TODO: JDK 1.4+ -> valueOf()
return new Integer ((int)value);
}
}
if (type == Long.class)
{
+ // TODO: JDK 1.4+ -> valueOf()
return new Long (value);
}
return BigInteger.valueOf( value);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
