Changeset 1680

Timestamp:

10/07/11 03:32:33 (8 months ago)

Author:

jharrop

Message:

createImagePart from FilePath? - refactored a bit

Location:

trunk/docx4j/src

Files:

• main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java (modified) (18 diffs)
• test/java/org/docx4j/openpackaging/parts/WordprocessingML/CreateImageTest.java (added)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java

@@ -32 +32 @@
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
@@ -62 +64 @@
 import org.docx4j.openpackaging.parts.relationships.RelationshipsPart;
 import org.docx4j.relationships.Relationship;
-import org.docx4j.wml.SectPr;
-import org.docx4j.wml.SectPr.PgMar;
-import org.docx4j.wml.SectPr.PgSz;
 
 public abstract class BinaryPartAbstractImage extends BinaryPart {
@@ -148 +147 @@
         }
         
-    /*
+    /**
      * Possibility to put directly an image filePath instead of giving an image byte array
      * @param wordMLPackage
-     * @param filePath
+     * @param imageFile
      * 
      */
     public static BinaryPartAbstractImage createImagePart(WordprocessingMLPackage wordMLPackage,
-            String filePath) throws Exception {
-
-        return createImagePartFromFilePath(wordMLPackage,
-                wordMLPackage.getMainDocumentPart(), filePath);
+                File imageFile) throws Exception {
+
+        return createImagePart(wordMLPackage,
+                wordMLPackage.getMainDocumentPart(), imageFile);
 
     }
@@ -224 +223 @@
         log.debug("created tmp file: " + tmpImageFile.getAbsolutePath());
                                 
-                ImageInfo info = ensureFormatIsSupported(tmpImageFile.getAbsolutePath(), tmpImageFile, bytes);
+                ImageInfo info = ensureFormatIsSupported(tmpImageFile, bytes, true);
                 
                 // In the absence of an exception, tmpImageFile now contains an image 
@@ -277 +276 @@
         }
 
-    /*
-     * Default, we suppose that image is load in a Byte Array (using function createImagePart) so isLoad is true.
-     * If we use createImagePartFromFilePath, then isLoad is false
-     */
-    static boolean isLoad = true;
 
         /**
@@ -295 +289 @@
      * @throws Exception
      */
-    public static BinaryPartAbstractImage createImagePartFromFilePath(
+    public static BinaryPartAbstractImage createImagePart(
             OpcPackage opcPackage,
-            Part sourcePart, String filePath) throws Exception {
-
-        final File locFile = new File(filePath);
+            Part sourcePart, File imageFile) throws Exception {
+
         final byte[] locByte = new byte[1];
+
         //We are in the case that image is not load (no byte Array) so isLoad is false
-        isLoad = false;
-        //Here, filePath doesn't represent the tmpFile but the path of the image to load
-        ImageInfo info = ensureFormatIsSupported(filePath, locFile, locByte);
+        ImageInfo info = ensureFormatIsSupported(imageFile, locByte, false);
 
         ContentTypeManager ctm = opcPackage.getContentTypeManager();
@@ -325 +317 @@
                 + " with name " + imagePart.getPartName().toString());
 
-        FileInputStream fis = new FileInputStream(locFile);
+        FileInputStream fis = new FileInputStream(imageFile);
         imagePart.setBinaryData(fis);
 
@@ -336 +328 @@
     }
 
+        private static ImageInfo ensureFormatIsSupported(File imageFile, byte[] bytes, boolean isLoad) throws Docx4JException, MalformedURLException {
+                return ensureFormatIsSupported(imageFile.toURI().toURL(),  imageFile,  bytes, isLoad);
+        }
+        
     /**
          * @param bytes
@@ -345 +341 @@
          * @throws InterruptedException
          */
