Changeset 1176

Timestamp:

07/16/10 12:28:10 (19 months ago)

Author:

jharrop

Message:

Extract method createRelationshipsPartForPart, and use it.

Location:

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

Files:

• Base.java (modified) (1 diff)
• parts/WordprocessingML/BinaryPartAbstractImage.java (modified) (2 diffs)
• parts/relationships/RelationshipsPart.java (modified) (3 diffs)

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

@@ -196 +196 @@
 
                 // Create RelationshipsPart for this part if necessary
-                if (this.getRelationshipsPart() == null ) {
-                        RelationshipsPart rp = new RelationshipsPart( this );
-                        rp.setPackage(this.getPackage());
-                        
-                        this.setRelationships(rp);
-                        
-                        // Make sure content manager knows how to handle .rels
-                        getPackage().getContentTypeManager().addDefaultContentType("rels", 
-                                        org.docx4j.openpackaging.contenttype.ContentTypes.RELATIONSHIPS_PART);
-                }
+                if (this.getRelationshipsPart() == null ) 
+                        RelationshipsPart.createRelationshipsPartForPart(this);
                 
                 // Now add the targetpart to the relationships

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

@@ -57 +57 @@
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.PartName;
+import org.docx4j.openpackaging.parts.relationships.RelationshipsPart;
 import org.docx4j.relationships.Relationship;
 import org.docx4j.wml.SectPr;
@@ -188 +189 @@
                 
                 ContentTypeManager ctm = wordMLPackage.getContentTypeManager();
+                
+                // Ensure the relationships part exists
+                if (sourcePart.getRelationshipsPart()==null) 
+                        RelationshipsPart.createRelationshipsPartForPart(sourcePart);
+                
                 String proposedRelId = sourcePart.getRelationshipsPart().getNextId();
                 // In order to ensure unique part name,

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

@@ -155 +155 @@
                 init();
         }
-
+        
         /**
          * Constructor.  Creates an appropriately named .rels XML document.
@@ -184 +184 @@
                 jaxbElement = factory.createRelationships();            
         }
+                
         
         public void init() {            
@@ -191 +192 @@
 
                 setJAXBContext(Context.jcRelationships);                                
+        }
+        
+        public static RelationshipsPart createRelationshipsPartForPart(
+                        Base sourcePart) {
+
+                if (sourcePart.getRelationshipsPart() != null)
+                        return sourcePart.getRelationshipsPart();
+
+                RelationshipsPart rp = null;
+                try {
+                        rp = new RelationshipsPart(sourcePart);
+                } catch (InvalidFormatException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                rp.setPackage(sourcePart.getPackage());
+
+                // sourcePart.setRelationships(rp);
+
+                // Make sure content manager knows how to handle .rels
+                sourcePart
+                                .getPackage()
+                                .getContentTypeManager()
+                                .addDefaultContentType(
+                                                "rels",
+                                                org.docx4j.openpackaging.contenttype.ContentTypes.RELATIONSHIPS_PART);
+
+                return rp;
         }