Changeset 569 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

Timestamp:

10/27/08 01:19:05 (4 years ago)

Author:

jharrop

Message:

Changes consequent on JAXB regeneration

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

@@ -41 +41 @@
 import org.docx4j.openpackaging.contenttype.ContentType;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
+import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.contenttype.ContentTypes;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
@@ -49 +50 @@
 import org.docx4j.openpackaging.parts.DocPropsCustomPart;
 import org.docx4j.openpackaging.parts.DocPropsExtendedPart;
+import org.docx4j.openpackaging.parts.JaxbXmlPart;
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart;
@@ -202 +204 @@
                 
 
-                org.docx4j.wml.Package wmlPackageEl = (org.docx4j.wml.Package)result.getResult(); 
+                org.docx4j.xmlPackage.Package wmlPackageEl = (org.docx4j.xmlPackage.Package)result.getResult();
+                org.docx4j.convert.in.XmlPackage xmlPackage = new org.docx4j.convert.in.XmlPackage( wmlPackageEl); 
 
                 org.docx4j.wml.Document wmlDocument = null;
                 org.docx4j.wml.Styles wmlStyles = null;
-                for (org.docx4j.wml.Package.Part p : wmlPackageEl.getPart() ) {
-                        
-                        if (p.getXmlData().getDocument()!= null) {
-                                wmlDocument = p.getXmlData().getDocument();
-                        }                               
-                        if (p.getXmlData().getStyles()!= null) {
-                                wmlStyles = p.getXmlData().getStyles();
-                        }                               
-                }
+                
+                ContentTypeManager ctm = new ContentTypeManagerImpl();
+                
+                Part tmpDocPart = xmlPackage.getRawPart(ctm,  "/word/document.xml");
+                Part tmpStylesPart = xmlPackage.getRawPart(ctm,  "/word/styles.xml");
+                
+                
+//              for (org.docx4j.xmlPackage.Part p : wmlPackageEl.getPart() ) {
+//                      
+//                      if (p.getXmlData().getDocument()!= null) {
+//                              wmlDocument = p.getXmlData().getDocument();
+//                      }                               
+//                      if (p.getXmlData().getStyles()!= null) {
+//                              wmlStyles = p.getXmlData().getStyles();
+//                      }                               
+//              }
 
                 // This code assumes all the existing rels etc of 
                 // the existing main document part are still relevant.
-                if (wmlDocument==null) {
-                        log.warn("Couldn't get main document part from package transform result!");                     
-                } else {
-                        this.getMainDocumentPart().setJaxbElement(wmlDocument);
-                }       
-                                
-                if (wmlStyles==null) {
-                        log.warn("Couldn't get style definitions part from package transform result!");                 
-                } else {
-                        this.getMainDocumentPart().getStyleDefinitionsPart().setJaxbElement(wmlStyles);
-                }
+//              if (wmlDocument==null) {
+//                      log.warn("Couldn't get main document part from package transform result!");                     
+//              } else {
+//                      this.getMainDocumentPart().setJaxbElement(wmlDocument);
+//              }       
+                this.getMainDocumentPart().setJaxbElement(  ((JaxbXmlPart)tmpDocPart).getJaxbElement() );
+//                              
+//              if (wmlStyles==null) {
+//                      log.warn("Couldn't get style definitions part from package transform result!");                 
+//              } else {
+//                      this.getMainDocumentPart().getStyleDefinitionsPart().setJaxbElement(wmlStyles);
+//              }
+                this.getMainDocumentPart().getStyleDefinitionsPart().setJaxbElement(  ((JaxbXmlPart)tmpStylesPart).getJaxbElement() );
         
     }