-        private static ImageInfo ensureFormatIsSupported(String uri, File imageFile, byte[] bytes) throws Docx4JException {
+        private static ImageInfo ensureFormatIsSupported(URL url, File imageFile, byte[] bytes, boolean isLoad) throws Docx4JException {
                 
                 FileOutputStream fos;
@@ -354 +350 @@
                 try {
                         try {
-                                info = getImageInfo(uri);
-                                
+                                info = getImageInfo(url);
+
                                 // Debug ... note that these figures 
                                 // aren't necessarily accurate for EPS
@@ -423 +419 @@
                                 // We need to refresh image info 
                                 imageManager.getCache().clearCache();
-                info = getImageInfo(imageFile.getAbsolutePath());
+                info = getImageInfo(new URL(imageFile.getAbsolutePath()));
                                 
                                 // Debug ...
@@ -444 +440 @@
          */
         public static BinaryPartAbstractImage createLinkedImagePart(WordprocessingMLPackage wordMLPackage, 
-                        String fileurl) throws Exception {
+                        URL fileurl) throws Exception {
                 
                 return createLinkedImagePart(wordMLPackage,
@@ -452 +448 @@
         /**
          * Create a linked image part, and attach it as a rel of the specified source part
-         * (eg a header part)
+         * (eg a header part).
+         * 
+         * The current behaviour is that the part is added to the package, but 
+         * since the target mode of the rel is external, the part is redundant. 
          * 
          * @param wordMLPackage
          * @param sourcePart
-         * @param fileurl
+         * @param url
          * @return
          * @throws Exception
          */
         public static BinaryPartAbstractImage createLinkedImagePart(OpcPackage opcPackage, 
-                        Part sourcePart, String fileurl) throws Exception {
-                
-        ImageInfo info = ensureFormatIsSupported(fileurl, null, null);
+                        Part sourcePart, URL url) throws Exception {
+                
+                log.debug("Incoming url for linked image: " + url.toString() );
+                
+        ImageInfo info = ensureFormatIsSupported(url, null, null, false); // final param doesn't matter in this case
 
                 ContentTypeManager ctm = opcPackage.getContentTypeManager();
@@ -475 +476 @@
                                 info.getMimeType(), 
                 createImageName(opcPackage, sourcePart, proposedRelId, ext), null);
+                
+                // NB: contents never populated
                                 
                 log.debug("created part " + imagePart.getClass().getName()
                                 + " with name " + imagePart.getPartName().toString());
 
-                imagePart.rel = sourcePart.addTargetPart(imagePart);
+                imagePart.rel = sourcePart.addTargetPart(imagePart); // want to create rel with suitable name; side effect is to add part
                 imagePart.rel.setTargetMode("External");
 
@@ -485 +488 @@
                                 imagePart);                     
                 
-                if (!fileurl.startsWith("file:///") && new File(fileurl).isFile()) {
-                        imagePart.rel.setTarget("file:///" + fileurl);
-                } else {
-                        imagePart.rel.setTarget(fileurl);
-                }
+//              if (!url.getProtocol().equals("file") && new File(url.toString() ).isFile()) {
+//                      imagePart.rel.setTarget("file:///" + url);
+//              } else {
+//                      imagePart.rel.setTarget(url.toString());
+//              }
+                imagePart.rel.setTarget(url.toString());
 
                 imagePart.setImageInfo(info);
+                
                 return imagePart;
         }       
@@ -680 +685 @@
             + "xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\"";
         
-        public static ImageInfo getImageInfo(String uri) throws Exception {
+        public static ImageInfo getImageInfo(URL url) throws Exception {
                 
                 // XmlGraphics images caches images by their URI;
@@ -689 +694 @@
                                 imageManager.getImageContext(), null);
 
-                ImageInfo info = imageManager.getImageInfo(uri, sessionContext);
+                ImageInfo info = imageManager.getImageInfo(url.toString(), sessionContext);
                 
                 // Note that these figures do not appear to be reliable for EPS
@@ -729 +734 @@
                 //String uri = "/tmp/img4448.img";
                 
-                ImageInfo ii = getImageInfo(uri);
+                ImageInfo ii = getImageInfo(new URL(uri));
                 
                 displayImageInfo(ii);