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

Timestamp:

03/29/09 20:13:04 (3 years ago)

Author:

jharrop

Message:

Add error listeners for javax.xml.transform
Static initializers now create Templates object (not InputStream? or Source!)
transform methods take a Templates object instead as well.

File:

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

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

@@ -33 +33 @@
 import javax.xml.bind.Unmarshaller;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.stream.StreamSource;
 
 import org.apache.log4j.Logger;
+import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator;
 import org.docx4j.fonts.BestMatchingMapper;
@@ -195 +199 @@
      * pck:package/pck:part format, as emitted by Word 2007.
      * 
-     * @param xslt
+     * @param is
      * @param transformParameters
      * @throws Exception
      */    
-    public void transform(java.io.InputStream xslt, 
+    public void transform(Templates xslt,
                           Map<String, Object> transformParameters) throws Exception {
 
@@ -211 +215 @@
                 org.w3c.dom.Document doc = org.docx4j.XmlUtils.neww3cDomDocument();
                 marshaller.marshal(pkg, doc);
-        
+                        
                 javax.xml.bind.util.JAXBResult result = new javax.xml.bind.util.JAXBResult(jc );
                 
-                // Perform the transformation
+                // Perform the transformation           
                 org.docx4j.XmlUtils.transform(doc, xslt, transformParameters, result);
                 
@@ -248 +252 @@
     public void filter( FilterSettings filterSettings ) throws Exception {
 
-                java.io.InputStream xslt 
-                        = org.docx4j.utils.ResourceUtils.getResource(
-                                        "org/docx4j/openpackaging/packages/filter.xslt");
-        
-        transform(xslt, filterSettings.getSettings() );
+        if (filterTemplate==null) { // first use
+                        Source xsltSource = new StreamSource(
+                                org.docx4j.utils.ResourceUtils.getResource(
+                                                "org/docx4j/openpackaging/packages/filter.xslt"));
+                        filterTemplate = XmlUtils.getTransformerTemplate(xsltSource);
+        }
+        transform(filterTemplate, filterSettings.getSettings() );
         
     }
 
-    
+    static Templates filterTemplate;
     
 /* There should be a mapper per document,