Changeset 1488 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

05/08/11 05:51:47 (13 months ago)

Author:

jharrop

Message:

Add image content type by actual extension, not assumed .jpg, .png etc.

File:

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

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

@@ -482 +482 @@
                         ContentTypeManager ctm, String relId) {
                 
+                log.info("adding part: " + part.getPartName().getName() );
+                
                 // Now add a new relationship
 
@@ -566 +568 @@
                 addRelationship(rel );
                 
+        String ext = part.getPartName().getExtension();
+                
                 // Add an override to ContentTypeManager
                 if ( part.getContentType().equals( ContentTypes.IMAGE_JPEG) ) {
-                        ctm.addDefaultContentType("jpeg",ContentTypes.IMAGE_JPEG );
+                        ctm.addDefaultContentType(ext,ContentTypes.IMAGE_JPEG );
                 } else if ( part.getContentType().equals( ContentTypes.EXTENSION_GIF ) ) {
-                        ctm.addDefaultContentType("gif", ContentTypes.EXTENSION_GIF);
+                        ctm.addDefaultContentType(ext, ContentTypes.EXTENSION_GIF);
                 } else if ( part.getContentType().equals( ContentTypes.EXTENSION_PNG ) ) {
-                        ctm.addDefaultContentType("png", ContentTypes.IMAGE_PNG);
+                        ctm.addDefaultContentType(ext, ContentTypes.IMAGE_PNG);                 
+                        // TODO - other content types!
                 } else {
                         ctm.addOverrideContentType(part.getPartName().getURI(), part.getContentType());
@@ -750 +755 @@
                 }               
 
-                log.debug("Comparing " + resolvedTargetURI + " == " + partName.getName());
+                //log.debug("Comparing " + resolvedTargetURI + " == " + partName.getName());
                 
                 return partName.getName().equals(resolvedTargetURI.toString()) ;