Changeset 1467 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

04/10/11 13:29:24 (14 months ago)

Author:

jharrop

Message:

Address issue reported in  http://dev.plutext.org/forums/viewtopic.php?f=6&t=667

Location:

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

Files:

• io/Load.java (modified) (2 diffs)
• io/LoadFromVFSZipFile.java (modified) (1 diff)
• io/LoadFromZipFile.java (modified) (12 diffs)
• io/LoadFromZipNG.java (modified) (12 diffs)
• packages/OpcPackage.java (modified) (1 diff)

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

@@ -62 +62 @@
         }
 
-        public ContentTypeManager ctm;
+        //public ContentTypeManager ctm;
 
         protected boolean loadExternalTargets = false; 
@@ -69 +69 @@
         }
         
-        /**
-         * This HashMap is intended to prevent loops.
-         */
-        protected HashMap<String, String> handled = new HashMap<String, String>();
         
         /**

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

@@ -69 +69 @@
         }
 
-        public LoadFromVFSZipFile(ContentTypeManager ctm, boolean loadExternalTargets) {
-                _loadFromZipFile = new LoadFromZipFile(ctm);
-                _loadFromZipFile.loadExternalTargets(loadExternalTargets);
-        }
+//      public LoadFromVFSZipFile(ContentTypeManager ctm, boolean loadExternalTargets) {
+//              _loadFromZipFile = new LoadFromZipFile(ctm);
+//              _loadFromZipFile.loadExternalTargets(loadExternalTargets);
+//      }
         
         public OpcPackage get(String filepath) throws Docx4JException {

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

@@ -86 +86 @@
          // HashMap containing the names of all the zip entries,
         // so we can tell whether there are any orphans
-        public HashMap unusedZipEntries = null;
+//      public HashMap unusedZipEntries = null;
         
         public LoadFromZipFile() {
-                this(new ContentTypeManager() );
-        }
-
-        public LoadFromZipFile(ContentTypeManager ctm) {
-                this.ctm = ctm;
-        }
+//              this(new ContentTypeManager() );
+        }
+
+//      public LoadFromZipFile(ContentTypeManager ctm) {
+//              this.ctm = ctm;
+//      }
         
         
@@ -123 +123 @@
 //              entries, so we can tick them off.
                 
-                unusedZipEntries = new HashMap();
+//              unusedZipEntries = new HashMap();
                 Enumeration entries = zf.entries();
                 while (entries.hasMoreElements()) {
                         ZipEntry entry = (ZipEntry) entries.nextElement();
-                        unusedZipEntries.put(entry.getName(), new Boolean(true) );      
+//                      unusedZipEntries.put(entry.getName(), new Boolean(true) );      
                 }
                 
@@ -133 +133 @@
                 //              Eventually, you'll also be able to create an Excel package etc
                 //              but only the WordML package exists at present
+                ContentTypeManager ctm = new ContentTypeManager();
                 
                 try {
@@ -147 +148 @@
 //              each PartName, and use it in the Part constructor.
 //              p.setContentTypeManager(ctm); - 20080111 - done by ctm.createPackage();
-                unusedZipEntries.put("[Content_Types].xml", new Boolean(false));
+//              unusedZipEntries.put("[Content_Types].xml", new Boolean(false));
                 
                 // 4. Start with _rels/.rels
@@ -161 +162 @@
                 p.setRelationships(rp);
                 //rp.setPackageRelationshipPart(true);          
-                unusedZipEntries.put(partName, new Boolean(false));
+//              unusedZipEntries.put(partName, new Boolean(false));
                 
                 
@@ -172 +173 @@
 //              (ii) add the new Part to the package
 //              (iii) cross the PartName off unusedZipEntries
-                addPartsFromRelationships(zf, p, rp );
+                addPartsFromRelationships(zf, p, rp, ctm );
                 
                 
                 // 6. Check unusedZipEntries is empty
-                if (log.isDebugEnabled()) {             
-                         Iterator myVeryOwnIterator = unusedZipEntries.keySet().iterator();
-                         while(myVeryOwnIterator.hasNext()) {
-                             String key = (String)myVeryOwnIterator.next();
-                             log.info( key + "  " + unusedZipEntries.get(key));
-                         }
-                }                
+//              if (log.isDebugEnabled()) {             
+//                       Iterator myVeryOwnIterator = unusedZipEntries.keySet().iterator();
+//                       while(myVeryOwnIterator.hasNext()) {
+//                           String key = (String)myVeryOwnIterator.next();
+//                           log.info( key + "  " + unusedZipEntries.get(key));
+//                       }
+//              }                
                  try {
                          zf.close();
@@ -254 +255 @@
         (iii) cross the PartName off unusedZipEntries
         */
