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

Timestamp:

09/28/09 18:47:31 (3 years ago)

Author:

jharrop

Message:

Modify load method to also support loading a Flat OPC .xml file

File:

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

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

@@ -27 +27 @@
 
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.Source;
 import javax.xml.transform.Templates;
@@ -134 +137 @@
         /**
          * Convenience method to create a WordprocessingMLPackage
-         * from an existing File.
+         * from an existing File (.docx zip or .xml Flat OPC).
      *
          * @param docxFile
@@ -140 +143 @@
          */     
         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();
@@ -148 +169 @@
                         fis = new FileInputStream(docxFile);
                 } catch (FileNotFoundException e) {
-                        e.printStackTrace();
+                        log.error(e);
+                        throw new Docx4JException("Couldn't load docx from " + docxFile.getAbsolutePath(), e);
                 }
                 return (WordprocessingMLPackage)loader.get(fis);
@@ -383 +405 @@
                 
                 
-                Map<String, Object> getSettings() {
+                public Map<String, Object> getSettings() {
                         Map<String, Object> settings = new java.util.HashMap<String, Object>();