Changeset 1117

Timestamp:

04/04/10 23:01:58 (2 years ago)

Author:

jharrop

Message:

P.Hyperlink needs @XmlRootElement?

Location:

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

Files:

• samples/HyperlinkTest.java (modified) (3 diffs)
• wml/P.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/samples/HyperlinkTest.java

@@ -22 +22 @@
 package org.docx4j.samples;
 
+import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
 
 import org.docx4j.XmlUtils;
+import org.docx4j.wml.P;
 import org.docx4j.wml.P.Hyperlink;
 
@@ -87 +89 @@
         public static Hyperlink createHyperlink(WordprocessingMLPackage wordMLPackage, String url) {
                 
-                // TODO - regenerate JAXB so that CTHyperlink is just called Hyperlink
-                
                 try {
 
@@ -117 +117 @@
             "</w:hyperlink>";
 
+//                      return (Hyperlink)XmlUtils.unmarshalString(hpl, Context.jc, P.Hyperlink.class);
                         return (Hyperlink)XmlUtils.unmarshalString(hpl);
-                        
                         
                 } catch (Exception e) {

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

@@ -384 +384 @@
         "paragraphContent"
     })
+    @XmlRootElement(name = "hyperlink")    
     public static class Hyperlink
         implements Child