Changeset 1302

Timestamp:

11/11/10 08:15:34 (19 months ago)

Author:

jharrop

Message:

Pass Relationship to newPartForContentType so AlternativeFormatInputPart? can be detected.

Location:

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

Files:

• convert/in/FlatOpcXmlImporter.java (modified) (3 diffs)
• openpackaging/contenttype/ContentTypeManager.java (modified) (6 diffs)
• openpackaging/io/Load.java (modified) (2 diffs)
• openpackaging/io/LoadFromZipFile.java (modified) (3 diffs)
• openpackaging/io/LoadFromZipNG.java (modified) (4 diffs)
• openpackaging/packages/WordprocessingMLPackage.java (modified) (1 diff)
• openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java (modified) (2 diffs)
• openpackaging/parts/relationships/Namespaces.java (modified) (1 diff)
• samples/ImportForeignPart.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java

@@ -316 +316 @@
                 String relationshipType = r.getType();          
                         
-                Part part = getRawPart(ctm, resolvedPartUri);
+                Part part = getRawPart(ctm, resolvedPartUri,r);
                 rp.loadPart(part, r);
                 handled.put(resolvedPartUri, resolvedPartUri);
@@ -382 +382 @@
          * @throws InvalidFormatException
          */
-        public Part getRawPart(ContentTypeManager ctm, String resolvedPartUri)
+        public Part getRawPart(ContentTypeManager ctm, String resolvedPartUri, Relationship rel)
                         throws Docx4JException {
                 
@@ -408 +408 @@
                                 }
                                                                 
-                                 part = ctm.newPartForContentType(contentType, resolvedPartUri);
+                                 part = ctm.newPartForContentType(contentType, resolvedPartUri,rel);
                                  part.setContentType( new ContentType(contentType) );
                                  

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java

@@ -84 +84 @@
 import org.docx4j.openpackaging.parts.PresentationML.JaxbPmlPart;
 import org.docx4j.openpackaging.parts.SpreadsheetML.JaxbSmlPart;
+import org.docx4j.openpackaging.parts.WordprocessingML.AlternativeFormatInputPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.CommentsPart;
@@ -100 +101 @@
 import org.docx4j.openpackaging.parts.WordprocessingML.StyleDefinitionsPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.WebSettingsPart;
+import org.docx4j.openpackaging.parts.relationships.Namespaces;
+import org.docx4j.relationships.Relationship;
 
 
@@ -231 +234 @@
         
         /* Return a part of the appropriate sub class */
-        public  Part getPart(String partName) throws URISyntaxException, PartUnrecognisedException,
+        public  Part getPart(String partName, Relationship rel) throws URISyntaxException, PartUnrecognisedException,
          InvalidFormatException {
                 
@@ -241 +244 @@
                         String contentType = overrideCT.getContentType(); 
                         log.debug("Found content type '" + contentType + "' for " + partName);
-                         p = newPartForContentType(contentType, partName);
+                         p = newPartForContentType(contentType, partName, rel);
                          p.setContentType( new ContentType(contentType) );
                          return p;
@@ -254 +257 @@
                         log.info("Found content type '" + contentType + "' for "
                                                         + partName);
-                        p = newPartForContentType(contentType, partName);
+                        p = newPartForContentType(contentType, partName, rel);
                         p.setContentType(new ContentType(contentType));
                         return p;
@@ -265 +268 @@
         }
         
