Changeset 1044 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages

Timestamp:

01/16/10 07:52:34 (2 years ago)

Author:

jharrop

Message:

pptx4j: JAXB implementation of pptx - initial commit

Location:

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

Files:

• Package.java (modified) (3 diffs)
• WordprocessingMLPackage.java (modified) (1 diff)

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

@@ -22 +22 @@
 package org.docx4j.openpackaging.packages;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.util.HashMap;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+
 import org.apache.log4j.Logger;
+import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator;
 import org.docx4j.jaxb.Context;
+import org.docx4j.jaxb.NamespacePrefixMapperUtils;
 import org.docx4j.openpackaging.Base;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
+import org.docx4j.openpackaging.io.LoadFromZipNG;
+import org.docx4j.openpackaging.io.SaveToZipFile;
 import org.docx4j.openpackaging.parts.CustomXmlDataStoragePart;
 import org.docx4j.openpackaging.parts.DocPropsCorePart;
@@ -44 +57 @@
  * 
  * @author Jason Harrop
- * @version 0.1
  */
 public class Package extends Base {
@@ -134 +146 @@
         
         protected DocPropsCustomPart docPropsCustomPart;
+        
+        
+        /**
+         * Convenience method to create a WordprocessingMLPackage
+         * or PresentationMLPackage
+         * from an existing File (.docx/.docxm, .ppxtx or Flat OPC .xml).
+     *
+         * @param docxFile
+         *            The docx file 
+         */     
+        public static Package load(java.io.File docxFile) throws Docx4JException {
+                
+                if (docxFile.getName().endsWith(".xml")) {
+                        
+                        org.docx4j.convert.in.FlatOpcXmlImporter xmlPackage;
+                        try {
+                                Unmarshaller u = Context.jcXmlPackage.createUnmarshaller();
+                                u.setEventHandler(new org.docx4j.jaxb.JaxbValidationEventHandler());
+
+                                org.docx4j.xmlPackage.Package wmlPackageEl = (org.docx4j.xmlPackage.Package)((JAXBElement)u.unmarshal(
+                                                new javax.xml.transform.stream.StreamSource(new FileInputStream(docxFile.getAbsolutePath())))).getValue(); 
+
+                                xmlPackage = new org.docx4j.convert.in.FlatOpcXmlImporter( wmlPackageEl);
+                        } catch (Exception e) {
+                                log.error(e);
+                                throw new Docx4JException("Couldn't load xml from " + docxFile.getAbsolutePath(), e);
+                        } 
+                        return xmlPackage.get(); 
+                }
+                
+//              LoadFromZipFile loader = new LoadFromZipFile();
+                LoadFromZipNG loader = new LoadFromZipNG();
+//              return (WordprocessingMLPackage)loader.get(docxFile);           
+                FileInputStream fis = null;
+                try {
+                        fis = new FileInputStream(docxFile);
+                } catch (FileNotFoundException e) {
+                        log.error(e);
+                        throw new Docx4JException("Couldn't load file from " + docxFile.getAbsolutePath(), e);
+                }
+                return loader.get(fis);
+        }
+
+        /**
+         * Convenience method to save a WordprocessingMLPackage
+         * or PresentationMLPackage to a File.
+     *
+         * @param docxFile
+         *            The docx file 
+         */     
+        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);
+        }
+        
+        
+        
 
         @Override

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

@@ -161 +161 @@
         public static WordprocessingMLPackage load(java.io.File docxFile) throws Docx4JException {
                 
-                if (docxFile.getName().endsWith(".xml")) {
-                        
-                        org.docx4j.convert.in.FlatOpcXmlImporter xmlPackage;
-                        try {
-                                Unmarshaller u = Context.jcXmlPackage.createUnmarshaller();
-                                u.setEventHandler(new org.docx4j.jaxb.JaxbValidationEventHandler());
-
-                                org.docx4j.xmlPackage.Package wmlPackageEl = (org.docx4j.xmlPackage.Package)((JAXBElement)u.unmarshal(
-                                                new javax.xml.transform.stream.StreamSource(new FileInputStream(docxFile.getAbsolutePath())))).getValue(); 
-
-                                xmlPackage = new org.docx4j.convert.in.FlatOpcXmlImporter( wmlPackageEl);
-                        } catch (Exception e) {
-                                log.error(e);
-                                throw new Docx4JException("Couldn't load xml from " + docxFile.getAbsolutePath(), e);
-                        } 
-                        return (WordprocessingMLPackage)xmlPackage.get(); 
-                }
-                
-//              LoadFromZipFile loader = new LoadFromZipFile();
-                LoadFromZipNG loader = new LoadFromZipNG();
-//              return (WordprocessingMLPackage)loader.get(docxFile);           
-                FileInputStream fis = null;
-                try {
-                        fis = new FileInputStream(docxFile);
-                } catch (FileNotFoundException e) {
-                        log.error(e);
-                        throw new Docx4JException("Couldn't load docx from " + docxFile.getAbsolutePath(), e);
-                }
-                return (WordprocessingMLPackage)loader.get(fis);
+                return (WordprocessingMLPackage)Package.load(docxFile);
         }