vmote 2003/08/22 10:21:48
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fo FOTreeHandler.java
Log:
1. move renderer initialization work from FOTreeHandler to Driver
2. clean up related FOTreeHandler constructor
Revision Changes Path
1.34 +12 -1 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Driver.java 20 Aug 2003 19:46:47 -0000 1.33
+++ Driver.java 22 Aug 2003 17:21:48 -0000 1.34
@@ -534,7 +534,7 @@
throw new IllegalStateException(
"Renderer not set when using standard foInputHandler");
}
- foInputHandler = new FOTreeHandler(currentDocument, stream, renderer,
true);
+ foInputHandler = new FOTreeHandler(currentDocument, true);
}
foInputHandler.enableLogging(getLogger());
@@ -590,6 +590,17 @@
currentDocument.atModel = AreaTree.createRenderPagesModel(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
1.7 +2 -35 xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java
Index: FOTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FOTreeHandler.java 19 Aug 2003 06:54:31 -0000 1.6
+++ FOTreeHandler.java 22 Aug 2003 17:21:48 -0000 1.7
@@ -51,8 +51,6 @@
package org.apache.fop.fo;
// Java
-import java.io.IOException;
-import java.io.OutputStream;
import java.util.HashSet;
import java.util.Iterator;
@@ -73,7 +71,6 @@
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.pagination.Flow;
import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.fop.render.Renderer;
/**
* Defines how SAX events specific to XSL-FO input should be handled when
@@ -110,19 +107,6 @@
private long startTime;
/**
- * The stream to which this rendering is to be
- * written to. <B>Note</B> that some renderers
- * do not render to a stream, and that this
- * member can therefore be null.
- */
- private OutputStream outputStream;
-
- /**
- * The renderer being used.
- */
- private Renderer renderer;
-
- /**
* Collection of objects that have registered to be notified about
* FOTreeEvent firings.
*/
@@ -132,20 +116,14 @@
* Main constructor
* @param foTreeControl the FOTreeControl implementation that governs this
* FO Tree
- * @param outputStream the stream that the result is rendered to
- * @param renderer the renderer to call
* @param store if true then use the store pages model and keep the
* area tree in memory
*/
- public FOTreeHandler(FOTreeControl foTreeControl, OutputStream outputStream,
- Renderer renderer, boolean store) {
+ public FOTreeHandler(FOTreeControl foTreeControl, boolean store) {
super(foTreeControl);
if (collectStatistics) {
runtime = Runtime.getRuntime();
}
- this.outputStream = outputStream;
- this.renderer = renderer;
-
}
/**
@@ -164,17 +142,6 @@
initialMemory = runtime.totalMemory() - runtime.freeMemory();
startTime = System.currentTimeMillis();
- }
- try {
- renderer.setupFontInfo(foTreeControl);
- // check that the "any,normal,400" font exists
- if (!foTreeControl.isSetupValid()) {
- throw new SAXException(new FOPException(
- "No default font defined by OutputConverter"));
- }
- renderer.startRenderer(outputStream);
- } catch (IOException e) {
- throw new SAXException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
