X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java index d50bafe..af63ccb 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java @@ -1,7 +1,6 @@ package net.sourceforge.phpdt.internal.compiler.ast; import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; -import net.sourceforge.phpdt.internal.compiler.ast.declarations.VariableUsage; import net.sourceforge.phpdt.internal.ui.PHPUiImages; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.Position; @@ -16,14 +15,14 @@ import java.util.ArrayList; public class GlobalStatement extends Statement implements Outlineable { /** An array of the variables called by this global statement. */ - public String[] variables; + public AbstractVariable[] variables; private Object parent; private Position position; public GlobalStatement(final Object parent, - final String[] variables, + final AbstractVariable[] variables, final int sourceStart, final int sourceEnd) { super(sourceStart, sourceEnd); @@ -38,7 +37,7 @@ public class GlobalStatement extends Statement implements Outlineable { if (i != 0) { buff.append(", ");//$NON-NLS-1$ } - buff.append(variables[i]); + buff.append(variables[i].toStringExpression()); } return buff.toString(); } @@ -70,7 +69,7 @@ public class GlobalStatement extends Statement implements Outlineable { public List getOutsideVariable() { final ArrayList list = new ArrayList(variables.length); for (int i = 0; i < variables.length; i++) { - list.add(new VariableUsage(variables[i],sourceStart)); + list.addAll(variables[i].getUsedVariable()); } return list; } @@ -80,7 +79,7 @@ public class GlobalStatement extends Statement implements Outlineable { * @return the variables modified */ public List getModifiedVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -88,6 +87,6 @@ public class GlobalStatement extends Statement implements Outlineable { * @return the variables used */ public List getUsedVariable() { - return new ArrayList(); + return new ArrayList(1); } }