Changeset 1648 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/io

Timestamp:

09/02/11 03:35:43 (9 months ago)

Author:

jharrop

Message:

getRelationshipsPart() will create it if it doesn't exist already, similar to behaviour of JAXB lists.

Location:

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

Files:

• LoadFromZipNG.java (modified) (1 diff)
• SaveToZipFile.java (modified) (1 diff)

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

@@ -467 +467 @@
                         Part part)
         throws Docx4JException, InvalidFormatException {
+                
                 RelationshipsPart rrp = null;
                 // recurse via this parts relationships, if it has any

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

@@ -413 +413 @@
                 
                 // recurse via this parts relationships, if it has any
-                if (part.getRelationshipsPart()!= null ) {
-                        RelationshipsPart rrp = part.getRelationshipsPart();
-                        log.debug("Found relationships " + rrp.getPartName() );
-                        String relPart = PartName.getRelationshipsPartName(resolvedPartUri);
-                        log.debug("Cf constructed name " + relPart );
-                        
-                        //deprecatedSaveRawXmlPart(out, relPart, rrp.getDocument() );
-                        // 2008 06 12 - try this neater method
-                        saveRawXmlPart(out, rrp, relPart );
-                        
-                        addPartsFromRelationships(out, rrp );
-                } else {
-                        log.debug("No relationships for " + resolvedPartUri );                                  
-                }
+                RelationshipsPart rrp = part.getRelationshipsPart(false); //don't create
+                if (rrp!= null ) {
+                        
+                        //log.debug("Found relationships " + rrp.getPartName() );
+                        
+                        // Only save it if it actually has rels in it
+                        if (rrp.getRelationships().getRelationship().size()>0) {
+                                
+                                String relPart = PartName.getRelationshipsPartName(resolvedPartUri);
+                                //log.debug("Cf constructed name " + relPart );
+                                
+                                saveRawXmlPart(out, rrp, relPart );
+                                
+                                addPartsFromRelationships(out, rrp );
+                        }
+                } 
+//              else {
+//                      log.debug("No relationships for " + resolvedPartUri );                                  
+//              }
         }