Fixed bug that class a.A my have a.A.B in its optional dependent class list.

zhourenjian · zhourenjian · commit c739bbd03b8d · 2009-02-10T14:56:08.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -126,13 +126,14 @@ protected void checkSuperType(Set set) {
 	}
 	
 
-	protected void remedyReflectionDependency(Set set) {
+	protected void remedyDependency(Set set) {
 		String[] classNames = getClassNames();
 		for (int i = 0; i < classNames.length; i++) {
 			if ("net.sf.j2s.ajax.ASWTClass".equals(classNames[i])) {
 				return;
 			}
 		}
+		List toRemoveList = new ArrayList();
 		boolean needRemedy = false;;
 		for (Iterator iterator = set.iterator(); iterator.hasNext();) {
 			Object next = iterator.next();
@@ -146,21 +147,30 @@ protected void remedyReflectionDependency(Set set) {
 			if ("net.sf.j2s.ajax.AClass".equals(name)
 					|| "net.sf.j2s.ajax.ASWTClass".equals(name)) {
 				needRemedy = true;
-				break;
+				//break;
+			}
+			for (Iterator itr = classNameSet.iterator(); itr.hasNext();) {
+				String className = (String) itr.next();
+				if (name.startsWith(className + ".")) { // inner class dependency
+					toRemoveList.add(next);
+				}
 			}
 		}
 		if (needRemedy) {
 			set.add("java.lang.reflect.Constructor");
 		}
+		for (Iterator iterator = toRemoveList.iterator(); iterator.hasNext();) {
+			set.remove(iterator.next());
+		}
 	}
 
 	public String getDependencyScript(StringBuffer mainJS) {
 		checkSuperType(musts);
 		checkSuperType(requires);
 		checkSuperType(optionals);
-		remedyReflectionDependency(musts);
-		remedyReflectionDependency(requires);
-		remedyReflectionDependency(optionals);
+		remedyDependency(musts);
+		remedyDependency(requires);
+		remedyDependency(optionals);
 
 		musts.remove("");
 		requires.remove("");
