BH 2020.05.01 -- 3.2.9-v1i fix for nested lambda methods

BobHanson · BobHanson · commit 0932924d354d · 2020-05-01T15:57:36.000-05:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -30,6 +30,7 @@ public class CorePlugin extends Plugin {
 	// if you change the x.x.x number, be sure to also indicate that in 
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
+	// BH 2020.05.01 -- 3.2.9-v1i fix for nested lambda methods
 	// BH 2020.04.26 -- 3.2.9-v1h fix for inner classes of interfaces duplicated; fix for api.js inner class method names unqualified
 	// BH 2020.04.15 -- 3.2.9-v1g fix for qualified super() in inner classes using Class.super_ call (Tracker)
 	// BH 2020.04.05 -- 3.2.9-v1f (Boolean ? ...) not unboxed
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -135,6 +135,7 @@
 
 // TODO: superclass inheritance for JAXB XmlAccessorType
 
+//BH 2020.05.01 -- 3.2.9-v1i fix for nested lambda methods
 //BH 2020.04.26 -- 3.2.9-v1h fix for inner classes of interfaces duplicated; fix for api.js inner class method names unqualified
 //BH 2020.04.15 -- 3.2.9-v1g fix for qualified super() in inner classes using Class.super_ call (Tracker)
 //BH 2020.04.05 -- 3.2.9-v1f (Boolean ? ...) not unboxed
@@ -2021,6 +2022,7 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 		if (binding == null)
 			return false;
 
+		
 //		checkGenericBinding(binding, binding);
 
 		ASTNode parent = node.getParent();
@@ -2035,6 +2037,7 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 		boolean isTopLevel = (!isLambda && binding.isTopLevel());
 		boolean isAbstract = ((binding.getModifiers() & Modifier.ABSTRACT) != 0);
 
+		
 		if (!isTopLevel && !isAnonymous && node != innerNode) {
 			// inner named class first pass only
 
@@ -2074,7 +2077,6 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 			} else {
 				tempVisitor.addClassOrInterface(node, binding, bodyDeclarations, type);
 			}
-
 			// append it to our TrailingBuffer
 			trailingBuffer.append(tempVisitor.buffer.toString());
 
@@ -2134,6 +2136,8 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 			finalPackageName = checkPackageP$Name(class_fullName.substring(0, pt1));
 		}
 
+		int lc = lambdaCount;
+
 		// add the anonymous wrapper if needed
 
 		if (!isTopLevel) {
@@ -2579,7 +2583,6 @@ && checkAnnotations(element, CHECK_J2S_IGNORE_AND_ANNOTATIONS)) {
 			xml_annotationType = ANNOTATION_TYPE_UNKNOWN;
 			// class_hasTypeAnnotations = false;
 		}
-
 		buffer.append(trailingBuffer.getString()); // also writes the assert string
 		if (isAnonymous) {
 			// if anonymous, restore old static def buffer
@@ -2610,6 +2613,11 @@ && checkAnnotations(element, CHECK_J2S_IGNORE_AND_ANNOTATIONS)) {
 				class_annotations = oldAnnotations;
 			}
 		}
+		
+
+		lambdaCount = lc;
+
+		
 		return isStatic;
 	}
 
@@ -4948,7 +4956,8 @@ private String getUnreplacedJavaClassNameSuperNoBrackets(ITypeBinding typeBindin
 	private int lambdaCount = 0;
 
 	private String getMyJavaClassNameLambda(boolean andIncrement) {
-		return package_name + "." + class_shortName.replace('.', '$') + "$lambda"
+		return package_name + "." + class_shortName.replace('.', '$')
+				+ (class_shortName.indexOf("$lambda") >= 0 ? "$" : "$lambda")
 				+ (andIncrement ? ++lambdaCount : lambdaCount);
 	}
 
