fixes innerClass[].getClass().getName() returning "." not "$"

hansonr · hansonr · commit e5b484205463 · 2020-07-28T08:04:30.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Inner.java b/sources/net.sf.j2s.java.core/src/test/Test_Inner.java
@@ -80,6 +80,7 @@ public static void main(String[] args) {
 		System.out.println(inner.t_test);
 		System.out.println("new Test_Inner(){}.t_test=" + new Test_Inner(7) {}.t_test);
 		Test_Abstract_a abs = inner.new Test_Abstract_a();
+		System.out.println(new Test_Abstract_a[] {abs}.getClass().getName());
 		abs.testing();
 		new Test_Inner(8) {}.new Test_Abstract_a().testing();
 
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -7,6 +7,7 @@
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 2020.07.27 fix for inner class array names
 // BH 2020.06.18 better test for instanceof Object[]
 // BH 2020.06.03 sets user.home and user.dir to /TEMP/swingjs, and user.name to "swingjs"
 // BH 2020.04.01 2.2.0-v1e fixes missing C$.superclazz when class loaded from core
@@ -1091,7 +1092,7 @@ var arrayClass = function(baseClass, ndim) {
       break;
     default:
       if (stub.length > 1)
-        stub = baseClass.__CLASS_NAME__;
+        stub = baseClass.__CLASS_NAME$__ || baseClass.__CLASS_NAME__;
       break;
     }
     if (stub.indexOf(".") >= 0)
@@ -1254,7 +1255,7 @@ var shiftArray = function(a, i0, k) {
 
 var getParamCode = Clazz._getParamCode = function(cl) {
   cl.$clazz$ && (cl = cl.$clazz$);
-  return cl.__PARAMCODE || (cl.__PARAMCODE = stripJavaLang(cl.__CLASS_NAME__).replace(/\./g, '_'));
+  return cl.__PARAMCODE || (cl.__PARAMCODE = stripJavaLang(cl.__CLASS_NAME$__ || cl.__CLASS_NAME__).replace(/\./g, '_'));
 }
 
 var newTypedA = function(baseClass, args, nBits, ndims, isClone) {
