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

Timestamp:

01/11/08 11:08:36 (4 years ago)

Author:

jharrop

Message:

no-arg Package constructor now creates a content type manager; added new constructor for passing in a content type manager.

File:

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

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

@@ -32 +32 @@
 import org.docx4j.openpackaging.parts.relationships.RelationshipsPart;
 
+import org.docx4j.openpackaging.contenttype.ContentType;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
 import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
+import org.docx4j.openpackaging.contenttype.ContentTypes;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 
@@ -74 +76 @@
         protected GlossaryDocumentPart glossaryDoc;
         
+        /**
+         * Constructor.  Also creates a new content type manager
+         * 
+         */     
         public WordprocessingMLPackage() {
                 super();
+                setContentType(new ContentType(ContentTypes.WORDPROCESSINGML_DOCUMENT));
         }
+        /**
+         * Constructor.
+         *  
+         * @param contentTypeManager
+         *            The content type manager to use 
+         */
+        public WordprocessingMLPackage(ContentTypeManager contentTypeManager) {
+                super(contentTypeManager);
+                setContentType(new ContentType(ContentTypes.WORDPROCESSINGML_DOCUMENT));
+        }
+        
         
         public boolean setPartShortcut(Part part, String relationshipType) {
@@ -105 +123 @@
                 // Create a package
                 WordprocessingMLPackage wmlPack = new WordprocessingMLPackage();
-
-                // Add a ContentTypeManager to it
-                ContentTypeManager ctm = new ContentTypeManagerImpl();
-                wmlPack.setContentTypeManager(ctm);
-                        // TODO - move this to constructor?
-
 
                 // Create main document part