Changeset 1093

Timestamp:

02/27/10 17:44:08 (2 years ago)

Author:

jharrop

Message:

changes to exception handling; made class ByteArray? a bit more flexible

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java (modified) (7 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java

@@ -33 +33 @@
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.ByteBuffer;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -61 +62 @@
 
 
-
 /**
  * Create a Package object from a Zip file or input stream.
@@ -171 +171 @@
         } catch (Exception e) {
             log.error(e.getMessage());
+            throw new Docx4JException("Error processing zip file (is it a zip file?)", e);
         }       
-                
+                    
                 // At this point, we're finished with the zip input stream
         // TODO, so many of the below methods could be renamed.
@@ -289 +290 @@
                         String partName) 
         //private static InputStream getInputStreamFromZippedPart(ZipFile zf, String partName) 
-                throws IOException {
+                throws IOException, NullPointerException {
                 
                 InputStream in = null;
                 //in = zf.getInputStream( zf.getEntry(partName ) );
-                in = partByteArrays.get(partName).getInputStream();
+                try {
+                        in = partByteArrays.get(partName).getInputStream();
+                } catch (NullPointerException  npe) {
+                        log.warn("Part " + partName + " was null");
+                        throw npe;
+                }
                 return in;              
         }
@@ -554 +560 @@
                                 // Try to get it as a binary part
                                 part = getBinaryPart(partByteArrays, ctm, resolvedPartUri);
+                                log.warn("Using BinaryPart for " + resolvedPartUri);
+                                
                                 ((BinaryPart)part).setBinaryData(is);
                         }
@@ -609 +617 @@
         public static class ByteArray implements Serializable {
                 
+                private static final long serialVersionUID = -784146312250361899L;
+                // 4469266984448028582L; 
+                
                 private byte[] bytes;
+                public byte[] getBytes() {
+                        return bytes;
+                }
+
+                private String mimetype;
+                public String getMimetype() {
+                        return mimetype;                        
+                }
                 
                 public ByteArray(byte[] bytes) {
@@ -616 +635 @@
                 }
                 
+                
+                public ByteArray(ByteBuffer bb, String mimetype ) {
+                        
+                        bb.clear();
+                        bytes = new byte[bb.capacity()];
+                        bb.get(bytes, 0, bytes.length);
+                        
+                        this.mimetype = mimetype;
+                }
+                
+                
                 public InputStream getInputStream() {
-                        
                         return new ByteArrayInputStream(bytes);
-                        
+                }
+
+                public int getLength() {
+                        return bytes.length;                    
                 }