Changeset 118 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

Timestamp:

01/11/08 10:04:42 (4 years ago)

Author:

jharrop

Message:

Simplify addition of a new part to the package with convenience method addTargetPart
Change RelationshipsPart? constructor to determine its part name from the name of the source part.

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (7 diffs)

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

@@ -21 +21 @@
 
 
+import org.apache.log4j.Logger;
+import org.docx4j.openpackaging.Base;
 import org.docx4j.openpackaging.parts.DocPropsCorePart;
 import org.docx4j.openpackaging.parts.DocPropsExtendedPart;
@@ -63 +65 @@
          */
         
+        protected static Logger log = Logger.getLogger(WordprocessingMLPackage.class);
                 
         
@@ -78 +81 @@
                 if (relationshipType.equals(Namespaces.PROPERTIES_CORE)) {
                         docPropsCorePart = (DocPropsCorePart)part;
+                        log.info("Set shortcut for docPropsCorePart");
                         return true;                    
                 } else if (relationshipType.equals(Namespaces.PROPERTIES_EXTENDED)) {
                         docPropsExtendedPart = (DocPropsExtendedPart)part;
+                        log.info("Set shortcut for docPropsExtendedPart");
                         return true;                    
                 } else if (relationshipType.equals(Namespaces.DOCUMENT)) {
                         mainDoc = (MainDocumentPart)part;
+                        log.info("Set shortcut for mainDoc");
                         return true;                    
                 } else {        
@@ -98 +104 @@
                                 
                 // Create a package
-                WordprocessingMLPackage p = new WordprocessingMLPackage();
+                WordprocessingMLPackage wmlPack = new WordprocessingMLPackage();
 
                 // Add a ContentTypeManager to it
                 ContentTypeManager ctm = new ContentTypeManagerImpl();
-                p.setContentTypeManager(ctm);
+                wmlPack.setContentTypeManager(ctm);
+                        // TODO - move this to constructor?
+
+
+                // Create main document part
+                Part wordDocumentPart = new org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart();         
                 
-
                 // Create main document part content
                 org.docx4j.wml.ObjectFactory factory = new org.docx4j.wml.ObjectFactory();
@@ -122 +132 @@
                 org.docx4j.wml.Document wmlDocumentEl = factory.createDocument();
                 wmlDocumentEl.setBody(body);
-                
-
-                // Create main document part
-                Part corePart = new org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart();
-                
+                                
                 // Put the content in the part
-                ((org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart)corePart).setJaxbElement(wmlDocumentEl);
+                ((org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart)wordDocumentPart).setJaxbElement(wmlDocumentEl);
+                                                
+                // Add the main document part to the package relationships
+                // (creating it if necessary)
+                wmlPack.addTargetPart(wordDocumentPart);
                                 
-                // Make getMainDocumentPart() work
-                p.setPartShortcut(corePart, corePart.getRelationshipType());
-                
-                // Create the PackageRelationships part 
-                RelationshipsPart rp = new RelationshipsPart( new PartName("/_rels/.rels"), p );
-                
-                // Make sure content manager knows how to handle .rels
-                ctm.addDefaultContentType("rels", org.docx4j.openpackaging.contenttype.ContentTypes.RELATIONSHIPS_PART);
-                
-                // Add it to the package
-                p.setRelationships(rp);
-                        // TODO - this should happen automatically?
-                                
-                // Add the main document part to the package relationships
-                // and to [Content_Types].xml
-                rp.addPart(corePart, p.getContentTypeManager());
-                
-                
                 // Create a styles part
                 Part stylesPart = new org.docx4j.openpackaging.parts.WordprocessingML.StyleDefinitionsPart();
@@ -154 +146 @@
                                         .unmarshalDefaultStyles();
                         
-                        // Now we need to add it the main document part's relationships
-                        RelationshipsPart docRels = new RelationshipsPart( new PartName("/word/_rels/document.xml.rels"), corePart );
-                                // TODO - should construct the relationships part name from the source part name
-                        corePart.setRelationships(docRels);
-                        // TODO - this should happen automatically?
-                        docRels.addPart(stylesPart, p.getContentTypeManager());                 
+                        // Add the styles part to the main document part relationships
+                        // (creating it if necessary)
+                        wordDocumentPart.addTargetPart(stylesPart); // NB - add it to main doc part, not package!                       
                         
                 } catch (Exception e) {
@@ -166 +155 @@
                 }
                 // Return the new package
-                return p;
-
+                return wmlPack;
                 
         }
-
         
 }