Changeset 1648 for trunk/docx4j/src/main/java

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

Files:

• openpackaging/Base.java (modified) (3 diffs)
• openpackaging/io/LoadFromZipNG.java (modified) (1 diff)
• openpackaging/io/SaveToZipFile.java (modified) (1 diff)
• openpackaging/parts/relationships/RelationshipsPart.java (modified) (2 diffs)
• samples/PartsList.java (modified) (5 diffs)

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

@@ -49 +49 @@
          * so see Part for definition of a corresponding field.)
          */
-        protected RelationshipsPart relationships;
-
-        /**
-         * Get the relationship part
+        public RelationshipsPart relationships;
+
+        /**
+         * Get the relationship part.
+         * From 2.7.1, the part will be created if it
+         * doesn't exist.  (SaveToZipFile will only
+         * save it if it contains rels) 
          * 
          * @return The relationship part name.
          */
         public RelationshipsPart getRelationshipsPart() {
+                return getRelationshipsPart(true);
+        }
+        
+        /**
+         * Get the relationship part.
+         * @since 2.7.1
+         * 
+         * @param create  whether to create it if it doesn't exist
+         * @return
+         */
+        public RelationshipsPart getRelationshipsPart(boolean createIfAbsent) {
 //                      throws InvalidOperationException {
                 if (this instanceof org.docx4j.openpackaging.parts.relationships.RelationshipsPart) {
@@ -63 +77 @@
                         //throw new InvalidOperationException();
                         return null;
-                } else {
-                        return relationships;
-                }
+                } 
+                
+                if (relationships == null 
+                                && createIfAbsent) {
+                        relationships = RelationshipsPart.createRelationshipsPartForPart(this);
+                }
+                
+                return relationships;
         }
 
@@ -194 +213 @@
                         throw new InvalidFormatException("You should add your part to the target part, not the target part's relationships part.");
                 }
-
-                // Create RelationshipsPart for this part if necessary
-                if (this.getRelationshipsPart() == null ) 
-                        RelationshipsPart.createRelationshipsPartForPart(this);
                 
                 // Now add the targetpart to the relationships

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 );                                  
+//              }
         }
         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java

@@ -200 +200 @@
                         Base sourcePart) {
 
-                if (sourcePart.getRelationshipsPart() != null)
-                        return sourcePart.getRelationshipsPart();
+                if (sourcePart.relationships != null)
+                        return sourcePart.relationships;
 
                 RelationshipsPart rp = null;
@@ -207 +207 @@
                         rp = new RelationshipsPart(sourcePart);
                 } catch (InvalidFormatException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
+                        // shouldn't happen
+                        log.error(e);
                 }
                 rp.setPackage(sourcePart.getPackage());
-
-                // sourcePart.setRelationships(rp);
 
                 // Make sure content manager knows how to handle .rels

trunk/docx4j/src/main/java/org/docx4j/samples/PartsList.java

@@ -29 +29 @@
 import org.docx4j.XmlUtils;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
+import org.docx4j.openpackaging.io.SaveToZipFile;
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.JaxbXmlPart;
@@ -53 +54 @@
 //                      + "/sample-docs/test-docs/header-footer/header_sections_some-linked.xml";
 //       inputfilepath = System.getProperty("user.dir") + "/sample-docs/xlsx/pivot.xlsm";
-                inputfilepath = System.getProperty("user.dir") + "/sample-docs/sample-docx.xml";
+                inputfilepath = System.getProperty("user.dir") + "/sample-docs/word/sample-docx.xml";
         // inputfilepath = System.getProperty("user.dir") + "/sample-docs/pptx/lines.pptx";
                 }
@@ -71 +72 @@
                 
                 System.out.println(sb.toString());
+                
+//              SaveToZipFile saver = new SaveToZipFile(opcPackage);
+//              saver.save(System.getProperty("user.dir") + "/out.docx");
+                
         }
         
@@ -115 +120 @@
                 // TODO: order by rel id
                 
+//              if (rp.getRelationships().getRelationship().size()==0) {
+//                      System.out.println("In rels part .. empty");
+//              }
+                
                 for ( Relationship r : rp.getRelationships().getRelationship() ) {
                         
@@ -139 +148 @@
                         }
                         handled.put(part, part);
-                        if (part.getRelationshipsPart()==null) {
+                        if (part.getRelationshipsPart(false)==null) {
                                 // sb.append(".. no rels" );                                            
                         } else {
-                                traverseRelationships(wordMLPackage, part.getRelationshipsPart(), sb, indent + "    ");
+                                traverseRelationships(wordMLPackage, part.getRelationshipsPart(false), sb, indent + "    ");
                         }