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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java
index 7f55b38..5d3f8b9 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java
@@ -28,7 +28,7 @@ public class VariableDeclaration extends Expression implements Outlineable {
   public static final int LSHIFT_EQUAL = 11;
   public static final int RSIGNEDSHIFT_EQUAL = 12;
 
-  protected Variable variable;
+  protected AbstractVariable variable;
 
   /** The value for variable initialization. */
   public Expression initialization;
@@ -41,30 +41,31 @@ public class VariableDeclaration extends Expression implements Outlineable {
 
   /**
    * Create a variable.
-   * @param initialization the initialization
    * @param variable the name of the variable
+   * @param initialization the initialization
+   * @param operator the assign operator
    * @param sourceStart the start point
    */
   public VariableDeclaration(final Object parent,
-                             final Variable variable,
+                             final AbstractVariable variable,
                              final Expression initialization,
                              final int operator,
                              final int sourceStart) {
-    super(sourceStart, initialization.sourceEnd);
+    super(sourceStart, initialization.getSourceEnd());
     this.initialization = initialization;
     this.variable = variable;
     this.operator = operator;
     this.parent = parent;
-    position = new Position(sourceStart, sourceEnd);
+    position = new Position(sourceStart, getSourceEnd());
   }
 
   /**
    * Create a variable.
-   * @param name the name of the variable
+   * @param variable a variable (in case of $$variablename)
    * @param sourceStart the start point
    */
   public VariableDeclaration(final Object parent,
-                             final Variable variable,
+                             final AbstractVariable variable,
                              final int sourceStart,
                              final int sourceEnd) {
     super(sourceStart, sourceEnd);
@@ -79,14 +80,14 @@ public class VariableDeclaration extends Expression implements Outlineable {
   /**
    * Create a variable.
    * @param initialization the initialization
-   * @param name the name of the variable
+   * @param variable a variable (in case of $$variablename)
    * @param sourceStart the start point
    */
-  public VariableDeclaration(final Variable variable,
+  public VariableDeclaration(final AbstractVariable variable,
                              final Expression initialization,
                              final int operator,
                              final int sourceStart) {
-    super(sourceStart, initialization.sourceEnd);
+    super(sourceStart, initialization.getSourceEnd());
     this.variable = variable;
     this.initialization = initialization;
     this.operator = operator;
@@ -94,12 +95,12 @@ public class VariableDeclaration extends Expression implements Outlineable {
 
   /**
    * Create a variable.
-   * @param name the name of the variable
+   * @param variable a variable (in case of $$variablename)
    * @param sourceStart the start point
    */
-  public VariableDeclaration(final Variable variable,
+  public VariableDeclaration(final AbstractVariable variable,
                              final int sourceStart) {
-    super(sourceStart, variable.sourceEnd);
+    super(sourceStart, variable.getSourceEnd());
     this.variable = variable;
   }
 
@@ -191,7 +192,7 @@ public class VariableDeclaration extends Expression implements Outlineable {
    * @return the variables from outside
    */
   public List getOutsideVariable() {
-    return new ArrayList();
+    return new ArrayList(1);
   }
 
   /**
@@ -199,8 +200,7 @@ public class VariableDeclaration extends Expression implements Outlineable {
    * @return the variables from we change value
    */
   public List getModifiedVariable() {
-    final ArrayList list = new ArrayList();
-    list.addAll(variable.getModifiedVariable());
+    final List list = variable.getUsedVariable();
     if (initialization != null) {
       list.addAll(initialization.getModifiedVariable());
     }
@@ -212,10 +212,9 @@ public class VariableDeclaration extends Expression implements Outlineable {
    * @return the variables used
    */
   public List getUsedVariable() {
-    final ArrayList list = new ArrayList();
     if (initialization != null) {
-      list.addAll(initialization.getModifiedVariable());//yes it's getModified variable (in a variable declaration $a = $b, $a is modified, event if you have only $a and no initialization
+      return initialization.getModifiedVariable();//yes it's getModified variable (in a variable declaration $a = $b, $a is modified, event if you have only $a and no initialization
     }
-    return list;
+    return new ArrayList(1);
   }
 }