-        private void addPartsFromRelationships(ZipFile zf, Base source, RelationshipsPart rp)
+        private void addPartsFromRelationships(ZipFile zf, Base source, RelationshipsPart rp,
+                        ContentTypeManager ctm)
                 throws Docx4JException {
                 
@@ -281 +283 @@
                                 // a part, so start with a line break.
                         try {                           
-                                getPart(zf, pkg, rp, r);
+                                getPart(zf, pkg, rp, r, ctm);
                         } catch (Exception e) {
                                 throw new Docx4JException("Failed to add parts from relationships", e);
@@ -306 +308 @@
 //      private void getPart(ZipFile zf, Base source, 
 //                      Package pkg, String resolvedPartUri, String relationshipType)
-        private void getPart(ZipFile zf, OpcPackage pkg, RelationshipsPart rp, Relationship r)
+        private void getPart(ZipFile zf, OpcPackage pkg, RelationshipsPart rp, Relationship r,
+                        ContentTypeManager ctm)
                         throws Docx4JException, InvalidFormatException, URISyntaxException {
                 
@@ -348 +351 @@
                 }
                 
-                if (handled.get(resolvedPartUri)!=null) return;
+                if (pkg.handled.get(resolvedPartUri)!=null) return;
                 
                 String relationshipType = r.getType();          
@@ -359 +362 @@
                 }               
                 rp.loadPart(part, r);
-                handled.put(resolvedPartUri, resolvedPartUri);
+                pkg.handled.put(resolvedPartUri, resolvedPartUri);
                 
 
@@ -369 +372 @@
                 }
                 
-                unusedZipEntries.put(resolvedPartUri, new Boolean(false));
-                log.info(".. added." );
+//              unusedZipEntries.put(resolvedPartUri, new Boolean(false));
+//              log.info(".. added." );
                 
                 RelationshipsPart rrp = getRelationshipsPart(zf, part);
                 if (rrp!=null) {
                         // recurse via this parts relationships, if it has any
-                        addPartsFromRelationships(zf, part, rrp );
+                        addPartsFromRelationships(zf, part, rrp, ctm );
                         String relPart = PartName.getRelationshipsPartName(
                                         part.getPartName().getName().substring(1) );
-                        unusedZipEntries.put(relPart, new Boolean(false));                                      
+//                      unusedZipEntries.put(relPart, new Boolean(false));                                      
                 }
         }

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

@@ -81 +81 @@
 public class LoadFromZipNG extends Load {
         
-        public HashMap<String, ByteArray> partByteArrays = new HashMap<String, ByteArray>();    
+        //public HashMap<String, ByteArray> partByteArrays = new HashMap<String, ByteArray>();  
         
         private static Logger log = Logger.getLogger(LoadFromZipNG.class);
@@ -99 +99 @@
         
         public LoadFromZipNG() {
-                this(new ContentTypeManager() );
-        }
-
-        public LoadFromZipNG(ContentTypeManager ctm) {
-                this.ctm = ctm;
-        }
+//              this(new ContentTypeManager() );
+        }
+
+//      public LoadFromZipNG(ContentTypeManager ctm) {
+//              this.ctm = ctm;
+//      }
         
         
@@ -143 +143 @@
                 }
                                 
