From b1c93550a81a4fe1efdb21767913b52b2bf41d79 Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Mon, 19 Jul 2004 22:46:14 +0000 Subject: [PATCH] 1.) Moved exclusively to Simon's DefaultHandler object for both Transformer and SAXParser usage. DefaultHandler implements the ContentHandler interface so it can be used where the latter was previously used, also it provides more functionality. [1] 2.) Updated the examples and internal code accordingly. 3.) Renamed ExampleFO2PDFUsingSAX to ...Parser to avoid confusion (both use SAX.) [1] http://www.cafeconleche.org/books/xmljava/chapters/ch06s03.html#d0e8440 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197802 13f79535-47bb-0310-9956-ffa450edef68 --- examples/embedding/build.xml | 2 +- .../java/embedding/ExampleDOM2PDF.java | 2 +- .../java/embedding/ExampleFO2PDF.java | 2 +- ....java => ExampleFO2PDFUsingSAXParser.java} | 8 ++++---- .../java/embedding/ExampleObj2PDF.java | 2 +- .../java/embedding/ExampleXML2PDF.java | 2 +- src/java/org/apache/fop/apps/Driver.java | 19 ++++++++----------- .../apache/fop/servlet/FopPrintServlet.java | 4 ++-- .../org/apache/fop/servlet/FopServlet.java | 2 +- .../org/apache/fop/BasicDriverTestCase.java | 8 ++++---- 10 files changed, 24 insertions(+), 27 deletions(-) rename examples/embedding/java/embedding/{ExampleFO2PDFUsingSAX.java => ExampleFO2PDFUsingSAXParser.java} (95%) diff --git a/examples/embedding/build.xml b/examples/embedding/build.xml index ec382aceb..11d803c09 100644 --- a/examples/embedding/build.xml +++ b/examples/embedding/build.xml @@ -86,7 +86,7 @@ - + diff --git a/examples/embedding/java/embedding/ExampleDOM2PDF.java b/examples/embedding/java/embedding/ExampleDOM2PDF.java index 0612178e9..372ff274a 100644 --- a/examples/embedding/java/embedding/ExampleDOM2PDF.java +++ b/examples/embedding/java/embedding/ExampleDOM2PDF.java @@ -79,7 +79,7 @@ public class ExampleDOM2PDF { Source src = new DOMSource(xslfoDoc); // Resulting SAX events (the generated FO) must be piped through to FOP - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); // Start XSLT transformation and FOP processing transformer.transform(src, res); diff --git a/examples/embedding/java/embedding/ExampleFO2PDF.java b/examples/embedding/java/embedding/ExampleFO2PDF.java index 281bbf02d..2cac20729 100644 --- a/examples/embedding/java/embedding/ExampleFO2PDF.java +++ b/examples/embedding/java/embedding/ExampleFO2PDF.java @@ -72,7 +72,7 @@ public class ExampleFO2PDF { Source src = new StreamSource(fo); // Resulting SAX events (the generated FO) must be piped through to FOP - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); // Start XSLT transformation and FOP processing transformer.transform(src, res); diff --git a/examples/embedding/java/embedding/ExampleFO2PDFUsingSAX.java b/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java similarity index 95% rename from examples/embedding/java/embedding/ExampleFO2PDFUsingSAX.java rename to examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java index 74645c3a4..de152b125 100644 --- a/examples/embedding/java/embedding/ExampleFO2PDFUsingSAX.java +++ b/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java @@ -43,7 +43,7 @@ import org.apache.fop.apps.FOPException; * This class demonstrates the conversion of an FO file to PDF using FOP. * It uses a SAXParser with FOP as the DefaultHandler */ -public class ExampleFO2PDFUsingSAX { +public class ExampleFO2PDFUsingSAXParser { /** * Converts an FO file to a PDF file using FOP @@ -99,7 +99,7 @@ public class ExampleFO2PDFUsingSAX { */ public static void main(String[] args) { try { - System.out.println("FOP ExampleFO2PDFUsingSAX\n"); + System.out.println("FOP ExampleFO2PDFUsingSAXParser\n"); System.out.println("Preparing..."); //Setup directories @@ -109,14 +109,14 @@ public class ExampleFO2PDFUsingSAX { //Setup input and output files File fofile = new File(baseDir, "xml/fo/helloworld.fo"); - File pdffile = new File(outDir, "ResultFO2PDFUsingSAX.pdf"); + File pdffile = new File(outDir, "ResultFO2PDFUsingSAXParser.pdf"); System.out.println("Input: XSL-FO (" + fofile + ")"); System.out.println("Output: PDF (" + pdffile + ")"); System.out.println(); System.out.println("Transforming..."); - ExampleFO2PDFUsingSAX app = new ExampleFO2PDFUsingSAX(); + ExampleFO2PDFUsingSAXParser app = new ExampleFO2PDFUsingSAXParser(); app.convertFO2PDF(fofile, pdffile); System.out.println("Success!"); diff --git a/examples/embedding/java/embedding/ExampleObj2PDF.java b/examples/embedding/java/embedding/ExampleObj2PDF.java index d41c51d9e..e68bc69c8 100644 --- a/examples/embedding/java/embedding/ExampleObj2PDF.java +++ b/examples/embedding/java/embedding/ExampleObj2PDF.java @@ -72,7 +72,7 @@ public class ExampleObj2PDF { Source src = team.getSourceForProjectTeam(); // Resulting SAX events (the generated FO) must be piped through to FOP - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); // Start XSLT transformation and FOP processing transformer.transform(src, res); diff --git a/examples/embedding/java/embedding/ExampleXML2PDF.java b/examples/embedding/java/embedding/ExampleXML2PDF.java index a1dea46fe..fa99b843e 100644 --- a/examples/embedding/java/embedding/ExampleXML2PDF.java +++ b/examples/embedding/java/embedding/ExampleXML2PDF.java @@ -87,7 +87,7 @@ public class ExampleXML2PDF { Source src = new StreamSource(xmlfile); // Resulting SAX events (the generated FO) must be piped through to FOP - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); // Start XSLT transformation and FOP processing transformer.transform(src, res); diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java index 72d9185ee..aecf72518 100644 --- a/src/java/org/apache/fop/apps/Driver.java +++ b/src/java/org/apache/fop/apps/Driver.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.OutputStream; // XML -import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -126,11 +125,13 @@ public class Driver implements Constants { } /** - * Determines which SAX ContentHandler is appropriate for the renderType. - * Structure renderers (e.g. MIF & RTF) each have a specialized - * ContentHandler that directly place data into the output stream. Layout - * renderers (e.g. PDF & PostScript) use a ContentHandler that builds an FO - * Tree. + * Returns a DefaultHandler object used to generate the document. + * Note this object implements the ContentHandler interface. + * For processing with a Transformer object, this DefaultHandler object + * can be used in the SAXResult constructor. + * Alternatively, for processing with a SAXParser, this object can be + * used as the DefaultHandler argument to its parse() methods. + * * @return a SAX DefaultHandler for handling the SAX events. * @throws FOPException if setting up the DefaultHandler fails */ @@ -138,10 +139,6 @@ public class Driver implements Constants { return new FOTreeBuilder(renderType, foUserAgent, stream); } - public ContentHandler getContentHandler() throws FOPException { - return getDefaultHandler(); - } - /** * Render the FO document read by a SAX Parser from an InputHandler * @param inputHandler the input handler containing the source and @@ -167,7 +164,7 @@ public class Driver implements Constants { */ public synchronized void render(XMLReader parser, InputSource source) throws FOPException { - parser.setContentHandler(getContentHandler()); + parser.setContentHandler(getDefaultHandler()); try { /** diff --git a/src/java/org/apache/fop/servlet/FopPrintServlet.java b/src/java/org/apache/fop/servlet/FopPrintServlet.java index 451dea973..55a868214 100644 --- a/src/java/org/apache/fop/servlet/FopPrintServlet.java +++ b/src/java/org/apache/fop/servlet/FopPrintServlet.java @@ -148,7 +148,7 @@ public class FopPrintServlet extends HttpServlet { Source src = new StreamSource(foFile); // Resulting SAX events (the generated FO) must be piped through to FOP - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); // Start XSLT transformation and FOP processing transformer.transform(src, res); @@ -179,7 +179,7 @@ public class FopPrintServlet extends HttpServlet { Source src = new StreamSource(xmlfile); // Resulting SAX events (the generated FO) must be piped through to FOP - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); // Start XSLT transformation and FOP processing transformer.transform(src, res); diff --git a/src/java/org/apache/fop/servlet/FopServlet.java b/src/java/org/apache/fop/servlet/FopServlet.java index a4da5b21f..6a626786d 100644 --- a/src/java/org/apache/fop/servlet/FopServlet.java +++ b/src/java/org/apache/fop/servlet/FopServlet.java @@ -208,7 +208,7 @@ public class FopServlet extends HttpServlet { driver.setOutputStream(out); //Make sure the XSL transformation's result is piped through to FOP - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); //Start the transformation and rendering process transformer.transform(src, res); diff --git a/test/java/org/apache/fop/BasicDriverTestCase.java b/test/java/org/apache/fop/BasicDriverTestCase.java index fa004e487..80b70d3ef 100644 --- a/test/java/org/apache/fop/BasicDriverTestCase.java +++ b/test/java/org/apache/fop/BasicDriverTestCase.java @@ -77,7 +77,7 @@ public class BasicDriverTestCase extends AbstractFOPTestCase { TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); //Identity transf. Source src = new DOMSource(loadDocument(foFile)); - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); transformer.transform(src, res); assertTrue("Generated PostScript has zero length", baout.size() > 0); @@ -115,7 +115,7 @@ public class BasicDriverTestCase extends AbstractFOPTestCase { TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); //Identity transf. Source src = new StreamSource(foFile); - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); transformer.transform(src, res); assertTrue("Generated PDF has zero length", baout.size() > 0); @@ -134,7 +134,7 @@ public class BasicDriverTestCase extends AbstractFOPTestCase { TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); //Identity transf. Source src = new StreamSource(foFile); - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); transformer.transform(src, res); assertTrue("Generated PostScript has zero length", baout.size() > 0); @@ -153,7 +153,7 @@ public class BasicDriverTestCase extends AbstractFOPTestCase { TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); //Identity transf. Source src = new StreamSource(foFile); - Result res = new SAXResult(driver.getContentHandler()); + Result res = new SAXResult(driver.getDefaultHandler()); transformer.transform(src, res); assertTrue("Generated RTF has zero length", baout.size() > 0); -- 2.39.5