X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java index c61c049..824b721 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java @@ -1,7 +1,6 @@ package net.sourceforge.phpdt.internal.compiler.ast; import java.util.List; -import java.util.ArrayList; /** * This is a if statement. @@ -49,7 +48,9 @@ public class IfStatement extends Statement { final StringBuffer buff = new StringBuffer(tabString(tab)); buff.append("if (");//$NON-NLS-1$ buff.append(condition.toStringExpression()).append(") ");//$NON-NLS-1$ - buff.append(statement.toString(tab + 1)); + if (statement != null) { + buff.append(statement.toString(tab + 1)); + } for (int i = 0; i < elseifs.length; i++) { buff.append(elseifs[i].toString(tab + 1)); buff.append("\n");//$NON-NLS-1$ @@ -63,52 +64,49 @@ public class IfStatement extends Statement { /** * Get the variables from outside (parameters, globals ...) - * @return the variables from outside */ - public List getOutsideVariable() { - final ArrayList list = new ArrayList(); - list.addAll(condition.getOutsideVariable()); // todo: check if unuseful - list.addAll(statement.getOutsideVariable()); + public void getOutsideVariable(final List list) { + condition.getOutsideVariable(list); // todo: check if unuseful + if (statement != null) { + statement.getOutsideVariable(list); + } for (int i = 0; i < elseifs.length; i++) { - list.addAll(elseifs[i].getOutsideVariable()); + elseifs[i].getOutsideVariable(list); } if (els != null) { - list.addAll(els.getOutsideVariable()); + els.getOutsideVariable(list); } - return list; } /** * get the modified variables. - * @return the variables from we change value */ - public List getModifiedVariable() { - final ArrayList list = new ArrayList(); - list.addAll(condition.getModifiedVariable()); - list.addAll(statement.getModifiedVariable()); + public void getModifiedVariable(final List list) { + condition.getModifiedVariable(list); + if (statement != null) { + statement.getModifiedVariable(list); + } for (int i = 0; i < elseifs.length; i++) { - list.addAll(elseifs[i].getModifiedVariable()); + elseifs[i].getModifiedVariable(list); } if (els != null) { - list.addAll(els.getModifiedVariable()); + els.getModifiedVariable(list); } - return list; } /** * Get the variables used. - * @return the variables used */ - public List getUsedVariable() { - final ArrayList list = new ArrayList(); - list.addAll(condition.getUsedVariable()); - list.addAll(statement.getUsedVariable()); + public void getUsedVariable(final List list) { + condition.getUsedVariable(list); + if (statement != null) { + statement.getUsedVariable(list); + } for (int i = 0; i < elseifs.length; i++) { - list.addAll(elseifs[i].getUsedVariable()); + elseifs[i].getUsedVariable(list); } if (els != null) { - list.addAll(els.getUsedVariable()); + els.getUsedVariable(list); } - return list; } }