Changeset 1650

Timestamp:

09/02/11 07:35:03 (9 months ago)

Author:

jharrop

Message:

getContent() will create the JAXBElement if it doesn't exist already

Location:

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

Files:

• openpackaging/parts/WordprocessingML/FooterPart.java (modified) (2 diffs)
• openpackaging/parts/WordprocessingML/HeaderPart.java (modified) (2 diffs)
• openpackaging/parts/WordprocessingML/MainDocumentPart.java (modified) (3 diffs)
• samples/CreateWordprocessingMLDocument.java (modified) (1 diff)

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

@@ -34 +34 @@
 import org.apache.log4j.Logger;
 import org.docx4j.XmlUtils;
+import org.docx4j.jaxb.Context;
 import org.docx4j.jaxb.JaxbValidationEventHandler;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
@@ -75 +76 @@
      */
     public List<Object> getContent() {
+        
+        if (this.getJaxbElement()==null) {              
+                this.setJaxbElement( Context.getWmlObjectFactory().createFtr() );
+        }
+        
         return this.getJaxbElement().getContent();
     }   

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

@@ -34 +34 @@
 import org.apache.log4j.Logger;
 import org.docx4j.XmlUtils;
+import org.docx4j.jaxb.Context;
 import org.docx4j.jaxb.JaxbValidationEventHandler;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
@@ -74 +75 @@
      */
     public List<Object> getContent() {
+        
+        if (this.getJaxbElement()==null) {              
+                this.setJaxbElement( Context.getWmlObjectFactory().createHdr() );
+        }
+        
         return this.getJaxbElement().getContent();
     }   

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

@@ -113 +113 @@
      */
     public List<Object> getContent() {
+        
+        if (this.getJaxbElement()==null) {              
+                this.setJaxbElement( Context.getWmlObjectFactory().createDocument() );
+        }
+        if (this.getJaxbElement().getBody()==null) {
+                this.getJaxbElement().setBody(
+                                Context.getWmlObjectFactory().createBody() );
+        }
+        
         return this.getJaxbElement().getContent();
     }   
@@ -720 +729 @@
         public void addObject(Object o) {
                 
-                Body body =  this.jaxbElement.getBody();
-                body.getEGBlockLevelElts().add(o);
+                this.getContent().add( o );
                 
                 // If this object contains paragraphs, make sure any style used
@@ -763 +771 @@
         public org.docx4j.wml.P addParagraph(String pXml) throws JAXBException {
                 
-                org.docx4j.wml.Document wmlDocumentEl = (org.docx4j.wml.Document)this.getJaxbElement();
-                Body body =  wmlDocumentEl.getBody();
-                org.docx4j.wml.P  para = (org.docx4j.wml.P)org.docx4j.XmlUtils.unmarshalString(pXml); 
-                body.getEGBlockLevelElts().add( para );
+                org.docx4j.wml.P  para = (org.docx4j.wml.P)org.docx4j.XmlUtils.unmarshalString(pXml);
+                this.getContent().add( para );
                 return para;
         }

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

@@ -84 +84 @@
 
                 org.docx4j.wml.R  run = factory.createR();
-                run.getRunContent().add(t);             
+                run.getContent().add(t);                
                 
-                p.getParagraphContent().add(run);
+                p.getContent().add(run);