Changeset 791

Timestamp:

04/15/09 12:53:45 (17 months ago)

Author:

jharrop

Message:

load uses LoadFromZipNG

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

@@ -24 +24 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.OutputStream;
 import java.util.Iterator;
@@ -53 +54 @@
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.io.LoadFromZipFile;
+import org.docx4j.openpackaging.io.LoadFromZipNG;
 import org.docx4j.openpackaging.io.SaveToZipFile;
 import org.docx4j.openpackaging.parts.DocPropsCorePart;
@@ -150 +152 @@
         public static WordprocessingMLPackage load(java.io.File docxFile) throws Docx4JException {
                 
-                LoadFromZipFile loader = new LoadFromZipFile();
-                return (WordprocessingMLPackage)loader.get(docxFile);           
+//              LoadFromZipFile loader = new LoadFromZipFile();
+                LoadFromZipNG loader = new LoadFromZipNG();
+//              return (WordprocessingMLPackage)loader.get(docxFile);           
+                FileInputStream fis = null;
+                try {
+                        fis = new FileInputStream(docxFile);
+                } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                }
+                return (WordprocessingMLPackage)loader.get(fis);
         }