-        public Part newPartForContentType(String contentType, String partName)
+        public Part newPartForContentType(String contentType, String partName, Relationship rel)
                 throws InvalidFormatException, PartUnrecognisedException {
                 
                 // TODO - a number of WordML parts aren't listed here!
-                if (contentType.equals(ContentTypes.WORDPROCESSINGML_DOCUMENT)) { 
+                if (rel!=null && rel.getType().equals(Namespaces.AF) ) {
+                        // Could have just passed String relType
+                        // Null where used from BPAI, and a FlatOpcXmlImporter case.
+                        // Cases where rel is not available can prepare a suitable dummy
+                        
+                        AlternativeFormatInputPart afip = 
+                                new AlternativeFormatInputPart(new PartName(partName) );
+                        afip.setContentType(new ContentType(contentType));
+                        
+                } else if (contentType.equals(ContentTypes.WORDPROCESSINGML_DOCUMENT)) { 
                         return CreateMainDocumentPartObject(partName);
                         // how is the main document distinguished from the glossary document?

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/Load.java

@@ -122 +122 @@
          * @throws InvalidFormatException
          */
-        public static Part getRawPart(InputStream is, ContentTypeManager ctm, String resolvedPartUri)
+        public static Part getRawPart(InputStream is, ContentTypeManager ctm, String resolvedPartUri, Relationship rel)
                         throws Docx4JException {
                 
@@ -131 +131 @@
                         try {
                                 
-                                part = ctm.getPart("/" + resolvedPartUri);
+                                part = ctm.getPart("/" + resolvedPartUri, rel);
                                                                 
                                 

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipFile.java

@@ -351 +351 @@
                 String relationshipType = r.getType();          
                         
-                Part part = getRawPart(zf, ctm, resolvedPartUri);
+                Part part = getRawPart(zf, ctm, resolvedPartUri, r);
                 if (part instanceof BinaryPart
                                 || part instanceof DefaultXmlPart) {
@@ -425 +425 @@
          * @throws InvalidFormatException
          */
-        public static Part getRawPart(ZipFile zf, ContentTypeManager ctm, String resolvedPartUri)
+        public static Part getRawPart(ZipFile zf, ContentTypeManager ctm, String resolvedPartUri, Relationship rel)
                         throws Docx4JException {
                 Part part = null;
@@ -439 +439 @@
                                 // specific knowledge. Hence it is important to get the is
                                 // first, as we do above.
-                                part = ctm.getPart("/" + resolvedPartUri);                              
+                                part = ctm.getPart("/" + resolvedPartUri, rel);                         
 
                                 if (part instanceof org.docx4j.openpackaging.parts.ThemePart) {

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java

@@ -372 +372 @@
          */
         //private void getPart(ZipFile zf, Package pkg, RelationshipsPart rp, Relationship r)
-        private void getPart(HashMap<String, ByteArray> partByteArrays, OpcPackage pkg, RelationshipsPart rp, Relationship r)
+        private void getPart(HashMap<String, ByteArray> partByteArrays, OpcPackage pkg, RelationshipsPart rp, 
+                        Relationship r)
                         throws Docx4JException, InvalidFormatException, URISyntaxException {
                 
@@ -418 +419 @@
                 String relationshipType = r.getType();          
                         
-                Part part = getRawPart(partByteArrays, ctm, resolvedPartUri);
+                Part part = getRawPart(partByteArrays, ctm, resolvedPartUri, r);
                 if (part instanceof BinaryPart
                                 || part instanceof DefaultXmlPart) {
@@ -495 +496 @@
         //public static Part getRawPart(ZipFile zf, ContentTypeManager ctm, String resolvedPartUri)
         public static Part getRawPart(HashMap<String, ByteArray> partByteArrays,
-                        ContentTypeManager ctm, String resolvedPartUri) 
+                        ContentTypeManager ctm, String resolvedPartUri, Relationship rel)       
                         throws Docx4JException {
+                
                 Part part = null;
                 
@@ -509 +511 @@
                                 // specific knowledge. Hence it is important to get the is
                                 // first, as we do above.
-                                part = ctm.getPart("/" + resolvedPartUri);                              
+                                part = ctm.getPart("/" + resolvedPartUri, rel);                         
 
                                 if (part instanceof org.docx4j.openpackaging.parts.ThemePart) {

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

@@ -271 +271 @@
                 ContentTypeManager ctm = new ContentTypeManager();
                 
-                Part tmpDocPart = xmlPackage.getRawPart(ctm,  "/word/document.xml");
-                Part tmpStylesPart = xmlPackage.getRawPart(ctm,  "/word/styles.xml");
+                Part tmpDocPart = xmlPackage.getRawPart(ctm,  "/word/document.xml", null);
+                Part tmpStylesPart = xmlPackage.getRawPart(ctm,  "/word/styles.xml", null);
                 
                 // This code assumes all the existing rels etc of 

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java

@@ -207 +207 @@
                 BinaryPartAbstractImage imagePart = 
                         (BinaryPartAbstractImage)ctm.newPartForContentType(
-                                info.getMimeType(), createImageName(sourcePart, proposedRelId, ext)
+                                info.getMimeType(), createImageName(sourcePart, proposedRelId, ext), null
                                  );
                                 
@@ -360 +360 @@
                         (BinaryPartAbstractImage)ctm.newPartForContentType(
                                 info.getMimeType(), 
-                                createImageName(sourcePart, proposedRelId, ext ) );
+                                createImageName(sourcePart, proposedRelId, ext ), null );
                                 
                 log.debug("created part " + imagePart.getClass().getName()

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

@@ -117 +117 @@
         
         public final static String AF = 
-                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk";
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/afChunk";
         
         

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

@@ -73 +73 @@
                 
                 
-                Part foreignPart = Load.getRawPart(is, foreignCtm,  resolvedPartUri);
+                Part foreignPart = Load.getRawPart(is, foreignCtm,  resolvedPartUri, null);
+                        // the null means this won't work for an AlternativeFormatInputPart 
                 attachmentPoint.addTargetPart(foreignPart);
                 // Add content type