X-Git-Url: http://secure.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 5d3f8b9..4adb02d 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 @@ -1,13 +1,13 @@ package net.sourceforge.phpdt.internal.compiler.ast; +import java.util.List; + import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; import net.sourceforge.phpdt.internal.ui.PHPUiImages; + import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.Position; -import java.util.List; -import java.util.ArrayList; - /** * A variable declaration. * @author Matthieu Casanova @@ -35,6 +35,7 @@ public class VariableDeclaration extends Expression implements Outlineable { private Object parent; private boolean reference; + private Position position; private int operator; @@ -51,12 +52,12 @@ public class VariableDeclaration extends Expression implements Outlineable { final Expression initialization, final int operator, final int sourceStart) { - super(sourceStart, initialization.getSourceEnd()); + super(sourceStart, initialization.sourceEnd); this.initialization = initialization; this.variable = variable; this.operator = operator; this.parent = parent; - position = new Position(sourceStart, getSourceEnd()); + position = new Position(sourceStart, sourceEnd); } /** @@ -71,6 +72,7 @@ public class VariableDeclaration extends Expression implements Outlineable { super(sourceStart, sourceEnd); this.variable = variable; this.parent = parent; + position = new Position(sourceStart, sourceEnd); } public void setReference(final boolean reference) { @@ -87,7 +89,7 @@ public class VariableDeclaration extends Expression implements Outlineable { final Expression initialization, final int operator, final int sourceStart) { - super(sourceStart, initialization.getSourceEnd()); + super(sourceStart, initialization.sourceEnd); this.variable = variable; this.initialization = initialization; this.operator = operator; @@ -100,7 +102,7 @@ public class VariableDeclaration extends Expression implements Outlineable { */ public VariableDeclaration(final AbstractVariable variable, final int sourceStart) { - super(sourceStart, variable.getSourceEnd()); + super(sourceStart, variable.sourceEnd); this.variable = variable; } @@ -189,32 +191,26 @@ public class VariableDeclaration extends Expression implements Outlineable { /** * Get the variables from outside (parameters, globals ...) - * @return the variables from outside */ - public List getOutsideVariable() { - return new ArrayList(1); + public void getOutsideVariable(final List list) { } /** * get the modified variables. - * @return the variables from we change value */ - public List getModifiedVariable() { - final List list = variable.getUsedVariable(); + public void getModifiedVariable(final List list) { + variable.getUsedVariable(list); if (initialization != null) { - list.addAll(initialization.getModifiedVariable()); + initialization.getModifiedVariable(list); } - return list; } /** * Get the variables used. - * @return the variables used */ - public List getUsedVariable() { + public void getUsedVariable(final List list) { if (initialization != null) { - 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 + initialization.getUsedVariable(list); } - return new ArrayList(1); } }