jeremias 2003/11/08 07:16:53
Modified: src/java/org/apache/fop/apps Driver.java
Log:
Now all setup code is moved from render() to getContentHandler() except for the
FOTreeListener.
Revision Changes Path
1.48 +17 -16 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Driver.java 8 Nov 2003 14:30:01 -0000 1.47
+++ Driver.java 8 Nov 2003 15:16:53 -0000 1.48
@@ -514,8 +514,9 @@
* renderers (e.g. PDF & PostScript) use a ContentHandler that builds an FO
* Tree.
* @return a SAX ContentHandler for handling the SAX events.
+ * @throws FOPException if setting up the ContentHandler fails
*/
- public ContentHandler getContentHandler() {
+ public ContentHandler getContentHandler() throws FOPException {
if (!isInitialized()) {
initialize();
}
@@ -542,6 +543,21 @@
"Renderer not set when using standard foInputHandler");
}
foInputHandler = new FOTreeHandler(currentDocument, true);
+ currentDocument.areaTree = new AreaTree(currentDocument);
+ currentDocument.atModel = new RenderPagesModel(renderer);
+ //this.atModel = new CachedRenderPagesModel(renderer);
+ currentDocument.areaTree.setTreeModel(currentDocument.atModel);
+ try {
+ renderer.setupFontInfo(currentDocument);
+ // check that the "any,normal,400" font exists
+ if (!currentDocument.isSetupValid()) {
+ throw new FOPException(
+ "No default font defined by OutputConverter");
+ }
+ renderer.startRenderer(stream);
+ } catch (IOException e) {
+ throw new FOPException(e);
+ }
}
currentDocument.foInputHandler = foInputHandler;
/** LayoutStrategy is hard-wired for now, but needs to be made
@@ -588,21 +604,6 @@
if (foInputHandler instanceof FOTreeHandler) {
FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
foTreeHandler.addFOTreeListener(currentDocument);
- currentDocument.areaTree = new AreaTree(currentDocument);
- currentDocument.atModel = new RenderPagesModel(renderer);
- //this.atModel = new CachedRenderPagesModel(renderer);
- currentDocument.areaTree.setTreeModel(currentDocument.atModel);
- try {
- renderer.setupFontInfo(currentDocument);
- // check that the "any,normal,400" font exists
- if (!currentDocument.isSetupValid()) {
- throw new SAXException(new FOPException(
- "No default font defined by OutputConverter"));
- }
- renderer.startRenderer(stream);
- } catch (IOException e) {
- throw new SAXException(e);
- }
}
/**
The following statement triggers virtually all of the processing
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
