Fixed bugs on dealing "int.class" or so TypeLiteral.

zhourenjian · zhourenjian · commit d77068e8530f · 2007-06-17T17:37:59.000Z
And Fixed bug that "Object ..." is not correctly wrapped with "[]" on the argument of "new Object [] {...}".
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -1435,9 +1435,17 @@ public boolean visit(MethodInvocation node) {
 			if (paramTypes.length - 1 > 0) {
 				buffer.append(", ");
 			}
-			buffer.append("[");
+			boolean needBrackets = true;
+			if (args.size() == 1) {
+				Expression arg = (Expression) args.get(0);
+				ITypeBinding resolveTypeBinding = arg.resolveTypeBinding();
+				if (resolveTypeBinding.isArray()) {
+					needBrackets = false;
+				}
+			}
+			if (needBrackets) buffer.append("[");
 			visitList(args, ", ", paramTypes.length - 1, size);
-			buffer.append("]");
+			if (needBrackets) buffer.append("]");
 		} else {
 			for (Iterator iter = args.iterator(); iter.hasNext();) {
 				ASTNode element = (ASTNode) iter.next();
@@ -2548,7 +2556,22 @@ public static void main(String[] args) {
 	}
 
 	public boolean visit(TypeLiteral node) {
-		node.getType().accept(this);
+		Type type = node.getType();
+		if (type.isPrimitiveType()) {
+			ITypeBinding resolveBinding = type.resolveBinding();
+			String name = resolveBinding.getName();
+			if ("boolean".equals(name)) {
+				buffer.append("Boolean");
+				return false;
+			} else { // TODO: More types? Integer, Long, Double, ... ?
+				buffer.append("Number");
+				return false;
+			}
+		} else if (type.isArrayType()) {
+			buffer.append("Array");
+			return false;
+		}
+		type.accept(this);
 		return false;
 	}
 
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -108,7 +108,7 @@ protected void checkSuperType(Set set) {
 				for (Iterator iterator = classBindingSet.iterator(); iterator
 						.hasNext();) {
 					ITypeBinding binding = (ITypeBinding) iterator.next();
-					if (Bindings.isSuperType(binding, qn.binding)) {
+					if (qn.binding != null && Bindings.isSuperType(binding, qn.binding)) {
 						removed.add(qn);
 						isRemoved = true;
 						break;
@@ -126,11 +126,38 @@ protected void checkSuperType(Set set) {
 			set.add(qn.qualifiedName);
 		}
 	}
+	
+
+	protected void remedyReflectionDependency(Set set) {
+		boolean needRemedy = false;;
+		for (Iterator iterator = set.iterator(); iterator.hasNext();) {
+			Object next = iterator.next();
+			String name = null;
+			if (next instanceof QNTypeBinding) {
+				QNTypeBinding qn = (QNTypeBinding) next;
+				name = qn.qualifiedName;
+			} else {
+				name = (String) next;
+			}
+			if ("net.sf.j2s.ajax.AClass".equals(name)
+					|| "net.sf.j2s.ajax.ASWTClass".equals(name)) {
+				needRemedy = true;
+				break;
+			}
+		}
+		if (needRemedy) {
+			set.add("java.lang.reflect.Constructor");
+		}
+	}
+
 	public String getDependencyScript(StringBuffer mainJS) {
 		checkSuperType(musts);
 		checkSuperType(requires);
 		checkSuperType(optionals);
-		
+		remedyReflectionDependency(musts);
+		remedyReflectionDependency(requires);
+		remedyReflectionDependency(optionals);
+
 		musts.remove("");
 		requires.remove("");
 		optionals.remove("");
@@ -449,6 +476,15 @@ public boolean isClassKnown(String qualifiedName) {
 	public boolean isQualifiedNameOK(String qualifiedName, ASTNode node) {
 		if (qualifiedName != null 
 				&& !isClassKnown(qualifiedName)
+				&& qualifiedName.indexOf('[') == -1
+				&& !"int".equals(qualifiedName)
+				&& !"float".equals(qualifiedName)
+				&& !"double".equals(qualifiedName)
+				&& !"long".equals(qualifiedName)
+				&& !"short".equals(qualifiedName)
+				&& !"byte".equals(qualifiedName)
+				&& !"char".equals(qualifiedName)
+				&& !"boolean".equals(qualifiedName)
 				&& !qualifiedName.startsWith("org.w3c.dom.")
 				&& !qualifiedName.startsWith("org.eclipse.swt.internal.xhtml.")) {
 			ASTNode root = node.getRoot();
@@ -573,7 +609,7 @@ protected void visitForRequires(AbstractTypeDeclaration node) {
 			}
 		}
 	}
-
+	
 	private DependencyASTVisitor getSelfVisitor() {
 		try {
 			Object obj = this.getClass().getConstructor(new Class[0]).newInstance(new Object[0]);
diff --git a/src/net/sf/j2s/core/astvisitors/MethodReferenceASTVisitor.java b/src/net/sf/j2s/core/astvisitors/MethodReferenceASTVisitor.java
@@ -34,7 +34,6 @@ public class MethodReferenceASTVisitor extends ASTVisitor {
 	private MethodReferenceASTVisitor(String methodSignature) {
 		super();
 		this.methodSignature = methodSignature;
-		System.out.println("visitor:" + methodSignature);
 	}
 	
 	public static boolean checkReference(ASTNode node, String methodSignature) {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public class MethodReferenceASTVisitor extends ASTVisitor {`
`34`	`34`	`private MethodReferenceASTVisitor(String methodSignature) {`
`35`	`35`	`super();`
`36`	`36`	`this.methodSignature = methodSignature;`
`37`		`- System.out.println("visitor:" + methodSignature);`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`public static boolean checkReference(ASTNode node, String methodSignature) {`