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

Timestamp:

01/09/10 18:15:02 (2 years ago)

Author:

jharrop

Message:

Remove dom4j stuff

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java (modified) (2 diffs)

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

@@ -62 +62 @@
 import org.docx4j.openpackaging.Base;
 import org.docx4j.openpackaging.URIHelper;
+import org.docx4j.openpackaging.contenttype.CTDefault;
+import org.docx4j.openpackaging.contenttype.CTOverride;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
 import org.docx4j.openpackaging.contenttype.ContentTypes;
+import org.docx4j.openpackaging.contenttype.ObjectFactory;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.packages.Package;
@@ -427 +430 @@
                 
                 // Add an override to ContentTypeManager
+                ObjectFactory ctFactory = new ObjectFactory();
+                
                 if ( part.getContentType().equals( ContentTypes.IMAGE_JPEG) ) {
                         
-                        ctm.addDefaultContentType("jpeg", ContentTypes.IMAGE_JPEG);
+                        CTDefault defaultCT = ctFactory.createCTDefault();
+                        defaultCT.setExtension("jpeg");
+                        defaultCT.setContentType(ContentTypes.IMAGE_JPEG);
+                        ctm.addDefaultContentType("jpeg",defaultCT );
                         
                 } else if ( part.getContentType().equals( ContentTypes.EXTENSION_GIF ) ) {
                         
-                        ctm.addDefaultContentType("gif", ContentTypes.EXTENSION_GIF);
+                        CTDefault defaultCT = ctFactory.createCTDefault();
+                        defaultCT.setExtension("gif");
+                        defaultCT.setContentType(ContentTypes.EXTENSION_GIF);
+                        ctm.addDefaultContentType("gif", defaultCT);
                         
                 } else if ( part.getContentType().equals( ContentTypes.EXTENSION_PNG ) ) {
                         
-                        ctm.addDefaultContentType("png", ContentTypes.IMAGE_PNG);
+                        CTDefault defaultCT = ctFactory.createCTDefault();
+                        defaultCT.setExtension("png");
+                        defaultCT.setContentType(ContentTypes.IMAGE_PNG);
+                        ctm.addDefaultContentType("png", defaultCT);
                         
                 } else {
-                        ctm.addOverrideContentType(part.getPartName().getURI(), part.getContentType());
+                        CTOverride overrideCT = ctFactory.createCTOverride();
+                        overrideCT.setPartName(part.getPartName().getName() );
+                        overrideCT.setContentType(part.getContentType());
+                        
+                        ctm.addOverrideContentType(part.getPartName().getURI(), overrideCT );
                 }