pbwest 2004/05/25 08:31:52
Modified: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Removed GraphicsEnvironment.
Added FontData
Revision Changes Path
No revision
No revision
1.1.2.18 +13 -21 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- Fop.java 15 Apr 2004 11:48:26 -0000 1.1.2.17
+++ Fop.java 25 May 2004 15:31:52 -0000 1.1.2.18
@@ -21,7 +21,6 @@
package org.apache.fop.apps;
//import java.util.logging.Handler;
-import java.awt.GraphicsEnvironment;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -38,6 +37,7 @@
import org.apache.fop.configuration.SystemOptions;
import org.apache.fop.configuration.UserOptions;
import org.apache.fop.fo.FOTree;
+import org.apache.fop.render.FontData;
import org.apache.fop.render.Renderer;
import org.apache.fop.version.Version;
import org.apache.fop.xml.FoXmlSerialHandler;
@@ -58,6 +58,9 @@
*/
public class Fop {
+ private static final String tag = "$Name$";
+ private static final String revision = "$Revision$";
+
/** private constant to indicate renderer was not defined. */
private static final int NOT_SET = 0;
/** Render to PDF. OutputStream must be set */
@@ -104,7 +107,7 @@
/** The version string */
public final String version = Version.getVersion();
/** The version revision string */
- public final String revision = Version.getRevision();
+ public final String rev = Version.getRevision();
/** The version name string */
public final String name = Version.getName();
@@ -246,8 +249,11 @@
/** The <code>XmlEventReader</code> which supplies events to the FO Tree
* builder */
private XmlEventReader eventReader;
+ /** The font database from the renderer */
+ private FontData fontData;
/** Head process of the FO Tree builder thread */
private FOTree foTree;
+ /** The area tree constructed from the FO tree */
private AreaTree areaTree = new AreaTree();
/** Thread of main Fop process */
@@ -256,7 +262,7 @@
private Thread parserThread;
/** Thread of FO Tree building process */
private Thread foThread;
- private Thread areaThread;
+ // private Thread areaThread;
/** Thread of rendering process */
private Thread renderThread;
@@ -291,12 +297,12 @@
rendererType = options.getRenderer();
setRenderer(rendererType);
- gEnv = renderer.getGraphicsEnvironment();
+ fontData = renderer.getFontData();
namespaces = new Namespaces();
eventsBuffer = new SyncedXmlEventsBuffer(namespaces);
eventReader = new XmlEventReader(eventsBuffer, namespaces);
xmlhandler = new FoXmlSerialHandler(eventsBuffer, parser, saxSource);
- foTree = new FOTree(eventReader);
+ foTree = new FOTree(eventReader, fontData);
fopThread = Thread.currentThread();
renderThread = new Thread(renderer, "Renderer");
@@ -432,20 +438,6 @@
*/
public Renderer getRenderer() {
return renderer;
- }
-
- /** The <code>GraphicsEnvironment</code> in which the renderer operates */
- private GraphicsEnvironment gEnv = null;
-
- /**
- * Returns the <code>GraphicsEnvironment</code> in which the renderer
- * performs graphical operations. This is originally provided by the
- * renderer after it is initialized by <code>Fop</code>.
- *
- * @return the operating environment of the renderer
- */
- public GraphicsEnvironment getGraphicsEnvironment() {
- return gEnv;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
