// BH 2/3/2019 -- 3.2.4.07 fixes "final static Float = (float)" missing

hansonr · hansonr · commit 1af9bc6b25e8 · 2019-02-03T07:47:43.000-06:00
definition
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
@@ -19,7 +19,9 @@ public class CorePlugin extends Plugin {
 	 * register the bundle version properly. So we use VERSION here instead.
 	 * 
 	 */
-	public static String VERSION = "3.2.4.06";
+	public static String VERSION = "3.2.4.07";
+	// TODO/NOTE final static int FOO = (/**@j2sNative 5 || */3) stated but not recognized when used as its new value 
+	// BH 2/3/2019 -- 3.2.4.07 fixes "final static Float = (float)" missing definition
 	// BH 1/2/2019 -- 3.2.4.06 fixes try(resources) with more than one resource missing semicolon
 	// BH 12/13/2018 -- 3.2.4.05 fixes problem with OuterClass.this.foo() not using .apply()
 	// BH 11/10/2018 -- 3.2.4.04 additional support for JAXB
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
@@ -2198,13 +2198,13 @@ private boolean addFieldDeclaration(FieldDeclaration field, int mode) {
 		VariableDeclarationFragment identifier = (VariableDeclarationFragment) fragments.get(0);
 		IVariableBinding var = identifier.resolveBinding();
 		Type nodeType = (var != null && var.getType().isArray() ? null : field.getType());
-		Code code = (nodeType == null || !nodeType.isPrimitiveType() ? null
-				: ((PrimitiveType) nodeType).getPrimitiveTypeCode());
+		boolean isPrimitive = (nodeType != null && nodeType.isPrimitiveType());
+		Code code = (isPrimitive ? ((PrimitiveType) nodeType).getPrimitiveTypeCode() : null);
 		// have to check here for final Object = "foo", as that must not be ignored.
-		boolean checkFinalConstant = (isStatic && Modifier.isFinal(field.getModifiers()) && var != null
-				&& !var.getType().getQualifiedName().equals("java.lang.Object"));
+		boolean checkFinalConstant = ((isPrimitive || var != null && var.getType().getQualifiedName().equals("java.lang.String")) 
+				&& isStatic && Modifier.isFinal(field.getModifiers()));
 		if (needDefault)
-			addJ2SDoc(field);
+			addJ2SDoc(field);		
 		int len0 = buffer.length();
 		for (Iterator<?> iter = fragments.iterator(); iter.hasNext();) {
 			VariableDeclarationFragment fragment = (VariableDeclarationFragment) iter.next();
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -55,7 +55,7 @@ window["j2s.clazzloaded"] = true;
   _loadcore: true,
   _nooutput: 0,
   _VERSION_R: "3.2.4.07", //runtime
-  _VERSION_T: "3.2.4.06", //transpiler
+  _VERSION_T: "3.2.4.07", //transpiler
 };
 
 ;(function(Clazz, J2S) {
