You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2006/11/06 22:21:11 UTC

svn commit: r471881 - in /jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime: directive/Macro.java parser/node/ASTIntegerRange.java parser/node/ASTObjectArray.java

Author: henning
Date: Mon Nov  6 13:21:10 2006
New Revision: 471881

URL: http://svn.apache.org/viewvc?view=rev&rev=471881
Log:
Remove a minor number of explicit ArrayList object definitions, replace them with List.

Modified:
    jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.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/ASTObjectArray.java

Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java?view=diff&rev=471881&r1=471880&r2=471881
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java Mon Nov  6 13:21:10 2006
@@ -298,7 +298,7 @@
          *  our first and last tokens
          */
 
-        ArrayList list = new ArrayList();
+        List list = new ArrayList();
 
         while (t != tLast)
         {

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=471881&r1=471880&r2=471881
==============================================================================
--- 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 Mon Nov  6 13:21:10 2006
@@ -30,13 +30,13 @@
 */
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.runtime.parser.ParserVisitor;
 
-import org.apache.velocity.exception.MethodInvocationException;
-
 /**
  *
  */
@@ -141,17 +141,17 @@
          *  make the vector and fill it
          */
 
-        ArrayList foo = new ArrayList();
+        List elements = new ArrayList();
         int val = l;
 
         for(int i =0; i < num; i++)
         {
             // TODO: JDK 1.4+ -> valueOf()
-            foo.add(new Integer(val));
+            elements.add(new Integer(val));
             val += delta;
         }
 
-        return foo;
+        return elements;
     }
 }
 

Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java?view=diff&rev=471881&r1=471880&r2=471881
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java Mon Nov  6 13:21:10 2006
@@ -20,13 +20,13 @@
  */
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.runtime.parser.ParserVisitor;
 
-import org.apache.velocity.exception.MethodInvocationException;
-
 /**
  *
  */
@@ -66,11 +66,11 @@
     {
         int size = jjtGetNumChildren();
 
-        ArrayList objectArray = new ArrayList();
+        List objectArray = new ArrayList();
 
         for (int i = 0; i < size; i++)
         {
-            objectArray.add(  jjtGetChild(i).value(context) );
+            objectArray.add(jjtGetChild(i).value(context));
         }
 
         return objectArray;



---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org