gmazza 2003/08/05 15:39:51
Modified: src/java/org/apache/fop/apps Driver.java
Log:
Safer handling of treebuilder variable within Driver.reset(), also
Driver.setRenderer(renderer) will now set the rendererType variable when given an
AWTRenderer.
Revision Changes Path
1.17 +8 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Driver.java 4 Aug 2003 00:52:16 -0000 1.16
+++ Driver.java 5 Aug 2003 22:39:51 -0000 1.17
@@ -59,6 +59,7 @@
import org.apache.fop.mif.MIFHandler;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.awt.AWTPrintRenderer;
+import org.apache.fop.render.awt.AWTRenderer;
import org.apache.fop.rtf.renderer.RTFHandler;
import org.apache.fop.tools.DocumentInputSource;
import org.apache.fop.tools.DocumentReader;
@@ -321,7 +322,9 @@
source = null;
stream = null;
reader = null;
- treeBuilder.reset();
+ if (treeBuilder != null) {
+ treeBuilder.reset();
+ }
}
/**
@@ -424,6 +427,10 @@
* @param renderer the renderer instance to use (Note: Logger must be set at
this point)
*/
public void setRenderer(Renderer renderer) {
+ // AWTStarter calls this function directly
+ if (renderer instanceof AWTRenderer) {
+ rendererType = RENDER_AWT;
+ }
renderer.setProducer(Version.getVersion());
renderer.setUserAgent(getUserAgent());
this.renderer = renderer;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
