Fixed bug that "import static xxx.XXX.xxx;" not generating dependency on class "xxx.XXX".

zhourenjian · zhourenjian · commit 88bf1f45762c · 2008-04-15T15:07:21.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -363,6 +363,10 @@ public boolean visit(TypeLiteral node) {
 		QNTypeBinding qn = new QNTypeBinding();
 		String qualifiedName = null;
 		if (declaringClass != null) {
+			ITypeBinding dclClass = null;
+			while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+				declaringClass = dclClass;
+			}
 			qualifiedName = declaringClass.getQualifiedName();
 			qn.binding = declaringClass;
 		} else {
@@ -518,6 +522,10 @@ protected void visitForMusts(AbstractTypeDeclaration node) {
 				String qualifiedName;
 				ITypeBinding declaringClass = superBinding.getDeclaringClass();
 				if (declaringClass != null) {
+					ITypeBinding dclClass = null;
+					while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+						declaringClass = dclClass;
+					}
 					qualifiedName = declaringClass.getQualifiedName();
 					qn.binding = declaringClass;
 				} else {
@@ -548,6 +556,10 @@ protected void visitForMusts(AbstractTypeDeclaration node) {
 					String qualifiedName;
 					ITypeBinding declaringClass = binding.getDeclaringClass();
 					if (declaringClass != null) {
+						ITypeBinding dclClass = null;
+						while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+							declaringClass = dclClass;
+						}
 						qualifiedName = declaringClass.getQualifiedName();
 						qn.binding = declaringClass;
 					} else {
@@ -693,6 +705,10 @@ public boolean visit(SimpleName node) {
 					if (!elementType.isPrimitive()) {
 						ITypeBinding declaringClass = elementType.getDeclaringClass();
 						if (declaringClass != null) {
+							ITypeBinding dclClass = null;
+							while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+								declaringClass = dclClass;
+							}
 							qualifiedName = declaringClass.getQualifiedName();
 							qn.binding = declaringClass;
 						} else {
@@ -703,6 +719,10 @@ public boolean visit(SimpleName node) {
 				} else {
 					ITypeBinding declaringClass = typeBinding.getDeclaringClass();
 					if (declaringClass != null) {
+						ITypeBinding dclClass = null;
+						while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+							declaringClass = dclClass;
+						}
 						qualifiedName = declaringClass.getQualifiedName();
 						qn.binding = declaringClass;
 					} else {
@@ -717,6 +737,29 @@ public boolean visit(SimpleName node) {
 				qn.qualifiedName = qualifiedName;
 				optionals.add(qn);
 			}
+		} else if (binding instanceof IVariableBinding) {
+			IVariableBinding varBinding = (IVariableBinding) binding;
+			if ((varBinding.getModifiers() & Modifier.STATIC) != 0) {
+				QNTypeBinding qn = new QNTypeBinding();
+				String qualifiedName = null;
+				
+				IVariableBinding variableDeclaration = varBinding.getVariableDeclaration();
+				ITypeBinding declaringClass = variableDeclaration.getDeclaringClass();
+				
+				ITypeBinding dclClass = null;
+				while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+					declaringClass = dclClass;
+				}
+				qualifiedName = declaringClass.getQualifiedName();
+				if (isQualifiedNameOK(qualifiedName, node) 
+						&& !musts.contains(qualifiedName)
+						&& !requires.contains(qualifiedName)) {
+					qn.qualifiedName = qualifiedName;
+					optionals.add(qn);
+				}
+
+			}
+			
 		}
 		return super.visit(node);
 	}
@@ -734,6 +777,10 @@ public boolean visit(ClassInstanceCreation node) {
 		} else if(resolveTypeBinding != null){
 			ITypeBinding declaringClass = resolveTypeBinding.getDeclaringClass();
 			if (declaringClass != null) {
+				ITypeBinding dclClass = null;
+				while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+					declaringClass = dclClass;
+				}
 				qualifiedName = declaringClass.getQualifiedName();
 				qn.binding = declaringClass;
 			} else {
@@ -766,6 +813,10 @@ public boolean visit(ClassInstanceCreation node) {
 //				QNTypeBinding qn = new QNTypeBinding();
 //				String qualifiedName = null;
 //				if (declaringClass != null) {
+//					ITypeBinding dclClass = null;
+//					while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+//						declaringClass = dclClass;
+//					}
 //					qualifiedName = declaringClass.getQualifiedName();
 //					qn.binding = declaringClass;
 //				} else {
@@ -798,6 +849,10 @@ public boolean visit(MethodInvocation node) {
 				QNTypeBinding qn = new QNTypeBinding();
 				String qualifiedName = null;
 				if (declaringClass != null) {
+					ITypeBinding dclClass = null;
+					while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+						declaringClass = dclClass;
+					}
 					qualifiedName = declaringClass.getQualifiedName();
 					qn.binding = declaringClass;
 				} else {
@@ -925,6 +980,10 @@ public boolean visit(FieldAccess node) {
 				QNTypeBinding qn = new QNTypeBinding();
 				String qualifiedName = null;
 				if (declaringClass != null) {
+					ITypeBinding dclClass = null;
+					while ((dclClass = declaringClass.getDeclaringClass()) != null) {
+						declaringClass = dclClass;
+					}
 					qualifiedName = declaringClass.getQualifiedName();
 					qn.binding = declaringClass;
 				} else {
