Changeset 854 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages

Timestamp:

07/08/09 17:09:15 (3 years ago)

Author:

jharrop

Message:

Remove ContentTypeManager? interface; replace it with implementation.
ContentTypeManager?: change semantics of isContentTypeRegistered, so that it means 'is *default* content type registered'.

Location:

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

Files:

• Package.java (modified) (2 diffs)
• WordprocessingMLPackage.java (modified) (2 diffs)

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

@@ -28 +28 @@
 import org.docx4j.openpackaging.Base;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.CustomXmlDataStoragePart;
@@ -101 +100 @@
                         partName = new PartName("/", false);
                         
-                        contentTypeManager = new ContentTypeManagerImpl();
+                        contentTypeManager = new ContentTypeManager();
                 } catch (Exception e) {
                         log.error(e.getMessage());

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

@@ -49 +49 @@
 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.Docx4JException;
@@ -238 +237 @@
                 org.docx4j.convert.in.FlatOpcXmlImporter xmlPackage = new org.docx4j.convert.in.FlatOpcXmlImporter( wmlPackageEl); 
                 
-                ContentTypeManager ctm = new ContentTypeManagerImpl();
+                ContentTypeManager ctm = new ContentTypeManager();
                 
                 Part tmpDocPart = xmlPackage.getRawPart(ctm,  "/word/document.xml");