$fields$ and missing java.lang for java.lang.reflect/ and annotation/

BobHanson · BobHanson · commit c6c0d1084ccf · 2020-02-01T15:36:47.000-06:00
//BH 2020.01.31 -- 3.2.7-v5 'L' used instead of 'J' in $fields$
//BH 2020.01.31 -- 3.2.7-v5 java.lang.reflect.* should not be truncated
to reflect.*
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
@@ -25,7 +25,10 @@ public class CorePlugin extends Plugin {
 	 * "net.sf.j2s.core.jar" not "net.sf.j2s.core.3.2.5"
 	 * 
 	 */
-	public static String VERSION = "3.2.7-v3";
+	public static String VERSION = "3.2.7-v5";
+	// BH 2020.01.31 -- 3.2.7-v5 'L' used instead of 'J' in $fields$
+	// BH 2020.01.31 -- 3.2.7-v5 java.lang.reflect.* should not be truncated to reflect.* in parameters
+	// BH 2020.01.16 -- 3.2.7-v4 replaces extends java.awt.Component and javax.swing.JComponent 
 	// BH 2020.01.12 -- 3.2.7-v3 fixes JAXB annotation marshalling for 3.2.7 
 	// BH 2020.01.11 -- 3.2.7-v3 corrects and rewrites synthetic bridge creation with much cleaner heap usage 
 	// BH 2020.01.09 -- 3.2.7-v2 introduces @j2sAlias as a way of adding a custom method name, as in exports. 
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,8 @@
 
 // TODO: superclass inheritance for JAXB XmlAccessorType
 
+//BH 2020.01.31 -- 3.2.7-v5 'L' used instead of 'J' in $fields$
+//BH 2020.01.31 -- 3.2.7-v5 java.lang.reflect.* should not be truncated to reflect.*
 //BH 2020.01.16 -- 3.2.7-v4 replaces extends java.awt.Component and javax.swing.JComponent 
 //BH 2020.01.12 -- 3.2.7-v3 fixes JAXB annotation marshalling for 3.2.7 
 //BH 2020.01.11 -- 3.2.7-v3 corrects and rewrites synthetic bridge creation with much cleaner heap usage 
@@ -535,7 +537,7 @@ private char getLastCharInBuffer() {
 
 	// order above can be changed, but typeCode order must then be adapted
 	
-	private final static String typeCodes = "ZBCDFILHSO";
+	private final static String typeCodes = "ZBCDFIJHSO";
 	
 	private class FieldInfo {
 		@SuppressWarnings("unchecked")
@@ -2656,7 +2658,6 @@ private void addEnumConstants(EnumDeclaration e, List<EnumConstantDeclaration> e
 	 * 
 	 * 
 	 * @param field  the field being declared
-	 * @param fields
 	 * @param isStatic
 	 * @return true if anything was written to the buffer
 	 */
@@ -4831,9 +4832,12 @@ private String getMyJavaClassNameLambda(boolean andIncrement) {
 
 	static String stripJavaLang(String name) {
 		// shorten java.lang.XXX.YYY but not java.lang.xxx.YYY
-		String s = (!name.startsWith("java.lang.") || name.equals("java.lang.Object")
-				|| name.length() > 10 && !Character.isUpperCase(name.charAt(10)) ? name : name.substring(10));
-		return s;
+		return (
+				!name.startsWith("java.lang.") 
+				|| name.equals("java.lang.Object")
+				|| name.length() > 10 && !Character.isUpperCase(name.charAt(10)) ? 
+						name :
+						name.substring(10));
 	}
 
 	/**
@@ -5563,7 +5567,7 @@ private String j2sGetParamCode(ITypeBinding binding) {
 			name = "S";
 			break;
 		default:
-			name = NameMapper.checkClassReplacement(name).replace("java.lang.", "").replace('.', '_');
+			name = stripJavaLang(NameMapper.checkClassReplacement(name)).replace('.', '_');
 			break;
 		}
 		if (arrays != null) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTreeUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTreeUI.java
