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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/ConditionalFlowInfo.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/ConditionalFlowInfo.java
index ceda218..8671eb6 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/ConditionalFlowInfo.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/ConditionalFlowInfo.java
@@ -15,35 +15,36 @@ import net.sourceforge.phpdt.internal.compiler.lookup.LocalVariableBinding;
 
 /**
  * Record conditional initialization status during definite assignment analysis
- *
+ * 
  */
 public class ConditionalFlowInfo extends FlowInfo {
-	
+
 	public FlowInfo initsWhenTrue;
+
 	public FlowInfo initsWhenFalse;
-	
-	ConditionalFlowInfo(FlowInfo initsWhenTrue, FlowInfo initsWhenFalse){
-		
+
+	ConditionalFlowInfo(FlowInfo initsWhenTrue, FlowInfo initsWhenFalse) {
+
 		this.initsWhenTrue = initsWhenTrue;
-		this.initsWhenFalse = initsWhenFalse; 
+		this.initsWhenFalse = initsWhenFalse;
 	}
-	
+
 	public FlowInfo addInitializationsFrom(FlowInfo otherInits) {
-		
+
 		this.initsWhenTrue.addInitializationsFrom(otherInits);
 		this.initsWhenFalse.addInitializationsFrom(otherInits);
 		return this;
 	}
-	
+
 	public FlowInfo addPotentialInitializationsFrom(FlowInfo otherInits) {
-		
+
 		this.initsWhenTrue.addPotentialInitializationsFrom(otherInits);
 		this.initsWhenFalse.addPotentialInitializationsFrom(otherInits);
 		return this;
 	}
-	
+
 	public FlowInfo asNegatedCondition() {
-		
+
 		FlowInfo extra = initsWhenTrue;
 		initsWhenTrue = initsWhenFalse;
 		initsWhenFalse = extra;
@@ -51,128 +52,131 @@ public class ConditionalFlowInfo extends FlowInfo {
 	}
 
 	public FlowInfo copy() {
-		
-		return new ConditionalFlowInfo(initsWhenTrue.copy(), initsWhenFalse.copy());
+
+		return new ConditionalFlowInfo(initsWhenTrue.copy(), initsWhenFalse
+				.copy());
 	}
-	
+
 	public FlowInfo initsWhenFalse() {
-		
+
 		return initsWhenFalse;
 	}
-	
+
 	public FlowInfo initsWhenTrue() {
-		
+
 		return initsWhenTrue;
 	}
-	
+
 	/**
 	 * Check status of definite assignment for a field.
 	 */
 	public boolean isDefinitelyAssigned(FieldBinding field) {
-		
-		return initsWhenTrue.isDefinitelyAssigned(field) 
+
+		return initsWhenTrue.isDefinitelyAssigned(field)
 				&& initsWhenFalse.isDefinitelyAssigned(field);
 	}
-	
+
 	/**
 	 * Check status of definite assignment for a local variable.
 	 */
 	public boolean isDefinitelyAssigned(LocalVariableBinding local) {
-		
-		return initsWhenTrue.isDefinitelyAssigned(local) 
+
+		return initsWhenTrue.isDefinitelyAssigned(local)
 				&& initsWhenFalse.isDefinitelyAssigned(local);
 	}
-	
-	public int reachMode(){
+
+	public int reachMode() {
 		return unconditionalInits().reachMode();
 	}
-	
-	public boolean isReachable(){
-		
-		return unconditionalInits().isReachable();	
-		//should maybe directly be: false
+
+	public boolean isReachable() {
+
+		return unconditionalInits().isReachable();
+		// should maybe directly be: false
 	}
-	
+
 	/**
 	 * Check status of potential assignment for a field.
 	 */
 	public boolean isPotentiallyAssigned(FieldBinding field) {
-		
-		return initsWhenTrue.isPotentiallyAssigned(field) 
+
+		return initsWhenTrue.isPotentiallyAssigned(field)
 				|| initsWhenFalse.isPotentiallyAssigned(field);
 	}
-	
+
 	/**
 	 * Check status of potential assignment for a local variable.
 	 */
 	public boolean isPotentiallyAssigned(LocalVariableBinding local) {
-		
-		return initsWhenTrue.isPotentiallyAssigned(local) 
+
+		return initsWhenTrue.isPotentiallyAssigned(local)
 				|| initsWhenFalse.isPotentiallyAssigned(local);
 	}
-	
+
 	/**
 	 * Record a field got definitely assigned.
 	 */
 	public void markAsDefinitelyAssigned(FieldBinding field) {
-		
+
 		initsWhenTrue.markAsDefinitelyAssigned(field);
-		initsWhenFalse.markAsDefinitelyAssigned(field);	
+		initsWhenFalse.markAsDefinitelyAssigned(field);
 	}
-	
+
 	/**
 	 * Record a field got definitely assigned.
 	 */
 	public void markAsDefinitelyAssigned(LocalVariableBinding local) {
-		
+
 		initsWhenTrue.markAsDefinitelyAssigned(local);
-		initsWhenFalse.markAsDefinitelyAssigned(local);	
+		initsWhenFalse.markAsDefinitelyAssigned(local);
 	}
-	
+
 	/**
 	 * Clear the initialization info for a field
 	 */
 	public void markAsDefinitelyNotAssigned(FieldBinding field) {
-		
+
 		initsWhenTrue.markAsDefinitelyNotAssigned(field);
-		initsWhenFalse.markAsDefinitelyNotAssigned(field);	
+		initsWhenFalse.markAsDefinitelyNotAssigned(field);
 	}
-	
+
 	/**
 	 * Clear the initialization info for a local variable
 	 */
 	public void markAsDefinitelyNotAssigned(LocalVariableBinding local) {
-		
+
 		initsWhenTrue.markAsDefinitelyNotAssigned(local);
-		initsWhenFalse.markAsDefinitelyNotAssigned(local);	
+		initsWhenFalse.markAsDefinitelyNotAssigned(local);
 	}
-	
+
 	public FlowInfo setReachMode(int reachMode) {
-		
+
 		initsWhenTrue.setReachMode(reachMode);
 		initsWhenFalse.setReachMode(reachMode);
 		return this;
 	}
-	
+
 	/**
-	 * Converts conditional receiver into inconditional one, updated in the following way: <ul>
-	 * <li> intersection of definitely assigned variables, 
+	 * Converts conditional receiver into inconditional one, updated in the
+	 * following way:
+	 * <ul>
+	 * <li> intersection of definitely assigned variables,
 	 * <li> union of potentially assigned variables.
 	 * </ul>
 	 */
 	public UnconditionalFlowInfo mergedWith(UnconditionalFlowInfo otherInits) {
-		
+
 		return unconditionalInits().mergedWith(otherInits);
 	}
-	
+
 	public String toString() {
-		
+
 		return "FlowInfo<true: " + initsWhenTrue.toString() + ", false: " + initsWhenFalse.toString() + ">"; //$NON-NLS-1$ //$NON-NLS-3$ //$NON-NLS-2$
 	}
-	
+
 	public UnconditionalFlowInfo unconditionalInits() {
-		
-		return initsWhenTrue.unconditionalInits().copy()
-				.mergedWith(initsWhenFalse.unconditionalInits());
+
+		return initsWhenTrue.unconditionalInits().copy().mergedWith(
+				initsWhenFalse.unconditionalInits());
 	}
 }