Java2Script/SwingJS 3.2.4.02 further support for JAXB

BobHanson · BobHanson · Nov 21, 2018 · Oct 23, 2018 · Oct 23, 2018 · Oct 23, 2018
commit 3dde6e21c6c60ad24dc07dc6b8397c9f509e4c24
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 @@
-20181103123755 
+20181104122354 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20181103123755 
+20181104122354 
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,8 @@ public class CorePlugin extends Plugin {
 	 * register the bundle version properly. So we use VERSION here instead.
 	 * 
 	 */
-	public static String VERSION = "3.2.4.01";
+	public static String VERSION = "3.2.4.02";
+	// BH 11/04/2018 -- 3.2.4.02 support for JAXB - all accessor types, ObjectFactory, package-level namespace, but not yet accessor type
 	// BH 10/27/2018 -- 3.2.4.01 support for JAXB FIELD+propOrder and NONE types 
 	// BH 9/28/2018 -- 3.2.4.00 adds minimal support for JAXB
 	// BH 9/23/2018 -- 3.2.3.00 new transpiler + SwingJS-site.zip - support for java.applet.Applet and java.awt.* controls without use of a2s.*

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 @@
 import org.eclipse.jdt.core.dom.WhileStatement;
 import org.eclipse.jdt.core.dom.WildcardType;
 
+// BH 11/4/2018 -- 3.2.4.02 broad JAXB support
 // BH 10/27/2018 -- 3.2.4.01 support for JAXB FIELD+propOrder and NONE types 
 // BH 9/28/2018 -- 3.2.4.00 adds minimal support for JAXB
 // BH 9/23/2018 -- 3.2.3.00 adds support for java.applet.Applet and java.awt.* controls without use of a2s.*
@@ -6019,7 +6020,8 @@ static String checkClassReplacement(String className) {
 		private final static String defaultNonQualified
 		// Math and Date both are minor extensions
 		// of JavaScript, so they are not qualified
-				= "java.lang.Math;" + "java.util.Date;"
+				= "java.lang.Math;"
+		// MAYBE NOT! + "java.util.Date;"
 				// swingjs.api.js and javajs.api.js contain
 				// interfaces to JavaScript methods and so
 				// are not parameterized.
@@ -6346,9 +6348,14 @@ public static void addClassAnnotations(int accessType, List<ClassAnnotation> cla
 		}
 
 		private static String annotationNameValue(String name, Object value) {
+			System.out.println(">>>value " + value + " " + value.getClass().getName() + " = " + value.toString());
 			String str = (name == null ? "" : name + "=");
-			if (value instanceof TypeLiteral) {
+			if (value instanceof TypeLiteral) { 
 				str += "\"" + ((TypeLiteral) value).getType().resolveBinding().getQualifiedName() + ".class\"";
+			} else if (value instanceof IVariableBinding) {
+				str += "\"" + ((IVariableBinding) value).getType().getQualifiedName() + "." + ((IVariableBinding) value).getName() + "\"";
+			} else if (value instanceof Expression) {
+					str += "\"" + value + "\"";
 			} else if (value instanceof ITypeBinding) {
 				str += "\"" + ((ITypeBinding) value).getQualifiedName() + ".class\"";
 			} else if (value instanceof Object[]){

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBClass.java b/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBClass.java
@@ -278,19 +278,18 @@ static boolean hasAnnotations(Object value) {
 		}
 	}
 
-//	public JSJAXBClass clone() {
-//		try {
-//			JSJAXBClass jaxbClass = (JSJAXBClass) super.clone();
-//			for (int i = 0, n = fields.size(); i < n; i++) {
-//				jaxbClass.addField((JSJAXBField) fields.get(i).clone());
-//			}
-//			return jaxbClass;
-//		} catch (CloneNotSupportedException e) {
-//			return null;
-//		}
-//		
-//		
-//	}
+	public JSJAXBClass clone() {
+		try {
+			JSJAXBClass jaxbClass = (JSJAXBClass) super.clone();
+			jaxbClass.fields = new ArrayList<JSJAXBField>();
+			for (int i = 0, n = fields.size(); i < n; i++) {
+				jaxbClass.addField((JSJAXBField) fields.get(i).clone());
+			}
+			return jaxbClass;
+		} catch (CloneNotSupportedException e) {
+			return null;
+		}
+	}
 
 	QName finalizeFieldQName(QName qName, String defaultName) {
 		if (qName == null)

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBField.java b/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBField.java
@@ -30,36 +30,92 @@ class JSJAXBField implements Cloneable {
 
 	// Unmarshaller only
 
+	final static int SIMPLE = 0;
+	final static int LIST = 1;
+	final static int MAP = 2;
+
+	int fieldType = SIMPLE;
+
 	DOMNode boundNode;
 	List<Object> boundListNodes;
+	QName qualifiedTypeName;
+
 	String xmlCharacterData = "";
 	String xmlAttributeData;
-	Attributes xmlAttributes;
+//	Attributes xmlAttributes;
 	String xmlType;
 	boolean isNil;
 
+	// marshaller and unmarshaller
+
+	final static int NO_OBJECT = 0;
+	final static int SIMPLE_OBJECT = 1;
+	final static int ARRAY_OBJECT = 2;
+	final static int LIST_OBJECT = 3;
+	final static int MAP_KEY_OBJECT = 4;
+	final static int MAP_VALUE_OBJECT = 8;
+
+	int holdsObjects = NO_OBJECT;
+
+	QName qualifiedName;
+	QName qualifiedWrapName;
+
+	String text;
+	String javaName;
+	String javaClassName;
+	String xmlSchemaType;
+	String typeAdapter;
+	String mimeType;
+    String enumValue;
+	String mapClassNameKey;
+	String mapClassNameValue;
+	String listClassName;
+
+
+	boolean isTransient;
+	boolean isAttribute;
+	boolean isXmlID;
+	boolean isXmlIDREF;
+	boolean isXmlValue;
+	boolean asList;
+	boolean isNillable;
+	boolean isArray;
+	boolean isByteArray;
+	boolean isContainer;
+
+	/// private only
+
+	private Object methodSet;
+	private Object methodGet;
+	private boolean isMethod;
+
+	/// debugging only
+
+	private int index;
+    private Object clazz; // for debugging only
+
+
 	/**
 	 * prior to re-use in unmarshalling
 	 * 
 	 */
-	public JSJAXBField clear() {		
-//		try {
-//			JSJAXBField f = (JSJAXBField) super.clone();
+	public JSJAXBField clone() {		
+		try {
+			JSJAXBField f = (JSJAXBField) super.clone();
 		// marshaller
-		this.mapEntryValue = null;
+		f.mapEntryValue = null;
 		// unmarshaller
-		this.boundNode = null;
-		this.boundListNodes = null;
-		this.xmlCharacterData = null;
-		this.xmlAttributeData = null;
-		this.xmlAttributes = null;
-		this.xmlType = null;
-		this.isNil = false;
-		return this;
-//		return f;
-//		} catch (CloneNotSupportedException e) {
-//			return null;
-//		}
+		f.boundNode = null;
+		f.boundListNodes = null;
+		f.xmlCharacterData = null;
+		f.xmlAttributeData = null;
+//		f.xmlAttributes = null;
+		f.xmlType = null;
+		f.isNil = false;
+		return f;
+		} catch (CloneNotSupportedException e) {
+			return null;
+		}
 	}
 
 	void setCharacters(String ch) {
@@ -71,7 +127,7 @@ void setAttributeData(String val) {
 	}
 
 	void setAttributes(Attributes attr) {
-		xmlAttributes = attr;
+//		xmlAttributes = attr;
 		xmlType = attr.getValue("xsi:type");
 		isNil = (attr.getIndex("xsi:nil") >= 0);
 	}
@@ -86,63 +142,6 @@ void setNode(DOMNode node) {
 		boundNode = node;
 	}
 
-	// marshaller and unmarshaller
-
-	int index;
-
-	String text;
-	String javaName;
-	String javaClassName;
-
-	Map<String, String> attr;
-
-	boolean isTransient;
-	boolean isAttribute;
-	boolean isXmlID;
-	boolean isXmlIDREF;
-	boolean isXmlValue;
-	boolean asList;
-	boolean isNillable;
-	boolean isArray;
-	boolean isByteArray;
-	boolean isContainer;
-
-	QName qualifiedName = null;
-	QName qualifiedWrapName;
-
-	String xmlSchemaType;
-	String typeAdapter;
-	String mimeType;
-    String enumValue;
-
-	private Object methodSet;
-	private Object methodGet;
-
-	String mapClassNameKey, mapClassNameValue, listClassName;
-
-	QName qualifiedTypeName;
-
-	final static int SEE_ALSO = -1;
-	final static int SIMPLE = 0;
-	final static int LIST = 1;
-	final static int MAP = 2;
-
-	final static int NO_OBJECT = 0;
-	final static int SIMPLE_OBJECT = 1;
-	final static int ARRAY_OBJECT = 2;
-	final static int LIST_OBJECT = 3;
-	final static int MAP_KEY_OBJECT = 4;
-	final static int MAP_VALUE_OBJECT = 8;
-	final static int MAP_KEY_VALUE_OBJECT = 12;
-
-	int fieldType = SIMPLE;
-
-	int holdsObjects = NO_OBJECT;
-
-	private boolean isMethod;
-
-	private Object clazz;
-
 	/**
 	 * @param jclass
 	 * @param adata
@@ -189,10 +188,10 @@ void setNode(DOMNode node) {
 			holdsObjects = ARRAY_OBJECT;
 		isContainer |= isArray;
 		if (isMethod)
-			getMethods(jaxbClass.getJavaObject());
-		attr = new Hashtable<String, String>();
+			getMethods(jaxbClass.getJavaObject(), clazz);
+		Map<String, String> attr = new Hashtable<String, String>();
 		text = "";
-		readAnnotations(jaxbClass, (String[]) adata[1], propOrder);
+		readAnnotations(jaxbClass, (String[]) adata[1], propOrder, attr);
 		// ensure that we have a qualified name if appropriate
 		setDefaults();
 		if (qualifiedWrapName != null) {
@@ -214,7 +213,7 @@ private static boolean isObject(String javaClassName) {
 				|| javaClassName.equals("Object[]");
 	}
 
-	private void readAnnotations(JSJAXBClass jaxbClass, String[] javaAnnotations, List<String> propOrder) {
+	private void readAnnotations(JSJAXBClass jaxbClass, String[] javaAnnotations, List<String> propOrder, Map<String, String> attr) {
 		for (int i = 0; i < javaAnnotations.length; i++) {
 			String data = javaAnnotations[i];
 			text += data + ";";
@@ -225,9 +224,9 @@ private void readAnnotations(JSJAXBClass jaxbClass, String[] javaAnnotations, Li
 			if (pt >= 0 && data.indexOf("=") >= 0)
 				addXMLAttributes(tag, data, attr);
 			if (javaName == null)
-				processTypeAnnotation(jaxbClass, tag, data, propOrder);
+				processTypeAnnotation(jaxbClass, tag, data, propOrder, attr);
 			else
-				processFieldAnnotation(jaxbClass, tag, data);
+				processFieldAnnotation(jaxbClass, tag, data, attr);
 		}
 	}
 
@@ -254,8 +253,9 @@ private void setDefaults() {
 	 * @param tag
 	 * @param data
 	 * @param propOrder
+	 * @param attr TODO
 	 */
-	private void processTypeAnnotation(JSJAXBClass jaxbClass, String tag, String data, List<String> propOrder) {
+	private void processTypeAnnotation(JSJAXBClass jaxbClass, String tag, String data, List<String> propOrder, Map<String, String> attr) {
 		// check package annotations
 		switch (tag) {
 		case "@XmlSchema": 
@@ -265,10 +265,10 @@ private void processTypeAnnotation(JSJAXBClass jaxbClass, String tag, String dat
 		// check type annotations:
 		switch (tag) {
 		case "@XmlRootElement":
-			qualifiedName = getName(tag);
+			qualifiedName = getName(tag, attr);
 			return;
 		case "@XmlType":
-			qualifiedTypeName = getName(tag);
+			qualifiedTypeName = getName(tag, attr);
 			String order = attr.get("@XmlType:propOrder");
 			if (order != null) {
 				int[] pt = new int[1];
@@ -308,8 +308,9 @@ private void processTypeAnnotation(JSJAXBClass jaxbClass, String tag, String dat
 	 * @param jaxbClass
 	 * @param tag
 	 * @param data      what is in the (...)
+	 * @param attr 
 	 */
-	private void processFieldAnnotation(JSJAXBClass jaxbClass, String tag, String data) {
+	private void processFieldAnnotation(JSJAXBClass jaxbClass, String tag, String data, Map<String, String> attr) {
 		switch (tag) {
 		case "!XmlInner":
 			jaxbClass.addSeeAlso(javaClassName);
@@ -320,10 +321,10 @@ private void processFieldAnnotation(JSJAXBClass jaxbClass, String tag, String da
 			return;
 		case "@XmlAttribute":
 			isAttribute = true;
-			qualifiedName = getName(tag);
+			qualifiedName = getName(tag, attr);
 			return;
 		case "@XmlElement":
-			qualifiedName = getName(tag);
+			qualifiedName = getName(tag, attr);
 			isNillable = "true".equals(attr.get("@XmlElement:nillable"));
 			return;
 		case "@XmlSchemaType":
@@ -377,7 +378,7 @@ private void processFieldAnnotation(JSJAXBClass jaxbClass, String tag, String da
 			// @XmlMimeType("text/xml; charset=iso-8859-1")
 			return;
 		case "@XmlElementWrapper":
-			qualifiedWrapName = getName(tag);
+			qualifiedWrapName = getName(tag, attr);
 			return;
 		}
 		System.out.println("JSJAXBField Unprocessed field annotation: " + text);
@@ -403,9 +404,10 @@ private static String getQuotedClass(String s) {
 	 * combining all annotations into one.
 	 * 
 	 * @param tag
+	 * @param attr TODO
 	 * @return
 	 */
-	private QName getName(String tag) {
+	private QName getName(String tag, Map<String, String> attr) {
 		String name, namespace;
 		name = attr.get(tag + ":name");
 		namespace = attr.get(tag + ":namespace");
@@ -509,10 +511,10 @@ private Object findSetMethod(String m, Object[] pm, Object[] jo) {
 	/**
 	 * Check for methods in C$.$P$[] (private) and object[] (all others) 
 	 */
-	private void getMethods(Object javaObject) {
+	private void getMethods(Object javaObject, Object clazz) {
 		String methodName = javaName.substring(2);
-		Object[] pm = /** @j2sNative this.clazz.$P$ || */null;
-		Object[] jo = /** @j2sNative this.clazz.prototype || */null;
+		Object[] pm = /** @j2sNative clazz.$P$ || */null;
+		Object[] jo = /** @j2sNative clazz.prototype || */null;
 		// annotation can be on set... or get... or is...
 		// so we start by using get instead of set
 		// qualifications getXxxx$() and setXxxx$mytype_escaped(xxx)

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBMarshaller.java b/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBMarshaller.java
@@ -112,6 +112,7 @@ private static Map<String, Integer> newQualifierMap(Map<String, Integer> newMap)
 		mapQualifierLevel = new Hashtable<String, Integer>(oldMap);
 		return oldMap;
 	}
+
 	private static void clearQualifierMap() {
 		// not thread safe
 		mapQualifierLevel.clear();
@@ -166,6 +167,7 @@ private static String escapeString(String str, boolean isAttribute) {
 		/**
 		 * @j2sNative str= (this.textarea.innerHTML=str,this.textarea.innerHTML);
 		 */
+		str = str.replace("&", "&amp;");
 		if (isAttribute)
 			str = str.replace("\"", "&quot;");