Changeset 1582 for trunk/docx4j/src/main/java/org

Timestamp:

07/03/11 04:21:36 (11 months ago)

Author:

jharrop

Message:

Temporary fix for MarshallException? in ShallowTraversor? caused by unwrapping CTSimpleField
(same problem is likely to occur for anything we unwrap which doesn't have an @XmlRootElement?).

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

• model/datastorage/OpenDoPEHandler.java (modified) (1 diff)
• wml/CTSimpleField.java (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEHandler.java

@@ -572 +572 @@
                                                                                         this.apply(
                                                                                                 XmlUtils.unwrap(o)));
+                                                // TODO: Post 2.7.0, review use of XmlUtils.unwrap(o) here;
+                                                // it can result in MarshalException for
+                                                // things which don't have @XmlRootElement.
+                                                // We really need some unit tests to be confident
+                                                // that making this change would be ok.
                                         }
                                 }

trunk/docx4j/src/main/java/org/docx4j/wml/CTSimpleField.java

@@ -31 +31 @@
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
@@ -66 +67 @@
     "paragraphContent"
 })
+@XmlRootElement(name = "fldSimple")
 public class CTSimpleField
     implements Child, ContentAccessor