From: Peter Bernard West Date: Sun, 14 Mar 2004 11:21:27 +0000 (+0000) Subject: Merged Driver into Fop X-Git-Tag: Defoe_export~250 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1e97e8734cd0b1e5b8a9309cbe7d68a100c41aa8;p=xmlgraphics-fop.git Merged Driver into Fop git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197448 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/apps/Document.java b/src/java/org/apache/fop/apps/Document.java index ef7bef709..2198aaa7c 100644 --- a/src/java/org/apache/fop/apps/Document.java +++ b/src/java/org/apache/fop/apps/Document.java @@ -37,8 +37,8 @@ import org.apache.fop.fonts.FontMetrics; */ public class Document { - /** The parent Driver object */ - private Driver driver; + /** The parent Fop object */ + private Fop fop; /** Map containing fonts that have been used */ private Map usedFonts; @@ -58,10 +58,10 @@ public class Document { private Logger log; /** * Main constructor - * @param driver the Driver object that is the "parent" of this Document + * @param fop the Fop object that is the "parent" of this Document */ - public Document(Driver driver) { - this.driver = driver; + public Document(Fop fop) { + this.fop = fop; this.triplets = new java.util.HashMap(); this.fonts = new java.util.HashMap(); this.usedFonts = new java.util.HashMap(); @@ -246,11 +246,11 @@ public class Document { } /** - * Public accessor for the parent Driver of this Document - * @return the parent Driver for this Document + * Public accessor for the parent Fop of this Document + * @return the parent Fop for this Document */ - public Driver getDriver() { - return driver; + public Fop getFop() { + return fop; } /** @@ -272,7 +272,7 @@ public class Document { * @return the FOUserAgent used for processing this document */ public FOUserAgent getUserAgent() { - return getDriver().getUserAgent(); + return getFop().getUserAgent(); } } diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java deleted file mode 100644 index 668170440..000000000 --- a/src/java/org/apache/fop/apps/Driver.java +++ /dev/null @@ -1,347 +0,0 @@ -/* - * $Id$ - * - * - * Copyright 1999-2003 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - */ - -package org.apache.fop.apps; - -import java.util.logging.Logger; - -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; - -import org.apache.fop.configuration.Configuration; -import org.apache.fop.configuration.FOUserAgent; -import org.apache.fop.configuration.SystemOptions; -import org.apache.fop.fo.FOTree; -import org.apache.fop.layout.AreaTree; -import org.apache.fop.render.Renderer; -import org.apache.fop.render.awt.AWTRenderer; -import org.apache.fop.version.Version; -import org.apache.fop.xml.FoXmlSerialHandler; -import org.apache.fop.xml.Namespaces; -import org.apache.fop.xml.SyncedXmlEventsBuffer; -import org.apache.fop.xml.XmlEventReader; - -/** - * Sets up and runs serialized component threads. - * XMLEventSource <=> FOTree <=> AreaTree ... - * - * @author pbw - */ - -public class Driver { - - /** private constant to indicate renderer was not defined. */ - private static final int NOT_SET = 0; - /** Render to PDF. OutputStream must be set */ - public static final int RENDER_PDF = 1; - /** Render to a GUI window. No OutputStream neccessary */ - public static final int RENDER_AWT = 2; - /** Render to MIF. OutputStream must be set */ - public static final int RENDER_MIF = 3; - /** Render to XML. OutputStream must be set */ - public static final int RENDER_XML = 4; - /** Render to PRINT. No OutputStream neccessary */ - public static final int RENDER_PRINT = 5; - /** Render to PCL. OutputStream must be set */ - public static final int RENDER_PCL = 6; - /** Render to Postscript. OutputStream must be set */ - public static final int RENDER_PS = 7; - /** Render to Text. OutputStream must be set */ - public static final int RENDER_TXT = 8; - /** Render to SVG. OutputStream must be set */ - public static final int RENDER_SVG = 9; - /** Render to RTF. OutputStream must be set */ - public static final int RENDER_RTF = 10; - - protected Logger logger = Logger.getLogger(Fop.fopPackage); - /** If true, full error stacks are reported */ - private boolean _errorDump = false; - private Configuration configuration = null; - private SystemOptions options = null; - private FOUserAgent userAgent = null; - - private InputHandler inputHandler; - private XMLReader parser; - private InputSource saxSource; - - private FoXmlSerialHandler xmlhandler; - private SyncedXmlEventsBuffer eventsBuffer; - private Namespaces namespaces; - private XmlEventReader eventReader; - private FOTree foTree; - private AreaTree areaTree = new AreaTree(); - - private Thread driverThread; - private Thread parserThread; - private Thread foThread; - private Thread areaThread; - private Thread renderThread; - - /** the renderer type code given by setRenderer */ - private int rendererType = NOT_SET; - - /** the renderer to use to output the area tree */ - private Renderer renderer; - - - /** - * Error handling, version and logging initialization. - */ - public Driver() { - String version = Version.getVersion(); - configuration = new Configuration(); - options = new SystemOptions(configuration); - userAgent = new FOUserAgent(); - _errorDump = configuration.isTrue("debugMode"); - logger.config(version); - } - - public Driver(Configuration config, SystemOptions options) { - String version = Version.getVersion(); - configuration = config; - this.options = options; - userAgent = new FOUserAgent(); - _errorDump = configuration.isTrue("debugMode"); - logger.config(version); - } - - /** - * Sets up the environment and start processing threads. - * The primary elements of the environment include:
- * the input saxSource, the parser, the - * {@link org.apache.fop.xml.SyncedXmlEventsBuffer SyncedXmlEventsBuffer} - * (eventsBuffer), the - * {@link org.apache.fop.xml.FoXmlSerialHandler FoXmlSerialHandler} - * (xmlhandler) and the - * {@link org.apache.fop.fo.FOTree FOTree} (foTree). - * - *

The xmlhandler uses the saxSource and the parser to - * generate XML events which it stores in eventsBuffer. - * FoXmlSerialHandler implements Runnable. - * - *

The foTree reads events from the eventsBuffer - * buffer, which it interprets to build the FO tree. FOTree - * implements Runnable. - * - *

The parser thread is passed the runnable xmlhandler. - * When started, it scans the input, constructs and buffers events. It - * blocks when the buffer is full, and continues when notified that the - * buffer has emptied. - *

- * The FO Tree builder thread is passed the runnable foTree, - * which blocks on an empty eventsBuffer buffer, and continues - * when notified that events are available in the buffer. - * - * @throws FOPException - */ - public void run () throws FOPException { - setInputHandler(options.getInputHandler()); - parser = inputHandler.getParser(); - saxSource = inputHandler.getInputSource(); - // Setting of namespace-prefixes feature no longer required - //setParserFeatures(parser); - - namespaces = new Namespaces(); - eventsBuffer = new SyncedXmlEventsBuffer(namespaces); - eventReader = new XmlEventReader(eventsBuffer, namespaces); - xmlhandler = new FoXmlSerialHandler(eventsBuffer, parser, saxSource); - foTree = new FOTree(eventReader); - - driverThread = Thread.currentThread(); - foThread = new Thread(foTree, "FOTreeBuilder"); - foThread.setDaemon(true); - parserThread = new Thread(xmlhandler, "XMLSerialHandler"); - parserThread.setDaemon(true); - - xmlhandler.setFoThread(foThread); - foTree.setParserThread(parserThread); - - System.out.println("Starting parserThread"); - parserThread.start(); - System.out.println("parserThread started"); - foThread.start(); - System.out.println("foThread started"); - try { - parserThread.join(); - } catch (InterruptedException e) {} - //System.out.println("Joined to parser."); - try { - foThread.join(); - } catch (InterruptedException e) {} - - } - - /** - * Sets the InputHandler for XML imput as specified in FOPOptions. - * @param inputHandler the InputHandler - */ - public void setInputHandler(InputHandler inputHandler) { - this.inputHandler = inputHandler; - } - - protected FOUserAgent getUserAgent() { - return userAgent; - } - - /** - * Shortcut to set the rendering type to use. Must be one of - *

- * @param renderer the type of renderer to use - * @throws IllegalArgumentException if an unsupported renderer type was required. - */ - public void setRenderer(int renderer) throws IllegalArgumentException { - rendererType = renderer; - switch (renderer) { -// case RENDER_PDF: -// setRenderer("org.apache.fop.render.pdf.PDFRenderer"); -// break; - case RENDER_AWT: - throw new IllegalArgumentException("Use renderer form of setRenderer() for AWT"); -// case RENDER_PRINT: -// setRenderer("org.apache.fop.render.awt.AWTPrintRenderer"); -// break; -// case RENDER_PCL: -// setRenderer("org.apache.fop.render.pcl.PCLRenderer"); -// break; -// case RENDER_PS: -// setRenderer("org.apache.fop.render.ps.PSRenderer"); -// break; -// case RENDER_TXT: -// setRenderer("org.apache.fop.render.txt.TXTRenderer()"); -// break; -// case RENDER_MIF: -// //foInputHandler will be set later -// break; -// case RENDER_XML: -// setRenderer("org.apache.fop.render.xml.XMLRenderer"); -// break; -// case RENDER_SVG: -// setRenderer("org.apache.fop.render.svg.SVGRenderer"); -// break; -// case RENDER_RTF: -// //foInputHandler will be set later -// break; - default: - rendererType = NOT_SET; - throw new IllegalArgumentException("Unknown renderer type " + renderer); - } - } - - /** - * Set the Renderer to use. - * @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; - } - - /** - * Returns the currently active renderer. - * @return the renderer - */ - public Renderer getRenderer() { - return renderer; - } - - /** - * Set the class name of the Renderer to use as well as the - * producer string for those renderers that can make use of it. - * @param rendererClassName classname of the renderer to use such as - * "org.apache.fop.render.pdf.PDFRenderer" - * @exception IllegalArgumentException if the classname was invalid. - * @see #setRenderer(int) - */ - public void setRenderer(String rendererClassName) - throws IllegalArgumentException { - try { - renderer = (Renderer)Class.forName(rendererClassName).newInstance(); - renderer.setProducer(Version.getVersion()); - renderer.setUserAgent(getUserAgent()); - } catch (ClassNotFoundException e) { - throw new IllegalArgumentException("Could not find " - + rendererClassName); - } catch (InstantiationException e) { - throw new IllegalArgumentException("Could not instantiate " - + rendererClassName); - } catch (IllegalAccessException e) { - throw new IllegalArgumentException("Could not access " - + rendererClassName); - } catch (ClassCastException e) { - throw new IllegalArgumentException(rendererClassName - + " is not a renderer"); - } - } - - /** - * DOES NOTHING - * TODO Eliminate or actualise - */ - public synchronized void reset() { - } - - /** - * Render the FO document read by a SAX Parser from an InputHandler - * @param inputHandler the input handler containing the source and - * parser information. - * @throws FOPException if anything goes wrong. - */ - public synchronized void render(InputHandler inputHandler) - throws FOPException { - throw new FOPException("Attempting to run null 'render' method"); - } - - /** - * Prints stack trace of an exception - * @param e the exception to trace - */ - public void dumpError(Exception e) { - if (_errorDump) { - if (e instanceof SAXException) { - e.printStackTrace(); - if (((SAXException)e).getException() != null) { - ((SAXException)e).getException().printStackTrace(); - } - } else { - e.printStackTrace(); - } - } - } - -} - diff --git a/src/java/org/apache/fop/apps/Fop.java b/src/java/org/apache/fop/apps/Fop.java index 93b58bf83..b262cdd64 100644 --- a/src/java/org/apache/fop/apps/Fop.java +++ b/src/java/org/apache/fop/apps/Fop.java @@ -29,29 +29,98 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.fop.area.AreaTree; import org.apache.fop.configuration.CLI_Options; import org.apache.fop.configuration.ConfigurationResource; import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.FOUserAgent; import org.apache.fop.configuration.SystemOptions; import org.apache.fop.configuration.UserOptions; +import org.apache.fop.fo.FOTree; +import org.apache.fop.render.Renderer; +import org.apache.fop.render.awt.AWTRenderer; +import org.apache.fop.version.Version; +import org.apache.fop.xml.FoXmlSerialHandler; +import org.apache.fop.xml.Namespaces; +import org.apache.fop.xml.SyncedXmlEventsBuffer; +import org.apache.fop.xml.XmlEventReader; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; public class Fop { + /** private constant to indicate renderer was not defined. */ + private static final int NOT_SET = 0; + /** Render to PDF. OutputStream must be set */ + public static final int RENDER_PDF = 1; + /** Render to a GUI window. No OutputStream neccessary */ + public static final int RENDER_AWT = 2; + /** Render to MIF. OutputStream must be set */ + public static final int RENDER_MIF = 3; + /** Render to XML. OutputStream must be set */ + public static final int RENDER_XML = 4; + /** Render to PRINT. No OutputStream neccessary */ + public static final int RENDER_PRINT = 5; + /** Render to PCL. OutputStream must be set */ + public static final int RENDER_PCL = 6; + /** Render to Postscript. OutputStream must be set */ + public static final int RENDER_PS = 7; + /** Render to Text. OutputStream must be set */ + public static final int RENDER_TXT = 8; + /** Render to SVG. OutputStream must be set */ + public static final int RENDER_SVG = 9; + /** Render to RTF. OutputStream must be set */ + public static final int RENDER_RTF = 10; + + private InputHandler inputHandler; + private XMLReader parser; + private InputSource saxSource; + + private FoXmlSerialHandler xmlhandler; + private SyncedXmlEventsBuffer eventsBuffer; + private Namespaces namespaces; + private XmlEventReader eventReader; + private FOTree foTree; + private AreaTree areaTree = new AreaTree(); + + private Thread driverThread; + private Thread parserThread; + private Thread foThread; + private Thread areaThread; + private Thread renderThread; + + /** the renderer type code given by setRenderer */ + private int rendererType = NOT_SET; + + /** the renderer to use to output the area tree */ + private Renderer renderer; + public static Runtime runtime; public static long startTotal; public static long startFree; public static long startTime; public static long startPCi; public static long endPCi; + private long endtotal, endfree, gctotal, gcfree; - /** - * The top-level package for FOP - */ + /** The top-level package for FOP */ public static final String fopPackage = "org.apache.fop"; - + /** The logging object */ private Logger logger; - + /** Configuration data */ public Configuration configuration = null; + /** The version string */ + public final String version = Version.getVersion(); + /** The version revision string */ + public final String revision = Version.getRevision(); + /** The version name string */ + public final String name = Version.getName(); + + protected Properties properties = null; + protected SystemOptions options = null; + protected UserOptions userOptions = null; + protected CLI_Options cliOptions = null; + protected FOUserAgent userAgent = null; public static void main(String[] args) { Fop fopInstance = new Fop(args); @@ -80,17 +149,26 @@ public class Fop { String[] args = null; public Fop() { - run(); + setup(); } public Fop(String[] args) { this.args = args; - run(); + setup(); } - - public void run() { - long endtotal, endfree, gctotal, gcfree; - Properties properties; + + public Fop(Configuration config, SystemOptions options) { + configuration = config; + this.options = options; + if (options instanceof CLI_Options) { + cliOptions = (CLI_Options)options; + } else { + if (options instanceof UserOptions) { + userOptions = (UserOptions)options; + } + } + } + private void setup() { try { // Get the initial system properties InputStream propsfile = @@ -110,19 +188,55 @@ public class Fop { } // Now that the Fop system properties have been added, set up logger logger = Logger.getLogger(fopPackage); + logger.setLevel(Level.CONFIG); + logger.config(version); // Then restrict to WARNING logger.setLevel(Level.WARNING); - Driver driver; - SystemOptions options = null; - UserOptions userOptions = null; - CLI_Options cliOptions = null; - Boolean bool = null; + } + private void setupRunStats() { runtime = Runtime.getRuntime(); startTotal = runtime.totalMemory(); startFree = runtime.freeMemory(); startTime = System.currentTimeMillis(); + } + + private void printRunStats() { + System.out.println("Back from driver.run()"); + System.out.println("Elapsed time: " + + (System.currentTimeMillis() - startTime)); + endtotal = runtime.totalMemory(); + endfree = runtime.freeMemory(); + System.gc(); + gctotal = runtime.totalMemory(); + gcfree = runtime.freeMemory(); + System.out.println("Total memory before run : " + startTotal); + System.out.println("Total memory after run : " + endtotal); + System.out.println("Total memory after GC : " + gctotal); + System.out.println("Diff before/after total : " + + (endtotal - startTotal)); + System.out.println("Diff before/GC total : " + + (gctotal - startTotal)); + System.out.println("Diff after/GC total : " + + (gctotal - endtotal)); + System.out.println("Free memory before run : " + startFree); + System.out.println("Free memory after run : " + endfree); + System.out.println("Free memory after GC : " + gcfree); + System.out.println("Diff before/after free : " + + (endfree - startFree)); + System.out.println("Diff before/GC free : " + + (gcfree - startFree)); + System.out.println("Diff after/GC free : " + + (gcfree - endfree)); + System.out.println("cg() freed : " + + (gcfree - endfree)); + //System.out.println("PC time : " + (endPCi - startPCi)); + } + public void run() { + setupRunStats(); + + Boolean bool = null; try { configuration = new Configuration(); if (args == null) { @@ -142,44 +256,184 @@ public class Fop { throw new FOPException(e2); } } - driver = new Driver(configuration, options); - driver.run(); - System.out.println("Back from driver.run()"); - System.out.println("Elapsed time: " + - (System.currentTimeMillis() - startTime)); - endtotal = runtime.totalMemory(); - endfree = runtime.freeMemory(); - System.gc(); - gctotal = runtime.totalMemory(); - gcfree = runtime.freeMemory(); - System.out.println("Total memory before run : " + startTotal); - System.out.println("Total memory after run : " + endtotal); - System.out.println("Total memory after GC : " + gctotal); - System.out.println("Diff before/after total : " - + (endtotal - startTotal)); - System.out.println("Diff before/GC total : " - + (gctotal - startTotal)); - System.out.println("Diff after/GC total : " - + (gctotal - endtotal)); - System.out.println("Free memory before run : " + startFree); - System.out.println("Free memory after run : " + endfree); - System.out.println("Free memory after GC : " + gcfree); - System.out.println("Diff before/after free : " - + (endfree - startFree)); - System.out.println("Diff before/GC free : " - + (gcfree - startFree)); - System.out.println("Diff after/GC free : " - + (gcfree - endfree)); - System.out.println("cg() freed : " - + (gcfree - endfree)); - //System.out.println("PC time : " + (endPCi - startPCi)); - + setInputHandler(options.getInputHandler()); + parser = inputHandler.getParser(); + saxSource = inputHandler.getInputSource(); + // Setting of namespace-prefixes feature no longer required + //setParserFeatures(parser); + + namespaces = new Namespaces(); + eventsBuffer = new SyncedXmlEventsBuffer(namespaces); + eventReader = new XmlEventReader(eventsBuffer, namespaces); + xmlhandler = new FoXmlSerialHandler(eventsBuffer, parser, saxSource); + foTree = new FOTree(eventReader); + + driverThread = Thread.currentThread(); + foThread = new Thread(foTree, "FOTreeBuilder"); + foThread.setDaemon(true); + parserThread = new Thread(xmlhandler, "XMLSerialHandler"); + parserThread.setDaemon(true); + + xmlhandler.setFoThread(foThread); + foTree.setParserThread(parserThread); + + System.out.println("Starting parserThread"); + parserThread.start(); + System.out.println("parserThread started"); + foThread.start(); + System.out.println("foThread started"); + try { + parserThread.join(); + } catch (InterruptedException e) {} + //System.out.println("Joined to parser."); + try { + foThread.join(); + } catch (InterruptedException e) {} } catch (FOPException e) { logger.warning(e.getMessage()); if (options.isDebugMode()) { e.printStackTrace(); } } + + printRunStats(); + + } + + /** + * Sets the InputHandler for XML imput as specified in FOPOptions. + * @param inputHandler the InputHandler + */ + public void setInputHandler(InputHandler inputHandler) { + this.inputHandler = inputHandler; + } + + protected FOUserAgent getUserAgent() { + return userAgent; + } + + /** + * Shortcut to set the rendering type to use. Must be one of + * + * @param renderer the type of renderer to use + * @throws IllegalArgumentException if an unsupported renderer type was required. + */ + public void setRenderer(int renderer) throws IllegalArgumentException { + rendererType = renderer; + switch (renderer) { +// case RENDER_PDF: +// setRenderer("org.apache.fop.render.pdf.PDFRenderer"); +// break; + case RENDER_AWT: + throw new IllegalArgumentException("Use renderer form of setRenderer() for AWT"); +// case RENDER_PRINT: +// setRenderer("org.apache.fop.render.awt.AWTPrintRenderer"); +// break; +// case RENDER_PCL: +// setRenderer("org.apache.fop.render.pcl.PCLRenderer"); +// break; +// case RENDER_PS: +// setRenderer("org.apache.fop.render.ps.PSRenderer"); +// break; +// case RENDER_TXT: +// setRenderer("org.apache.fop.render.txt.TXTRenderer()"); +// break; +// case RENDER_MIF: +// //foInputHandler will be set later +// break; +// case RENDER_XML: +// setRenderer("org.apache.fop.render.xml.XMLRenderer"); +// break; +// case RENDER_SVG: +// setRenderer("org.apache.fop.render.svg.SVGRenderer"); +// break; +// case RENDER_RTF: +// //foInputHandler will be set later +// break; + default: + rendererType = NOT_SET; + throw new IllegalArgumentException("Unknown renderer type " + renderer); + } + } + + /** + * Set the Renderer to use. + * @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; + } + + /** + * Returns the currently active renderer. + * @return the renderer + */ + public Renderer getRenderer() { + return renderer; + } + + /** + * Set the class name of the Renderer to use as well as the + * producer string for those renderers that can make use of it. + * @param rendererClassName classname of the renderer to use such as + * "org.apache.fop.render.pdf.PDFRenderer" + * @exception IllegalArgumentException if the classname was invalid. + * @see #setRenderer(int) + */ + public void setRenderer(String rendererClassName) + throws IllegalArgumentException { + try { + renderer = (Renderer)Class.forName(rendererClassName).newInstance(); + renderer.setProducer(Version.getVersion()); + renderer.setUserAgent(getUserAgent()); + } catch (ClassNotFoundException e) { + throw new IllegalArgumentException("Could not find " + + rendererClassName); + } catch (InstantiationException e) { + throw new IllegalArgumentException("Could not instantiate " + + rendererClassName); + } catch (IllegalAccessException e) { + throw new IllegalArgumentException("Could not access " + + rendererClassName); + } catch (ClassCastException e) { + throw new IllegalArgumentException(rendererClassName + + " is not a renderer"); + } + } + + /** + * DOES NOTHING + * TODO Eliminate or actualise + */ + public synchronized void reset() { + } + + /** + * Render the FO document read by a SAX Parser from an InputHandler + * @param inputHandler the input handler containing the source and + * parser information. + * @throws FOPException if anything goes wrong. + */ + public synchronized void render(InputHandler inputHandler) + throws FOPException { + throw new FOPException("Attempting to run null 'render' method"); } } diff --git a/src/java/org/apache/fop/configuration/SystemOptions.java b/src/java/org/apache/fop/configuration/SystemOptions.java index ca5bc85b7..cba3373a0 100644 --- a/src/java/org/apache/fop/configuration/SystemOptions.java +++ b/src/java/org/apache/fop/configuration/SystemOptions.java @@ -31,10 +31,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; -import org.apache.fop.apps.Driver; +import org.apache.fop.apps.Fop; import org.apache.fop.apps.FOFileHandler; import org.apache.fop.apps.FOPException; -import org.apache.fop.apps.Fop; import org.apache.fop.apps.InputHandler; import org.apache.fop.apps.XSLTInputHandler; @@ -398,26 +397,26 @@ public class SystemOptions { case NOT_SET: throw new FOPException("Renderer has not been set!"); case PDF_OUTPUT: - return Driver.RENDER_PDF; + return Fop.RENDER_PDF; case AWT_OUTPUT: - return Driver.RENDER_AWT; + return Fop.RENDER_AWT; case MIF_OUTPUT: - return Driver.RENDER_MIF; + return Fop.RENDER_MIF; case PRINT_OUTPUT: - return Driver.RENDER_PRINT; + return Fop.RENDER_PRINT; case PCL_OUTPUT: - return Driver.RENDER_PCL; + return Fop.RENDER_PCL; case PS_OUTPUT: - return Driver.RENDER_PS; + return Fop.RENDER_PS; case TXT_OUTPUT: - return Driver.RENDER_TXT; + return Fop.RENDER_TXT; case SVG_OUTPUT: - return Driver.RENDER_SVG; + return Fop.RENDER_SVG; case AREA_OUTPUT: rendererOptions.put("fineDetail", coarseAreaXmlValue()); - return Driver.RENDER_XML; + return Fop.RENDER_XML; case RTF_OUTPUT: - return Driver.RENDER_RTF; + return Fop.RENDER_RTF; default: throw new FOPException("Invalid Renderer setting!"); } diff --git a/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java b/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java index c1d06615c..bd77bbe7b 100644 --- a/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java +++ b/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java @@ -48,7 +48,7 @@ import java.awt.print.PrinterJob; import java.awt.print.PrinterException; //FOP -import org.apache.fop.apps.Driver; +import org.apache.fop.apps.Fop; import org.apache.fop.apps.InputHandler; import org.apache.fop.apps.FOPException; import org.apache.fop.render.awt.AWTRenderer; @@ -68,8 +68,8 @@ public class PreviewDialog extends JFrame { protected AWTRenderer renderer; /** The InputHandler associated with this window */ protected InputHandler inputHandler; - /** The Driver used for refreshing/reloading the view */ - protected Driver driver; + /** The Fop used for refreshing/reloading the view */ + protected Fop fop; private int currentPage = 0; private int pageCount = 0; @@ -383,11 +383,11 @@ public class PreviewDialog extends JFrame { */ private class Reloader extends Thread { public void run() { - if (driver == null) { - driver = new Driver(); - driver.setRenderer(renderer); + if (fop == null) { + fop = new Fop(); + fop.setRenderer(renderer); } else { - driver.reset(); + fop.reset(); } pageLabel.setIcon(null); @@ -396,7 +396,7 @@ public class PreviewDialog extends JFrame { try { setStatus(translator.getString("Status.Build.FO.tree")); - driver.render(inputHandler); + fop.render(inputHandler); setStatus(translator.getString("Status.Show")); } catch (FOPException e) { reportException(e);