Add Simple Pipe's #deal's parameter type to optional class dependencies, so no extra @j2sOptionalRequire * is needed to load those classes.

zhourenjian · zhourenjian · commit c865d216bd77 · 2009-02-26T15:16:58.000Z
Fixing some NPE bugs
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -627,7 +627,10 @@ protected void visitMethodParameterList(List arguments,
 				boxingNode(element);
 				Expression exp = (Expression) element;
 				ITypeBinding typeBinding = exp.resolveTypeBinding();
-				String typeName = typeBinding.getName();
+				String typeName = null;
+				if (typeBinding != null) {
+					typeName = typeBinding.getName();
+				}
 				String parameterTypeName = null;
 				if (parameterTypes != null) {
 					parameterTypeName = parameterTypes[i].getName();
@@ -1703,8 +1706,8 @@ public boolean visit(MethodInvocation node) {
 		buffer.append(" (");
 
 		IMethodBinding methodBinding = node.resolveMethodBinding();
-		ITypeBinding[] paramTypes = methodBinding.getParameterTypes();
 		if (methodBinding != null && methodBinding.isVarargs()) {
+			ITypeBinding[] paramTypes = methodBinding.getParameterTypes();
 			visitList(args, ", ", 0, paramTypes.length - 1);
 			if (paramTypes.length - 1 > 0) {
 				buffer.append(", ");
@@ -2585,7 +2588,8 @@ public void endVisit(TypeDeclaration node) {
 	private String prepareSimpleSerializable(TypeDeclaration node, List bodyDeclarations) {
 		StringBuffer fieldsSerializables = new StringBuffer();
 		ITypeBinding binding = node.resolveBinding();
-		boolean isSimpleSerializable = (Bindings.findTypeInHierarchy(binding, "net.sf.j2s.ajax.SimpleSerializable") != null);
+		boolean isSimpleSerializable = binding != null
+				&& (Bindings.findTypeInHierarchy(binding, "net.sf.j2s.ajax.SimpleSerializable") != null);
 		for (Iterator iter = bodyDeclarations.iterator(); iter.hasNext();) {
 			ASTNode element = (ASTNode) iter.next();
 			if (element instanceof FieldDeclaration) {
diff --git a/src/net/sf/j2s/core/astvisitors/Bindings.java b/src/net/sf/j2s/core/astvisitors/Bindings.java
@@ -955,7 +955,7 @@ public static boolean isEqualMethod(IMethodBinding method, String methodName, St
 	 * @return the type binding
 	 */
 	public static ITypeBinding findTypeInHierarchy(ITypeBinding hierarchyType, String fullyQualifiedTypeName) {
-		if (hierarchyType.isArray() || hierarchyType.isPrimitive()) {
+		if (hierarchyType == null || hierarchyType.isArray() || hierarchyType.isPrimitive()) {
 			return null;
 		}
 		if (fullyQualifiedTypeName.equals(hierarchyType.getQualifiedName())) {
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -905,6 +905,24 @@ public void setToCompileVariableName(boolean toCompileVariableName) {
 	
 	public boolean visit(MethodDeclaration node) {
 		IMethodBinding mBinding = node.resolveBinding();
+		if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.SimplePipeRunnable", "deal")) {
+			ITypeBinding[] parameterTypes = mBinding.getParameterTypes();
+			if (parameterTypes != null && parameterTypes.length == 1) {
+				ITypeBinding paramType = parameterTypes[0];
+				ITypeBinding declaringClass = paramType.getDeclaringClass();
+				QNTypeBinding qn = new QNTypeBinding();
+				String qualifiedName = null;
+				if (declaringClass != null) {
+					qn.binding = declaringClass;
+					qualifiedName = declaringClass.getQualifiedName();
+				} else {
+					qn.binding = paramType;
+					qualifiedName = paramType.getQualifiedName();
+				}
+				qn.qualifiedName = discardGenericType(qualifiedName);
+				optionals.add(qn);
+			}
+		}
 		boolean toBeIgnored = false;
 		if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.SimpleRPCRunnable", "ajaxRun")) {
 			toBeIgnored = true;

Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ public static boolean isEqualMethod(IMethodBinding method, String methodName, St`
`955`	`955`	`* @return the type binding`
`956`	`956`	`*/`
`957`	`957`	`public static ITypeBinding findTypeInHierarchy(ITypeBinding hierarchyType, String fullyQualifiedTypeName) {`
`958`		`- if (hierarchyType.isArray() \|\| hierarchyType.isPrimitive()) {`
	`958`	`+ if (hierarchyType == null \|\| hierarchyType.isArray() \|\| hierarchyType.isPrimitive()) {`
`959`	`959`	`return null;`
`960`	`960`	`}`
`961`	`961`	`if (fullyQualifiedTypeName.equals(hierarchyType.getQualifiedName())) {`