Changeset 887 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

Timestamp:

09/02/09 10:59:59 (2 years ago)

Author:

jharrop

Message:

Apply Holger Schlegel's patch adding a generic parameter for the JaxbElement? property. Also alter interface:

public E unmarshal( java.io.InputStream? is )
public E unmarshal(org.w3c.dom.Element el)

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (6 diffs)

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

@@ -22 +22 @@
 
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.OutputStream;
-import java.util.Iterator;
 import java.util.Map;
 
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
 import javax.xml.transform.Templates;
@@ -43 +37 @@
 import org.docx4j.fonts.IdentityPlusMapper;
 import org.docx4j.fonts.Mapper;
-import org.docx4j.fonts.FontUtils;
 import org.docx4j.jaxb.Context;
 import org.docx4j.model.HeaderFooterPolicy;
@@ -51 +44 @@
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
-import org.docx4j.openpackaging.io.LoadFromZipFile;
 import org.docx4j.openpackaging.io.LoadFromZipNG;
 import org.docx4j.openpackaging.io.SaveToZipFile;
@@ -62 +54 @@
 import org.docx4j.openpackaging.parts.WordprocessingML.GlossaryDocumentPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
-import org.docx4j.openpackaging.parts.WordprocessingML.StyleDefinitionsPart;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
-
-import com.lowagie.text.pdf.BaseFont;
+import org.docx4j.wml.Document;
+import org.docx4j.wml.Styles;
 
 
@@ -248 +239 @@
 //                      this.getMainDocumentPart().setJaxbElement(wmlDocument);
 //              }       
-                this.getMainDocumentPart().setJaxbElement(  ((JaxbXmlPart)tmpDocPart).getJaxbElement() );
+                this.getMainDocumentPart().setJaxbElement(
+                                ((JaxbXmlPart<Document>) tmpDocPart).getJaxbElement() );
 //                              
 //              if (wmlStyles==null) {
@@ -255 +247 @@
 //                      this.getMainDocumentPart().getStyleDefinitionsPart().setJaxbElement(wmlStyles);
 //              }
-                this.getMainDocumentPart().getStyleDefinitionsPart().setJaxbElement(  ((JaxbXmlPart)tmpStylesPart).getJaxbElement() );
+                this.getMainDocumentPart().getStyleDefinitionsPart().setJaxbElement(
+                                ((JaxbXmlPart<Styles>) tmpStylesPart).getJaxbElement() );
         
     }