Bug fixes

zhourenjian · zhourenjian · commit 27ad92b5a25b · 2016-06-24T11:49:11.000+08:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -886,17 +886,17 @@ protected void visitMethodParameterList(ITypeBinding nodeTypeBinding, List argum
 					}
 				}
 			}
+			if (!alreadyPrefixed && prefix != null) {
+				buffer.append(prefix);
+				alreadyPrefixed = true;
+			}
 			if (!isVarArgs && ambitiousResult != null && ambitiousResult[i] != null) {
 				buffer.append("Clazz.castObjectAs(");
 			}
 			String parameterTypeName = null;
 			if (parameterTypes != null) {
 				parameterTypeName = parameterTypes[i].getName();
 			}
-			if (!alreadyPrefixed && prefix != null) {
-				buffer.append(prefix);
-				alreadyPrefixed = true;
-			}
 			if (isVarArgs) {
 				buffer.append("[");
 				for (int j = i; j < argSize; j++) {
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -341,6 +341,10 @@ public static void main(String[] args) {
 
 
 	public boolean isNodeInMustPath(ASTNode node) {
+		// Add more class dependencies in musts will make classloader running
+		// into stack call limit reached.
+		// Temporary disable this bug fix.
+		/*
 		if (node == null) return false;
 		do {
 			if (node instanceof TypeDeclaration) {
@@ -350,14 +354,15 @@ public boolean isNodeInMustPath(ASTNode node) {
 				MethodDeclaration m = (MethodDeclaration) node;
 				return m.isConstructor();
 			}
-			if (node instanceof VariableDeclarationFragment) {
+			if (node instanceof FieldDeclaration) {
 				return true;
 			}
 			if (node instanceof Initializer) {
 				return true;
 			}
 			node = node.getParent();
 		} while (node != null);
+		// */
 		return false;
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -886,17 +886,17 @@ protected void visitMethodParameterList(ITypeBinding nodeTypeBinding, List argum`
`886`	`886`	`}`
`887`	`887`	`}`
`888`	`888`	`}`
	`889`	`+ if (!alreadyPrefixed && prefix != null) {`
	`890`	`+ buffer.append(prefix);`
	`891`	`+ alreadyPrefixed = true;`
	`892`	`+ }`
`889`	`893`	`if (!isVarArgs && ambitiousResult != null && ambitiousResult[i] != null) {`
`890`	`894`	`buffer.append("Clazz.castObjectAs(");`
`891`	`895`	`}`
`892`	`896`	`String parameterTypeName = null;`
`893`	`897`	`if (parameterTypes != null) {`
`894`	`898`	`parameterTypeName = parameterTypes[i].getName();`
`895`	`899`	`}`
`896`		`- if (!alreadyPrefixed && prefix != null) {`
`897`		`- buffer.append(prefix);`
`898`		`- alreadyPrefixed = true;`
`899`		`- }`
`900`	`900`	`if (isVarArgs) {`
`901`	`901`	`buffer.append("[");`
`902`	`902`	`for (int j = i; j < argSize; j++) {`
Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,10 @@ public static void main(String[] args) {`
`341`	`341`
`342`	`342`
`343`	`343`	`public boolean isNodeInMustPath(ASTNode node) {`
	`344`	`+ // Add more class dependencies in musts will make classloader running`
	`345`	`+ // into stack call limit reached.`
	`346`	`+ // Temporary disable this bug fix.`
	`347`	`+ /*`
`344`	`348`	`if (node == null) return false;`
`345`	`349`	`do {`
`346`	`350`	`if (node instanceof TypeDeclaration) {`
`@@ -350,14 +354,15 @@ public boolean isNodeInMustPath(ASTNode node) {`
`350`	`354`	`MethodDeclaration m = (MethodDeclaration) node;`
`351`	`355`	`return m.isConstructor();`
`352`	`356`	`}`
`353`		`- if (node instanceof VariableDeclarationFragment) {`
	`357`	`+ if (node instanceof FieldDeclaration) {`
`354`	`358`	`return true;`
`355`	`359`	`}`
`356`	`360`	`if (node instanceof Initializer) {`
`357`	`361`	`return true;`
`358`	`362`	`}`
`359`	`363`	`node = node.getParent();`
`360`	`364`	`} while (node != null);`
	`365`	`+ // */`
`361`	`366`	`return false;`
`362`	`367`	`}`
`363`	`368`