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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java
index 76c486c..04ad606 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java
@@ -3,12 +3,14 @@ package net.sourceforge.phpdt.internal.compiler.ast;
 import java.util.List;
 
 /**
- * A ConditionalExpression is like that : booleanExpression ? trueValue : falseValue;
+ * A ConditionalExpression is like that : booleanExpression ? trueValue : falseValue;.
  * @author Matthieu Casanova
  */
-public class ConditionalExpression extends OperatorExpression {
+public final class ConditionalExpression extends OperatorExpression {
 
-  public Expression condition, valueIfTrue, valueIfFalse;
+  private final Expression condition;
+  private final Expression valueIfTrue;
+  private final Expression valueIfFalse;
 
   public ConditionalExpression(final Expression condition,
                                final Expression valueIfTrue,
@@ -20,23 +22,33 @@ public class ConditionalExpression extends OperatorExpression {
   }
 
   public String toStringExpression() {
-    final StringBuffer buff = new StringBuffer("(");
-    buff.append(condition.toStringExpression());
+    final String conditionString = condition.toStringExpression();
+    final String valueIfTrueString = valueIfTrue.toStringExpression();
+    final String valueIfFalse = this.valueIfFalse.toStringExpression();
+    final StringBuffer buff = new StringBuffer(8 +
+                                               conditionString.length() +
+                                               valueIfTrueString.length() +
+                                               valueIfFalse.length());
+    buff.append("(");
+    buff.append(conditionString);
     buff.append(") ? ");
-    buff.append(valueIfTrue.toStringExpression());
+    buff.append(valueIfTrueString);
     buff.append(" : ");
-    buff.append(valueIfFalse.toStringExpression());
+    buff.append(valueIfFalse);
     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) {
-  }
+  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) {
     condition.getModifiedVariable(list);
@@ -46,6 +58,8 @@ public class ConditionalExpression extends OperatorExpression {
 
   /**
    * Get the variables used.
+   *
+   * @param list the list where we will put variables
    */
   public void getUsedVariable(final List list) {
     condition.getUsedVariable(list);