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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java
index 5486d9c..215c9ea 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java
@@ -5,19 +5,21 @@ import java.util.List;
 /**
  * a variable declaration in an array().
  * it could take Expression as key.
+ * 
  * @author Matthieu Casanova
  */
-public class ArrayVariableDeclaration extends Expression {
+public final class ArrayVariableDeclaration extends Expression {
 
   /** the array key. */
-  public Expression key;
+  private final Expression key;
 
   /** the array value. */
-  public Expression value;
+  private Expression value;
 
   /**
    * Create a new array variable declaration.
-   * @param key the key
+   * 
+   * @param key   the key
    * @param value the value
    */
   public ArrayVariableDeclaration(final Expression key, final Expression value) {
@@ -28,7 +30,8 @@ public class ArrayVariableDeclaration extends Expression {
 
   /**
    * Create a new array variable declaration.
-   * @param key the key
+   * 
+   * @param key       the key
    * @param sourceEnd the end position
    */
   public ArrayVariableDeclaration(final Expression key, final int sourceEnd) {
@@ -38,27 +41,36 @@ public class ArrayVariableDeclaration extends Expression {
 
   /**
    * Return the expression as String.
+   * 
    * @return the expression
    */
   public String toStringExpression() {
-    final StringBuffer buff = new StringBuffer();
-    buff.append(key.toStringExpression());
-    if (value != null) {
+    if (value == null) {
+      return key.toStringExpression();
+    } else {
+      final String keyString = key.toStringExpression();
+      final String valueString = value.toStringExpression();
+      final StringBuffer buff = new StringBuffer(keyString.length() + valueString.length() + 3);
+      buff.append(keyString);
       buff.append(" => ");
-      buff.append(value.toStringExpression());
+      buff.append(valueString);
+      return buff.toString();
     }
-    return buff.toString();
   }
 
 
   /**
    * Get the variables from outside (parameters, globals ...)
+   * 
+   * @param list the list where we will put variables
    */
   public void getOutsideVariable(final List list) {
   }
 
   /**
    * get the modified variables.
+   * 
+   * @param list the list where we will put variables
    */
   public void getModifiedVariable(final List list) {
     key.getModifiedVariable(list);
@@ -69,6 +81,8 @@ public class ArrayVariableDeclaration extends Expression {
 
   /**
    * Get the variables used.
+   * 
+   * @param list the list where we will put variables
    */
   public void getUsedVariable(final List list) {
     key.getUsedVariable(list);