Changeset 1505 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

05/20/11 05:20:36 (12 months ago)

Author:

jharrop

Message:

No reason why a part can't implement ContentAccessor? interface.
(TODO: Footnotes and Endnotes parts).

Location:

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML

Files:

• FooterPart.java (modified) (3 diffs)
• HeaderPart.java (modified) (3 diffs)
• MainDocumentPart.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FooterPart.java

@@ -22 +22 @@
 
 
+import java.util.List;
+
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
@@ -30 +32 @@
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
+import org.docx4j.wml.ContentAccessor;
 import org.docx4j.wml.Ftr;
 
 
-public final class FooterPart extends JaxbXmlPart<Ftr> {
+public final class FooterPart extends JaxbXmlPart<Ftr>  implements ContentAccessor {
         
         private static Logger log = Logger.getLogger(FooterPart.class);                 
@@ -58 +61 @@
         }
         
+    /**
+     * Convenience method to getJaxbElement().getBody().getContent()
+     * @since 2.7
+     */
+    public List<Object> getContent() {
+        return this.getJaxbElement().getContent();
+    }   
+                
 }

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/HeaderPart.java

@@ -35 +35 @@
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
+import org.docx4j.wml.ContentAccessor;
 import org.docx4j.wml.Hdr;
 import org.w3c.dom.Node;
@@ -40 +41 @@
 
 
-public final class HeaderPart extends JaxbXmlPart<Hdr> {
+public final class HeaderPart extends JaxbXmlPart<Hdr>  implements ContentAccessor {
         
         private static Logger log = Logger.getLogger(HeaderPart.class);                 
@@ -63 +64 @@
                 setRelationshipType(Namespaces.HEADER);
         }
+        
+    /**
+     * Convenience method to getJaxbElement().getBody().getContent()
+     * @since 2.7
+     */
+    public List<Object> getContent() {
+        return this.getJaxbElement().getContent();
+    }   
         
         private Binder<Node> binder;

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MainDocumentPart.java

@@ -58 +58 @@
 import org.docx4j.wml.CTShd;
 import org.docx4j.wml.Comments;
+import org.docx4j.wml.ContentAccessor;
 import org.docx4j.wml.Ftr;
 import org.docx4j.wml.Hdr;
@@ -78 +79 @@
  *
  */
-public class MainDocumentPart extends DocumentPart<org.docx4j.wml.Document>  {
+public class MainDocumentPart extends DocumentPart<org.docx4j.wml.Document> implements ContentAccessor  {
         
         private static Logger log = Logger.getLogger(MainDocumentPart.class);
@@ -101 +102 @@
         }       
 
+    /**
+     * Convenience method to getJaxbElement().getBody().getContent()
+     * @since 2.7
+     */
+    public List<Object> getContent() {
+        return this.getJaxbElement().getContent();
+    }   
         
         private Binder<Node> binder;