Changeset 1006

Timestamp:

01/10/10 07:12:46 (2 years ago)

Author:

jharrop

Message:

Trivial simplification to use of content manager

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

• openpackaging/Base.java (modified) (1 diff)
• openpackaging/parts/relationships/RelationshipsPart.java (modified) (1 diff)
• samples/CreateWordprocessingMLDocument.java (modified) (1 diff)
• samples/ImportForeignPart.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/Base.java

@@ -183 +183 @@
                         
                         // Make sure content manager knows how to handle .rels
-                        ObjectFactory factory = new ObjectFactory();
-                        CTDefault relsCT = factory.createCTDefault();
-                        relsCT.setExtension("rels");
-                        relsCT.setContentType(org.docx4j.openpackaging.contenttype.ContentTypes.RELATIONSHIPS_PART);
-                        
                         getPackage().getContentTypeManager().addDefaultContentType("rels", 
-                                        relsCT);
+                                        org.docx4j.openpackaging.contenttype.ContentTypes.RELATIONSHIPS_PART);
                 }
                 

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

@@ -430 +430 @@
                 
                 // Add an override to ContentTypeManager
-                ObjectFactory ctFactory = new ObjectFactory();
-                
                 if ( part.getContentType().equals( ContentTypes.IMAGE_JPEG) ) {
-                        
-                        CTDefault defaultCT = ctFactory.createCTDefault();
-                        defaultCT.setExtension("jpeg");
-                        defaultCT.setContentType(ContentTypes.IMAGE_JPEG);
-                        ctm.addDefaultContentType("jpeg",defaultCT );
-                        
+                        ctm.addDefaultContentType("jpeg",ContentTypes.IMAGE_JPEG );
                 } else if ( part.getContentType().equals( ContentTypes.EXTENSION_GIF ) ) {
-                        
-                        CTDefault defaultCT = ctFactory.createCTDefault();
-                        defaultCT.setExtension("gif");
-                        defaultCT.setContentType(ContentTypes.EXTENSION_GIF);
-                        ctm.addDefaultContentType("gif", defaultCT);
-                        
+                        ctm.addDefaultContentType("gif", ContentTypes.EXTENSION_GIF);
                 } else if ( part.getContentType().equals( ContentTypes.EXTENSION_PNG ) ) {
-                        
-                        CTDefault defaultCT = ctFactory.createCTDefault();
-                        defaultCT.setExtension("png");
-                        defaultCT.setContentType(ContentTypes.IMAGE_PNG);
-                        ctm.addDefaultContentType("png", defaultCT);
-                        
+                        ctm.addDefaultContentType("png", ContentTypes.IMAGE_PNG);
                 } else {
-                        CTOverride overrideCT = ctFactory.createCTOverride();
-                        overrideCT.setPartName(part.getPartName().getName() );
-                        overrideCT.setContentType(part.getContentType());
-                        
-                        ctm.addOverrideContentType(part.getPartName().getURI(), overrideCT );
+                        ctm.addOverrideContentType(part.getPartName().getURI(), part.getContentType());
                 }
                 

trunk/docx4j/src/main/java/org/docx4j/samples/CreateWordprocessingMLDocument.java

@@ -129 +129 @@
 
             // .. content type
-                ObjectFactory ctFactory = new ObjectFactory();
-                CTDefault defaultCT = ctFactory.createCTDefault();
-                defaultCT.setExtension("html");
-                defaultCT.setContentType("text/html");
-            wordMLPackage.getContentTypeManager().addDefaultContentType("html", defaultCT);
+            wordMLPackage.getContentTypeManager().addDefaultContentType("html", "text/html");
             
                 //injectDocPropsCustomPart(wordMLPackage);

trunk/docx4j/src/main/java/org/docx4j/samples/ImportForeignPart.java

@@ -103 +103 @@
                 // Add content type
                 ContentTypeManager packageCtm = wordMLPackage.getContentTypeManager();
-                ObjectFactory ctFactory = new ObjectFactory();
-                CTOverride overrideCT = ctFactory.createCTOverride();
-                overrideCT.setPartName(foreignPart.getPartName().getName() );
-                overrideCT.setContentType(foreignPart.getContentType());
-                
-                packageCtm.addOverrideContentType(foreignPart.getPartName().getURI(), overrideCT );
+                packageCtm.addOverrideContentType(foreignPart.getPartName().getURI(), foreignPart.getContentType());
                 
                 System.out.println("Attached foreign part: " + resolvedPartUri);