pbwest 2004/03/15 22:49:03
Modified: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Synchronized changes to base URL handling from HEAD.
Mods to the way options are set in Renderer.
Revision Changes Path
No revision
No revision
1.1.2.15 +21 -4 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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Fop.java 14 Mar 2004 11:18:47 -0000 1.1.2.14
+++ Fop.java 16 Mar 2004 06:49:03 -0000 1.1.2.15
@@ -308,7 +308,22 @@
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
+ */
+ public void setUserAgent(FOUserAgent agent) {
+ userAgent = agent;
+ }
+
protected FOUserAgent getUserAgent() {
+ if (userAgent == null) {
+ userAgent = new FOUserAgent();
+ userAgent.enableLogging(logger);
+ userAgent.setBaseURL("");
+ }
return userAgent;
}
@@ -369,14 +384,15 @@
/**
* Set the Renderer to use.
- * @param renderer the renderer instance to use (Note: Logger must be set at
this point)
+ * @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.setOption("producer", Version.getVersion());
renderer.setUserAgent(getUserAgent());
this.renderer = renderer;
}
@@ -401,7 +417,7 @@
throws IllegalArgumentException {
try {
renderer = (Renderer)Class.forName(rendererClassName).newInstance();
- renderer.setProducer(Version.getVersion());
+ renderer.setOption("producer", Version.getVersion());
renderer.setUserAgent(getUserAgent());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Could not find "
@@ -433,6 +449,7 @@
*/
public synchronized void render(InputHandler inputHandler)
throws FOPException {
+ //userAgent.setBaseURL(inputHandler.getBaseURL());
throw new FOPException("Attempting to run null 'render' method");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
