fix for bug http://sourceforge.net/tracker/?func=detail&aid=3037341&group_id=155436&atid=795800 with static imports

sebastigurin@gmail.com · sebastigurin@gmail.com · commit 2b137fec9737 · 2011-05-12T16:21:23.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -18,6 +18,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.Annotation;
@@ -346,6 +347,19 @@ public boolean visit(PackageDeclaration node) {
 		ASTPackageVisitor packageVisitor = ((ASTPackageVisitor) getAdaptable(ASTPackageVisitor.class));
 		packageVisitor.setPackageName("" + node.getName());
 		return false;
+	}	
+	
+	//sgurin - fix for bug http://sourceforge.net/tracker/?func=detail&aid=3037341&group_id=155436&atid=795800 with static imports
+	public void endVisit(ImportDeclaration node) {
+		super.endVisit(node);
+		if(node.isStatic()&&node.isOnDemand()) {			
+			String qnameStr = node.getName().getFullyQualifiedName();
+			if(qnameStr!=null && !qnameStr.equals("") && isQualifiedNameOK(qnameStr, node)) {
+				if(!musts.contains(qnameStr)) {
+					musts.add(qnameStr);
+				}
+			}
+		}		
 	}
 
 	protected void readClasses(Annotation annotation, Set set) {
