JAXB root name not honored in Marshaller

BobHanson · BobHanson · commit 06f9e82167b0 · 2020-03-06T10:54:45.000-06:00
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
@@ -79,6 +79,7 @@ class JSJAXBClass implements Cloneable {
 	private boolean isInnerClass;
 
 	QName declaredTypeName;
+	QName qualifiedRootName;
 
 	private static String packageNamespace;
 	private static int packageAccessorType = TYPE_PUBLIC_MEMBER;
@@ -352,7 +353,7 @@ QName finalizeFieldQName(QName qName, String defaultName, int type) {
 		QName qname = new QName(namespace, name, JSJAXBClass.getPrefixFor(namespace));
 		switch (type) {
 		case JSJAXBField.TYPE_ROOT_ELEMENT:
-			return this.qname = qname;
+			return this.qname = qualifiedRootName = qname;
 		case JSJAXBField.TYPE_XML_TYPE:
 			return this.qname = qualifiedTypeName = qname;
 		default:
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
@@ -192,7 +192,8 @@ private static String escapeString(String str, boolean isAttribute) {
 	/////////// output methods //////////////
 	
 	private void writeXML(JSJAXBClass jaxbClass, boolean isRoot, boolean addXsiType) throws JAXBException {
-		QName qname = (jaxbClass.tagField == null ? jaxbClass.getQName() : jaxbClass.tagField.qualifiedName);
+		QName qname = (isRoot && jaxbClass.qualifiedRootName != null ? jaxbClass.qualifiedRootName 
+				: jaxbClass.tagField == null ? jaxbClass.getQName() : jaxbClass.tagField.qualifiedName);
 		if (isRoot) {
 			outputHeader();
 		}
@@ -631,7 +632,8 @@ private void output(String s) throws JAXBException {
 //			/** @j2sNative console.log(s) */
 			if (writer != null) {
 			
-//	System.out.println((s.startsWith("<") ? "\n" : "") + s);
+				
+				System.out.println((s.startsWith("<") ? "\n" : "") + s);
 				
 				writer.write(s);
 			} else if (outputStream != null) {