+                HashMap<String, ByteArray> partByteArrays = new HashMap<String, ByteArray>();
                 Enumeration entries = zf.entries();
                 while (entries.hasMoreElements()) {
@@ -163 +164 @@
                  
                 
-                return process();
+                return process(partByteArrays);
         }
 
         public OpcPackage get(InputStream is) throws Docx4JException {
 
+                HashMap<String, ByteArray> partByteArrays = new HashMap<String, ByteArray>();   
        try {
             ZipInputStream zis = new ZipInputStream(is);
@@ -187 +189 @@
         // work the same way
                 
-                return process();
-        }
-        
-        private OpcPackage process() throws Docx4JException {
+                return process(partByteArrays);
+        }
+        
+        private OpcPackage process(HashMap<String, ByteArray> partByteArrays) throws Docx4JException {
 
                 // 2. Create a new Package
                 //              Eventually, you'll also be able to create an Excel package etc
                 //              but only the WordML package exists at present
+                
+                ContentTypeManager ctm = new ContentTypeManager();
 
                 try {
@@ -235 +239 @@
 //              (ii) add the new Part to the package
 //              (iii) cross the PartName off unusedZipEntries
-                addPartsFromRelationships(partByteArrays, p, rp );
+                addPartsFromRelationships(partByteArrays, p, rp, ctm );
                 
                 
@@ -313 +317 @@
         //private void addPartsFromRelationships(ZipFile zf, Base source, RelationshipsPart rp)
         private void addPartsFromRelationships(HashMap<String, ByteArray> partByteArrays, 
-                        Base source, RelationshipsPart rp)
+                        Base source, RelationshipsPart rp, ContentTypeManager ctm)
                 throws Docx4JException {
                 
@@ -342 +346 @@
                                 // a part, so start with a line break.
                         try {                           
-                                getPart(partByteArrays, pkg, rp, r);
+                                getPart(partByteArrays, pkg, rp, r, ctm);
                         } catch (Exception e) {
                                 throw new Docx4JException("Failed to add parts from relationships", e);
@@ -367 +371 @@
         //private void getPart(ZipFile zf, Package pkg, RelationshipsPart rp, Relationship r)
         private void getPart(HashMap<String, ByteArray> partByteArrays, OpcPackage pkg, RelationshipsPart rp, 
-                        Relationship r)
+                        Relationship r, ContentTypeManager ctm)
                         throws Docx4JException, InvalidFormatException, URISyntaxException {
                 
@@ -409 +413 @@
                 }
                 
-                if (handled.get(resolvedPartUri)!=null) return;
+                if (pkg.handled.get(resolvedPartUri)!=null) return;
                 
                 String relationshipType = r.getType();          
@@ -420 +424 @@
                 }
                 rp.loadPart(part, r);
-                handled.put(resolvedPartUri, resolvedPartUri);
+                pkg.handled.put(resolvedPartUri, resolvedPartUri);
 
                 // The source Part (or Package) might have a convenience
@@ -434 +438 @@
                 if (rrp!=null) {
                         // recurse via this parts relationships, if it has any
-                        addPartsFromRelationships(partByteArrays, part, rrp );
+                        addPartsFromRelationships(partByteArrays, part, rrp, ctm );
                         String relPart = PartName.getRelationshipsPartName(
                                         part.getPartName().getName().substring(1) );

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

@@ -63 +63 @@
 
         /**
+         * This HashMap is intended to prevent loops during the loading 
+         * of this package. TODO This doesn't really tell us anything that
+         * the contents of Parts couldn't also tell us (except that
+         * that doesn't contain the rels parts), so consider removing.
+         * At least replace it with a method, so this implementation
+         * detail is hidden!
+         */
+        public HashMap<String, String> handled = new HashMap<String, String>();
+        
+        /**
          * Package parts collection.  This is a collection of _all_
          * parts in the package (_except_ relationship parts),