Fixing bug#2797539 : Incorrect instantiation of member before inner class declaration inside interface

zhourenjian · zhourenjian · commit 581b59a2f105 · 2009-05-29T15:37:50.000Z
http://sourceforge.net/tracker/?func=detail&aid=2797539&group_id=155436&atid=795800 Interface's inner classes declaration is not in the correct order. Fix it by move codes a few lines ahead of member initialization.
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -1735,7 +1735,7 @@ public boolean visit(MethodInvocation node) {
 			//if (args.size() == 1) {
 				Expression arg = (Expression) args.get(args.size() - 1);
 				ITypeBinding resolveTypeBinding = arg.resolveTypeBinding();
-				if (resolveTypeBinding.isArray()) {
+				if (resolveTypeBinding != null && resolveTypeBinding.isArray()) {
 					needBrackets = false;
 				}
 			//}
@@ -2437,6 +2437,12 @@ public void endVisit(TypeDeclaration node) {
 		
 		int staticCount = -1;
 		ReferenceASTVisitor refVisitor = new ReferenceASTVisitor();
+		/*
+		 * Fixing bug#2797539 : Incorrect instantiation of member before inner class declaration inside interface
+		 * http://sourceforge.net/tracker/?func=detail&aid=2797539&group_id=155436&atid=795800
+		 * Interface's inner classes declaration is not in the correct order. Fix it by move codes a few lines
+		 * ahead of member initialization. 
+		 */
 		for (Iterator iter = bodyDeclarations.iterator(); iter.hasNext();) {
 			ASTNode element = (ASTNode) iter.next();
 			if (element instanceof TypeDeclaration) {
@@ -2447,6 +2453,19 @@ public void endVisit(TypeDeclaration node) {
 					 */
 					element.accept(this);
 				}
+			}
+		}
+		// Interface's inner interfaces or classes
+		buffer.append(laterBuffer);
+		
+		for (Iterator iter = bodyDeclarations.iterator(); iter.hasNext();) {
+			ASTNode element = (ASTNode) iter.next();
+			if (element instanceof TypeDeclaration) {
+				if (node.isInterface()) {
+					// the above codes have already dealt those inner classes inside interface
+					// just ignore here
+					continue;
+				}
 			} else if (element instanceof Initializer) {
 				if (getJ2STag((Initializer) element, "@j2sIgnore") != null) {
 					continue;
@@ -2586,8 +2605,6 @@ public void endVisit(TypeDeclaration node) {
 		if (staticCount != -1) {
 			buffer.append(");\r\n");
 		}
-		// Interface's inner interfaces or classes
-		buffer.append(laterBuffer);
 		
 		String fieldsSerializables = prepareSimpleSerializable(node, bodyDeclarations);
 		if (fieldsSerializables.length() > 0) {
diff --git a/src/net/sf/j2s/core/astvisitors/MethodReferenceASTVisitor.java b/src/net/sf/j2s/core/astvisitors/MethodReferenceASTVisitor.java
@@ -111,9 +111,12 @@ public boolean visit(MethodInvocation node) {
 	 */
 	public boolean visit(SuperMethodInvocation node) {
 		IMethodBinding methodBinding = node.resolveMethodBinding();
-		String key = methodBinding.getKey();
-		if (key != null) {
-			key = key.replaceAll("<[^>]+>", "");
+		String key = null;
+		if (methodBinding != null) {
+			key = methodBinding.getKey();
+			if (key != null) {
+				key = key.replaceAll("<[^>]+>", "");
+			}
 		}
 		if (methodSignature.equals(key)) {
 			isReferenced = true;
