Transpiler fix

hansonr · hansonr · commit 0c88387f937b · 2020-08-07T06:49:24.000-05:00
//BH 2020.08.03 -- 3.2.9-v1p fix for boxing boolean should be
Boolean.valueOf$, not new Boolean
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.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
 	// BH 2020.07.04 -- 3.2.9.v1m fix for X.super.y() in anonymous class
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.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
 //BH 2020.07.04 -- 3.2.9-v1m fix for X.super.y() in anonymous class
@@ -4835,10 +4836,17 @@ private boolean appendBoxingNode(ASTNode element, boolean toCharCode) {
 				ITypeBinding typeBinding = exp.resolveTypeBinding();
 				if (typeBinding.isPrimitive()) {
 					String name = typeBinding.getName();
-					name = (name.equals("char") ? "Character"
-							: name.equals("int") ? "Integer"
-									: Character.toUpperCase(name.charAt(0)) + name.substring(1));
-					buffer.append("new " + name + "(");
+					String t = getJSTypeCode(name);
+					switch (name) {
+					case "char":
+						name = "Character";break;
+					case "int":
+						name = "Integer";break;
+					default:
+						 name = Character.toUpperCase(name.charAt(0)) + name.substring(1);
+						 break;
+					}
+					buffer.append(name + ".valueOf$" + t + "(");
 					element.accept(this);
 					buffer.append(")");
 					return true;
@@ -5681,48 +5689,40 @@ private String j2sGetParamCode(ITypeBinding binding) {
 		// as well.
 		// NOTE: These are the same as standard Java Spec, with the exception of
 		// Short, which is "H" instead of "S"
+		name = getJSTypeCode(name);
+		if (arrays != null) {
+			arrays = arrays.replaceAll("\\[\\]", "A");
+			name += arrays;
+		}
+		return name;
+	}
 
-		switch (name) {
+	private String getJSTypeCode(String className) {
+		switch (className) {
 		case "boolean":
-			name = "Z";
-			break;
+			return "Z";
 		case "byte":
-			name = "B";
-			break;
+			return "B";
 		case "char":
-			name = "C";
-			break;
+			return "C";
 		case "double":
-			name = "D";
-			break;
+			return "D";
 		case "float":
-			name = "F";
-			break;
+			return "F";
 		case "int":
-			name = "I";
-			break;
+			return "I";
 		case "long":
-			name = "J";
-			break;
+			return "J";
 		case "short":
-			name = "H"; // differs from Java Spec so we can use S for String
-			break;
+			return "H"; // differs from Java Spec so we can use S for String
 		case "java.lang.Object":
 		case "Object":
-			name = "O";
-			break;
+			return "O";
 		case "java.lang.String":
-			name = "S";
-			break;
+			return "S";
 		default:
-			name = stripJavaLang(NameMapper.checkClassReplacement(name)).replace('.', '_');
-			break;
-		}
-		if (arrays != null) {
-			arrays = arrays.replaceAll("\\[\\]", "A");
-			name += arrays;
+			return stripJavaLang(NameMapper.checkClassReplacement(className)).replace('.', '_');
 		}
-		return name;
 	}
 
 	/**
