X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java
index 6623bcf..b4677ce 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java
@@ -1,20 +1,20 @@
 package net.sourceforge.phpdt.internal.compiler.ast;
 
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * an echo statement.
  * echo something;
+ * 
  * @author Matthieu Casanova
  */
-public class EchoStatement extends Statement {
+public final class EchoStatement extends Statement {
 
   /** An array of expressions in this echo statement. */
-  public Expression[] expressions;
+  private final Expression[] expressions;
 
-  public EchoStatement (final Expression[] expressions, final int sourceStart) {
-    super(sourceStart, expressions[expressions.length-1].getSourceEnd());
+  public EchoStatement(final Expression[] expressions, final int sourceStart, final int sourceEnd) {
+    super(sourceStart, sourceEnd);
     this.expressions = expressions;
   }
 
@@ -31,49 +31,47 @@ public class EchoStatement extends Statement {
 
   /**
    * Return the object into String.
+   * 
    * @param tab how many tabs (not used here
    * @return a String
    */
   public String toString(final int tab) {
     final String tabs = tabString(tab);
     final String str = toString();
-    final StringBuffer buff = new StringBuffer(tabs.length()+str.length());
+    final StringBuffer buff = new StringBuffer(tabs.length() + str.length());
     return buff.toString();
   }
 
   /**
    * Get the variables from outside (parameters, globals ...)
-   * @return the variables from outside
+   *
+   * @param list the list where we will put variables
    */
-  public List getOutsideVariable() {
-    final ArrayList list = new ArrayList();
+  public void getOutsideVariable(final List list) {
     for (int i = 0; i < expressions.length; i++) {
-      list.addAll(expressions[i].getOutsideVariable());
+      expressions[i].getOutsideVariable(list);
     }
-    return list;
   }
 
   /**
    * get the modified variables.
-   * @return the variables from we change value
+   *
+   * @param list the list where we will put variables
    */
-  public List getModifiedVariable() {
-    final ArrayList list = new ArrayList();
+  public void getModifiedVariable(final List list) {
     for (int i = 0; i < expressions.length; i++) {
-      list.addAll(expressions[i].getModifiedVariable());
+      expressions[i].getModifiedVariable(list);
     }
-    return list;
   }
 
   /**
    * Get the variables used.
-   * @return the variables used
+   *
+   * @param list the list where we will put variables
    */
-  public List getUsedVariable() {
-    final ArrayList list = new ArrayList();
+  public void getUsedVariable(final List list) {
     for (int i = 0; i < expressions.length; i++) {
-      list.addAll(expressions[i].getUsedVariable());
+      expressions[i].getUsedVariable(list);
     }
-    return list;
   }
 }