You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2004/04/15 09:02:18 UTC
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/04/15 00:02:18
Modified: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Added AWT specific rendering details:
Renderer provides a GraphicsEnvironment for use in layout
Added getGraphicsEnvironment
Added renderer initialisation for AWT
Set default logging level to INFO (java.util.logging)
Removed redundant setInputHandler method
Revision Changes Path
No revision
No revision
1.1.2.16 +15 -14 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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- Fop.java 16 Mar 2004 06:49:03 -0000 1.1.2.15
+++ Fop.java 15 Apr 2004 07:02:18 -0000 1.1.2.16
@@ -21,6 +21,7 @@
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;
@@ -82,6 +83,7 @@
private XmlEventReader eventReader;
private FOTree foTree;
private AreaTree areaTree = new AreaTree();
+ private GraphicsEnvironment gEnv = null;
private Thread driverThread;
private Thread parserThread;
@@ -190,8 +192,8 @@
logger = Logger.getLogger(fopPackage);
logger.setLevel(Level.CONFIG);
logger.config(version);
- // Then restrict to WARNING
- logger.setLevel(Level.WARNING);
+ // Then restrict to INFO
+ logger.setLevel(Level.INFO);
}
private void setupRunStats() {
@@ -256,12 +258,15 @@
throw new FOPException(e2);
}
}
- setInputHandler(options.getInputHandler());
+ inputHandler = options.getInputHandler();
parser = inputHandler.getParser();
saxSource = inputHandler.getInputSource();
// Setting of namespace-prefixes feature no longer required
//setParserFeatures(parser);
+ rendererType = options.getRenderer();
+ setRenderer(rendererType);
+ gEnv = renderer.getGraphicsEnvironment();
namespaces = new Namespaces();
eventsBuffer = new SyncedXmlEventsBuffer(namespaces);
eventReader = new XmlEventReader(eventsBuffer, namespaces);
@@ -301,15 +306,6 @@
}
/**
- * Sets the InputHandler for XML imput as specified in FOPOptions.
- * @param inputHandler the InputHandler
- */
- public void setInputHandler(InputHandler inputHandler) {
- this.inputHandler = inputHandler;
- }
-
-
- /**
* Optionally sets the FOUserAgent instance for FOP to use. The Driver
* class sets up its own FOUserAgent if none is set through this method.
* @param agent FOUserAgent to use
@@ -351,7 +347,8 @@
// setRenderer("org.apache.fop.render.pdf.PDFRenderer");
// break;
case RENDER_AWT:
- throw new IllegalArgumentException("Use renderer form of setRenderer() for AWT");
+ setRenderer("org.apache.fop.render.awt.AWTRenderer");
+ break;
// case RENDER_PRINT:
// setRenderer("org.apache.fop.render.awt.AWTPrintRenderer");
// break;
@@ -403,6 +400,10 @@
*/
public Renderer getRenderer() {
return renderer;
+ }
+
+ public GraphicsEnvironment getGraphicsEnvironment() {
+ return gEnv;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org