adds missing default constructors for second outer class in a file

BobHanson · BobHanson · commit 1b351c186f26 · 2017-09-01T23:52:38.000-05: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
@@ -1965,6 +1965,8 @@ public boolean visit(TypeDeclaration node) {
 		// definition that does not remove anything and needs no {...}
 		addAnonymousFunctionWrapper(true);
 		readSources(node, "@j2sPrefix", "", " ", true);
+		
+		// add decorateAsClass
 		buffer.append("var C$ = Clazz.decorateAsClass (function () {\r\n");
 
 		// add all inner classes iteratively
@@ -2569,20 +2571,22 @@ static String j2sGetParamCode(ITypeBinding binding, boolean addAAA) {
 	}
 
 	private void addDefaultConstructor() {
-		if (defaultConstructor != null && !defaultConstructor.isVarargs())
-			return;
-		buffer.append("\r\nClazz.newMethod$(C$, 'construct', function () {");
-		if (defaultConstructor == null) {
-			addSuperConstructor(null, null);
-		} else {
-			// TODO BH: This is still not right. It's specifically for anonymous
-			// constructors
-			// But I can't seem to see how to get the right vararg constructor
-			// (float...) vs (int...)
-			addThisConstructorCall(defaultConstructor, new ArrayList<Object>());
+		if (defaultConstructor == null || defaultConstructor.isVarargs()) {
+			buffer.append("\r\nClazz.newMethod$(C$, 'construct', function () {");
+			if (defaultConstructor == null) {
+				addSuperConstructor(null, null);
+			} else {
+				// TODO BH: This is still not right. It's specifically for
+				// anonymous
+				// constructors
+				// But I can't seem to see how to get the right vararg
+				// constructor
+				// (float...) vs (int...)
+				addThisConstructorCall(defaultConstructor, new ArrayList<Object>());
+			}
+			buffer.append("}, 1);\r\n");
 		}
-		buffer.append("}, 1);\r\n");
-
+		defaultConstructor = null;
 	}
 
 	private void addSuperConstructor(SuperConstructorInvocation node, IMethodBinding methodDeclaration) {
