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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/FieldBinding.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/FieldBinding.java
index 1884c48..142e883 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/FieldBinding.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/FieldBinding.java
@@ -10,202 +10,250 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-
-
 
 public class FieldBinding extends VariableBinding {
 	public ReferenceBinding declaringClass;
-protected FieldBinding() {
-}
-public FieldBinding(char[] name, TypeBinding type, int modifiers, ReferenceBinding declaringClass, Constant constant) {
-	this.modifiers = modifiers;
-	this.type = type;
-	this.name = name;
-	this.declaringClass = declaringClass;
-	this.constant = constant;
-
-	// propagate the deprecated modifier
-	if (this.declaringClass != null)
-		if (this.declaringClass.isViewedAsDeprecated() && !isDeprecated())
-			this.modifiers |= AccDeprecatedImplicitly;
-}
-public FieldBinding(FieldDeclaration field, TypeBinding type, ReferenceBinding declaringClass) {
-	this(field.name, type, field.modifiers, declaringClass, null);
 
-	field.binding = this;
-}
-// special API used to change field declaring class for runtime visibility check
-public FieldBinding(FieldBinding initialFieldBinding, ReferenceBinding declaringClass) {
-	this.modifiers = initialFieldBinding.modifiers;
-	this.type = initialFieldBinding.type;
-	this.name = initialFieldBinding.name;
-	this.declaringClass = declaringClass;
-	this.constant = initialFieldBinding.constant;
-	this.id = initialFieldBinding.id;
-}
-/* API
-* Answer the receiver's binding type from Binding.BindingID.
-*/
+	protected FieldBinding() {
+	}
 
-public final int bindingType() {
-	return FIELD;
-}
-/* Answer true if the receiver is visible to the type provided by the scope.
-* InvocationSite implements isSuperAccess() to provide additional information
-* if the receiver is protected.
-*
-* NOTE: Cannot invoke this method with a compilation unit scope.
-*/
-
-public final boolean canBeSeenBy(TypeBinding receiverType, InvocationSite invocationSite, Scope scope) {
-	if (isPublic()) return true;
-
-	SourceTypeBinding invocationType = scope.enclosingSourceType();
-	if (invocationType == declaringClass && invocationType == receiverType) return true;
-
-	if (isProtected()) {
-		// answer true if the invocationType is the declaringClass or they are in the same package
-		// OR the invocationType is a subclass of the declaringClass
-		//    AND the receiverType is the invocationType or its subclass
-		//    OR the method is a static method accessed directly through a type
-		//    OR previous assertions are true for one of the enclosing type
-		if (invocationType == declaringClass) return true;
-		if (invocationType.fPackage == declaringClass.fPackage) return true;
-		
-		ReferenceBinding currentType = invocationType;
-		int depth = 0;
-		do {
-			if (declaringClass.isSuperclassOf(currentType)) {
-				if (invocationSite.isSuperAccess()){
-					return true;
-				}
-				// receiverType can be an array binding in one case... see if you can change it
-				if (receiverType instanceof ArrayBinding){
-					return false;
+	public FieldBinding(char[] name, TypeBinding type, int modifiers,
+			ReferenceBinding declaringClass, Constant constant) {
+		this.modifiers = modifiers;
+		this.type = type;
+		this.name = name;
+		this.declaringClass = declaringClass;
+		this.constant = constant;
+
+		// propagate the deprecated modifier
+		if (this.declaringClass != null)
+			if (this.declaringClass.isViewedAsDeprecated() && !isDeprecated())
+				this.modifiers |= AccDeprecatedImplicitly;
+	}
+
+	public FieldBinding(FieldDeclaration field, TypeBinding type,
+			ReferenceBinding declaringClass) {
+		this(field.name, type, field.modifiers, declaringClass, null);
+
+		field.binding = this;
+	}
+
+	// special API used to change field declaring class for runtime visibility
+	// check
+	public FieldBinding(FieldBinding initialFieldBinding,
+			ReferenceBinding declaringClass) {
+		this.modifiers = initialFieldBinding.modifiers;
+		this.type = initialFieldBinding.type;
+		this.name = initialFieldBinding.name;
+		this.declaringClass = declaringClass;
+		this.constant = initialFieldBinding.constant;
+		this.id = initialFieldBinding.id;
+	}
+
+	/*
+	 * API Answer the receiver's binding type from Binding.BindingID.
+	 */
+
+	public final int bindingType() {
+		return FIELD;
+	}
+
+	/*
+	 * Answer true if the receiver is visible to the type provided by the scope.
+	 * InvocationSite implements isSuperAccess() to provide additional
+	 * information if the receiver is protected.
+	 * 
+	 * NOTE: Cannot invoke this method with a compilation unit scope.
+	 */
+
+	public final boolean canBeSeenBy(TypeBinding receiverType,
+			InvocationSite invocationSite, Scope scope) {
+		if (isPublic())
+			return true;
+
+		SourceTypeBinding invocationType = scope.enclosingSourceType();
+		if (invocationType == declaringClass && invocationType == receiverType)
+			return true;
+
+		if (isProtected()) {
+			// answer true if the invocationType is the declaringClass or they
+			// are in the same package
+			// OR the invocationType is a subclass of the declaringClass
+			// AND the receiverType is the invocationType or its subclass
+			// OR the method is a static method accessed directly through a type
+			// OR previous assertions are true for one of the enclosing type
+			if (invocationType == declaringClass)
+				return true;
+			if (invocationType.fPackage == declaringClass.fPackage)
+				return true;
+
+			ReferenceBinding currentType = invocationType;
+			int depth = 0;
+			do {
+				if (declaringClass.isSuperclassOf(currentType)) {
+					if (invocationSite.isSuperAccess()) {
+						return true;
+					}
+					// receiverType can be an array binding in one case... see
+					// if you can change it
+					if (receiverType instanceof ArrayBinding) {
+						return false;
+					}
+					if (isStatic()) {
+						return true; // see 1FMEPDL - return
+										// invocationSite.isTypeAccess();
+					}
+					if (currentType == receiverType
+							|| currentType
+									.isSuperclassOf((ReferenceBinding) receiverType)) {
+						if (depth > 0)
+							invocationSite.setDepth(depth);
+						return true;
+					}
 				}
-				if (isStatic()){
-					return true; // see 1FMEPDL - return invocationSite.isTypeAccess();
+				depth++;
+				currentType = currentType.enclosingType();
+			} while (currentType != null);
+			return false;
+		}
+
+		if (isPrivate()) {
+			// answer true if the receiverType is the declaringClass
+			// AND the invocationType and the declaringClass have a common
+			// enclosingType
+			if (receiverType != declaringClass)
+				return false;
+
+			if (invocationType != declaringClass) {
+				ReferenceBinding outerInvocationType = invocationType;
+				ReferenceBinding temp = outerInvocationType.enclosingType();
+				while (temp != null) {
+					outerInvocationType = temp;
+					temp = temp.enclosingType();
 				}
-				if (currentType == receiverType || currentType.isSuperclassOf((ReferenceBinding) receiverType)){
-					if (depth > 0) invocationSite.setDepth(depth);
-					return true;
+
+				ReferenceBinding outerDeclaringClass = declaringClass;
+				temp = outerDeclaringClass.enclosingType();
+				while (temp != null) {
+					outerDeclaringClass = temp;
+					temp = temp.enclosingType();
 				}
+				if (outerInvocationType != outerDeclaringClass)
+					return false;
 			}
-			depth++;
-			currentType = currentType.enclosingType();
-		} while (currentType != null);
+			return true;
+		}
+
+		// isDefault()
+		if (invocationType.fPackage != declaringClass.fPackage)
+			return false;
+
+		// receiverType can be an array binding in one case... see if you can
+		// change it
+		if (receiverType instanceof ArrayBinding)
+			return false;
+		ReferenceBinding type = (ReferenceBinding) receiverType;
+		PackageBinding declaringPackage = declaringClass.fPackage;
+		do {
+			if (declaringClass == type)
+				return true;
+			if (declaringPackage != type.fPackage)
+				return false;
+		} while ((type = type.superclass()) != null);
 		return false;
 	}
 
-	if (isPrivate()) {
-		// answer true if the receiverType is the declaringClass
-		// AND the invocationType and the declaringClass have a common enclosingType
-		if (receiverType != declaringClass) return false;
-
-		if (invocationType != declaringClass) {
-			ReferenceBinding outerInvocationType = invocationType;
-			ReferenceBinding temp = outerInvocationType.enclosingType();
-			while (temp != null) {
-				outerInvocationType = temp;
-				temp = temp.enclosingType();
-			}
+	public final int getAccessFlags() {
+		return modifiers & AccJustFlag;
+	}
 
-			ReferenceBinding outerDeclaringClass = declaringClass;
-			temp = outerDeclaringClass.enclosingType();
-			while (temp != null) {
-				outerDeclaringClass = temp;
-				temp = temp.enclosingType();
-			}
-			if (outerInvocationType != outerDeclaringClass) return false;
-		}
-		return true;
+	/*
+	 * Answer true if the receiver has default visibility
+	 */
+
+	public final boolean isDefault() {
+		return !isPublic() && !isProtected() && !isPrivate();
 	}
 
-	// isDefault()
-	if (invocationType.fPackage != declaringClass.fPackage) return false;
+	/*
+	 * Answer true if the receiver is a deprecated field
+	 */
 
-	// receiverType can be an array binding in one case... see if you can change it
-	if (receiverType instanceof ArrayBinding)
-		return false;
-	ReferenceBinding type = (ReferenceBinding) receiverType;
-	PackageBinding declaringPackage = declaringClass.fPackage;
-	do {
-		if (declaringClass == type) return true;
-		if (declaringPackage != type.fPackage) return false;
-	} while ((type = type.superclass()) != null);
-	return false;
-}
-public final int getAccessFlags() {
-	return modifiers & AccJustFlag;
-}
+	public final boolean isDeprecated() {
+		return (modifiers & AccDeprecated) != 0;
+	}
 
-/* Answer true if the receiver has default visibility
-*/
+	/*
+	 * Answer true if the receiver has private visibility
+	 */
 
-public final boolean isDefault() {
-	return !isPublic() && !isProtected() && !isPrivate();
-}
-/* Answer true if the receiver is a deprecated field
-*/
+	public final boolean isPrivate() {
+		return (modifiers & AccPrivate) != 0;
+	}
 
-public final boolean isDeprecated() {
-	return (modifiers & AccDeprecated) != 0;
-}
-/* Answer true if the receiver has private visibility
-*/
+	/*
+	 * Answer true if the receiver has private visibility and is used locally
+	 */
 
-public final boolean isPrivate() {
-	return (modifiers & AccPrivate) != 0;
-}
-/* Answer true if the receiver has private visibility and is used locally
-*/
+	public final boolean isPrivateUsed() {
+		return (modifiers & AccPrivateUsed) != 0;
+	}
 
-public final boolean isPrivateUsed() {
-	return (modifiers & AccPrivateUsed) != 0;
-}
-/* Answer true if the receiver has protected visibility
-*/
+	/*
+	 * Answer true if the receiver has protected visibility
+	 */
 
-public final boolean isProtected() {
-	return (modifiers & AccProtected) != 0;
-}
-/* Answer true if the receiver has public visibility
-*/
+	public final boolean isProtected() {
+		return (modifiers & AccProtected) != 0;
+	}
 
-public final boolean isPublic() {
-	return (modifiers & AccPublic) != 0;
-}
-/* Answer true if the receiver is a static field
-*/
+	/*
+	 * Answer true if the receiver has public visibility
+	 */
 
-public final boolean isStatic() {
-	return (modifiers & AccStatic) != 0;
-}
-/* Answer true if the receiver is not defined in the source of the declaringClass
-*/
-
-//public final boolean isSynthetic() {
-//	return (modifiers & AccSynthetic) != 0;
-//}
-/* Answer true if the receiver is a transient field
-*/
-
-//public final boolean isTransient() {
-//	return (modifiers & AccTransient) != 0;
-//}
-/* Answer true if the receiver's declaring type is deprecated (or any of its enclosing types)
-*/
-
-public final boolean isViewedAsDeprecated() {
-	return (modifiers & AccDeprecated) != 0 ||
-		(modifiers & AccDeprecatedImplicitly) != 0;
-}
-/* Answer true if the receiver is a volatile field
-*/
+	public final boolean isPublic() {
+		return (modifiers & AccPublic) != 0;
+	}
+
+	/*
+	 * Answer true if the receiver is a static field
+	 */
+
+	public final boolean isStatic() {
+		return (modifiers & AccStatic) != 0;
+	}
+
+	/*
+	 * Answer true if the receiver is not defined in the source of the
+	 * declaringClass
+	 */
+
+	// public final boolean isSynthetic() {
+	// return (modifiers & AccSynthetic) != 0;
+	// }
+	/*
+	 * Answer true if the receiver is a transient field
+	 */
+
+	// public final boolean isTransient() {
+	// return (modifiers & AccTransient) != 0;
+	// }
+	/*
+	 * Answer true if the receiver's declaring type is deprecated (or any of its
+	 * enclosing types)
+	 */
+
+	public final boolean isViewedAsDeprecated() {
+		return (modifiers & AccDeprecated) != 0
+				|| (modifiers & AccDeprecatedImplicitly) != 0;
+	}
+	/*
+	 * Answer true if the receiver is a volatile field
+	 */
 
-//public final boolean isVolatile() {
-//	return (modifiers & AccVolatile) != 0;
-//}
+	// public final boolean isVolatile() {
+	// return (modifiers & AccVolatile) != 0;
+	// }
 }