Changeset 1653 for trunk/docx4j/src/main

Timestamp:

09/05/11 13:38:33 (9 months ago)

Author:

jharrop

Message:

Handle unwrapping correctly in ShallowTraversor?, so JAXBElements stay wrapped, and we don't risk a marshalling exception for any which don't have an @XmlRootElement? annotation.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEHandler.java (modified) (4 diffs)

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

@@ -552 +552 @@
 
                 @Override
-                public List<Object> apply(Object o) {
+                public List<Object> apply(Object wrapped) {
 
                         // apply processSdt to any sdt
                         // which might be a conditional|repeat
-
+                        Object o = XmlUtils.unwrap(wrapped);
                         if (o instanceof org.docx4j.wml.SdtBlock
                                         || o instanceof org.docx4j.wml.SdtRun
@@ -574 +574 @@
                         // Otherwise just preserve the content
                         List<Object> newContent = new ArrayList<Object>();
-                        newContent.add(o);
+                        
+                        newContent.add(wrapped); // we want the JAXBElement (if any)
                         return newContent;
 
@@ -607 +608 @@
                         } else {
                                 for (Object o : children) {
-
-                                        newChildren.addAll(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.
+                                        newChildren.addAll(this.apply(o));
                                 }
                         }
@@ -1152 +1147 @@
                         // Sanity test
                         if (!thisXPath.equals(xpathObj.getDataBinding().getXpath())) {
-                                log.error("XPaths didn't match for id " + bindingId + ": "
+                                log.error("XPaths didn't match for id " + bindingId + ": \n\r    " + thisXPath + "\n\rcf. " 
                                                 + xpathObj.getDataBinding().getXpath());
                         }