Changeset 1106

Timestamp:

03/26/10 23:35:01 (2 years ago)

Author:

jharrop

Message:

@XmlRootElement?, and method in case that is not present.

Location:

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

Files:

• TextUtils.java (modified) (4 diffs)
• wml/SdtRun.java (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/TextUtils.java

@@ -27 +27 @@
 
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Marshaller;
+import javax.xml.namespace.QName;
 
 import org.apache.log4j.Logger;
@@ -42 +44 @@
                 
         /**
-         * Extract contents of <w:t> elements. 
+         * Extract contents of descendant <w:t> elements. 
          * 
          * @param o
@@ -54 +56 @@
         
         /**
-         * Extract contents of <w:t> elements. 
+         * Extract contents of descendant <w:t> elements. 
          * 
          * @param o
@@ -68 +70 @@
                 
         }
+
+        /**
+         * Extract contents of descendant <w:t> elements.
+         * Use this for objects which don't have @XmlRootElement
+         * 
+         * @param o
+         * @param w
+         * @param jc
+         * @param uri
+         * @param local
+         * @param declaredType
+         * @throws Exception
+         */
+        public static void extractText(Object o, Writer w, JAXBContext jc,
+                        String uri, String local, Class declaredType) throws Exception {
+                
+                Marshaller marshaller=jc.createMarshaller();
+                NamespacePrefixMapperUtils.setProperty(marshaller, 
+                                NamespacePrefixMapperUtils.getPrefixMapper());
+                marshaller.marshal(
+                                new JAXBElement(new QName(uri,local), declaredType, o ), 
+                                new TextExtractor(w));          
+        }
+        
         
         /**

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

@@ -25 +25 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
@@ -57 +58 @@
     "sdtContent"
 })
+@XmlRootElement(name = "sdt")
 public class SdtRun
     implements Child