// BH 2020.11.20 -- 3.2.9-v1q

hansonr · hansonr · commit 197bff9481b7 · 2020-11-20T12:18:34.000-06:00
fix for  new ImmutableCollections.ListN&lt;&gt;(E...) should use Object[]
diff --git a/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20201117143212 
+20201120120959 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20201117143212 
+20201120120157 
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
@@ -31,6 +31,7 @@ public class CorePlugin extends Plugin {
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
 
+	// BH 2020.11.20 -- 3.2.9-v1q fix for  new ImmutableCollections.ListN<>(E...) should use Object[] 
 	// BH 2020.08.03 -- 3.2.9-v1p fix for boxing boolean should be Boolean.valueOf$, not new Boolean
 	// BH 2020.08.01 -- 3.2.9-v1o fix for lambda expressions too static
 	// BH 2020.07.08 -- 3.2.9-v1n fix for try with resources and adds option varOrLet
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.11.20 -- 3.2.9-v1q fix for  new ImmutableCollections.ListN<>(E...) should use Object[] 
 //BH 2020.08.03 -- 3.2.9-v1p fix for boxing boolean should be Boolean.valueOf$, not new Boolean
 //BH 2020.08.01 -- 3.2.9-v1o fix for lambda expressions too static
 //BH 2020.07.08 -- 3.2.9-v1n fix for try with resources and adds option varOrLet
@@ -4258,6 +4259,8 @@ private String clazzArray(ITypeBinding type, int dimFlag) {
 		ITypeBinding ebinding = type.getElementType();
 		if (ebinding == null)
 			ebinding = type; // creating for Enum
+		
+		System.out.println("J2S.clazzArray " + type + "  k=" + type.getKey() + " n=" + type.getName());
 		String params = (ebinding.isPrimitive() ? NameMapper.getPrimitiveTYPE(ebinding.getName()) + ".TYPE"
 				: getFinalJ2SClassNameQualifier(null, ebinding, null, FINAL_ESCAPECACHE))
 				+ (dimFlag == ARRAY_DIM_ONLY ? "" : ", " + (Math.abs(dimFlag) * type.getDimensions() * -1));
@@ -5133,13 +5136,22 @@ String getFinalJ2SClassNameQualifier(Name methodQualifier, ITypeBinding declarin
 		// It will require synchronous loading,
 		// but it will ensure that a class is only
 		// loaded when it is really needed.
-
+		
 		if (declaringJavaClassName == null)
 			declaringJavaClassName = getUnreplacedJavaClassNameQualified(declaringJavaClass);
+		
 		boolean isStatic = ((flags & FINAL_STATIC) == FINAL_STATIC);
 		boolean doEscape = isStatic || ((flags & FINAL_ESCAPE) == FINAL_ESCAPE);
 		boolean doCache = ((flags & FINAL_CACHE) == FINAL_CACHE);
 		String name = removeBracketsAndFixNullPackageName(declaringJavaClassName);
+		if (name.equals("_.")) {
+// 2020.11.20 -- 3.2.9-v1q  generated by			
+//		    static <E> java.util.List<E> of(E e1, E e2, E e3, E e4) {
+//		        return new ImmutableCollections.ListN<>(e1, e2, e3, e4);
+//		    }
+
+			return "java.lang.Object";
+		}		
 		doEscape &= !NameMapper.isClassKnown(name);
 		if (!doEscape) {
 			if (methodQualifier != null) {
