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

Timestamp:

01/10/10 05:15:02 (2 years ago)

Author:

jharrop

Message:

Remove dom4j stuff

File:

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

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

@@ -24 +24 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.util.Map;
 
@@ -30 +31 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.PropertyException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.Source;
@@ -41 +43 @@
 import org.docx4j.fonts.Mapper;
 import org.docx4j.jaxb.Context;
+import org.docx4j.jaxb.NamespacePrefixMapperUtils;
 import org.docx4j.model.structure.DocumentModel;
 import org.docx4j.model.structure.HeaderFooterPolicy;
@@ -197 +200 @@
          */     
         public void save(java.io.File docxFile) throws Docx4JException {
-                
+
+                if (docxFile.getName().endsWith(".xml")) {
+                        
+                        // Create a org.docx4j.wml.Package object
+                        FlatOpcXmlCreator worker = new FlatOpcXmlCreator(this);
+                        org.docx4j.xmlPackage.Package pkg = worker.get();
+                
+                // Now marshall it
+                        JAXBContext jc = Context.jcXmlPackage;
+                        try {
+                                Marshaller marshaller=jc.createMarshaller();
+                                
+                                marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+                                NamespacePrefixMapperUtils.setProperty(marshaller, 
+                                                NamespacePrefixMapperUtils.getPrefixMapper());                  
+                                
+                                marshaller.marshal(pkg, new FileOutputStream(docxFile));
+                        } catch (Exception e) {
+                                throw new Docx4JException("Error saving Flat OPC XML", e);
+                        }       
+                        return;
+                }
+                        
                 SaveToZipFile saver = new SaveToZipFile(this); 
                 saver.save(docxFile);
@@ -379 +404 @@
 
                 // Create main document part
-                Part wordDocumentPart = new org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart();         
+                MainDocumentPart wordDocumentPart = new MainDocumentPart();             
                 
                 // Create main document part content
-                org.docx4j.wml.ObjectFactory factory = new org.docx4j.wml.ObjectFactory();
-                
-                org.docx4j.wml.Body  body = factory.createBody();
-                
+                org.docx4j.wml.ObjectFactory factory = Context.getWmlObjectFactory();
+                org.docx4j.wml.Body  body = factory.createBody();               
                 org.docx4j.wml.Document wmlDocumentEl = factory.createDocument();
+                
                 wmlDocumentEl.setBody(body);
                 
@@ -397 +421 @@
                                 
                 // Put the content in the part
-                ((org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart)wordDocumentPart).setJaxbElement(wmlDocumentEl);
+                wordDocumentPart.setJaxbElement(wmlDocumentEl);
                                                 
                 // Add the main document part to the package relationships