Deprecated (since mid-2001) setRenderer(rendererClassName, version) method removed.

Fix to Bug 22561:  Driver.run() incorrectly setting output type to PDF for the structure (MIF and RTF) types.
Submitted by: Michael Cosby (michael at cosby dot dhs dot org).

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196813 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java
index 6345b7fbe3cec886964bf58e8717896e49bedead..da23b989a31a5f67fa1d8c97d3f62ec74189fa65 100644 (file)
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -140,6 +140,11 @@ import java.io.OutputStream;
  */
 public class Driver implements LogEnabled, FOTreeListener {
 
+    /**
+     * private constant to indicate renderer was not defined.
+     */
+    private static final int NOT_SET = 0;
+
     /**
      * Render to PDF. OutputStream must be set
      */
@@ -198,7 +203,7 @@ public class Driver implements LogEnabled, FOTreeListener {
     /**
      * the renderer type code given by setRenderer
      */
-    private int rendererType;
+    private int rendererType = NOT_SET;
 
     /**
      * the renderer to use to output the area tree
@@ -435,7 +440,8 @@ public class Driver implements LogEnabled, FOTreeListener {
             //foInputHandler will be set later
             break;
         default:
-            throw new IllegalArgumentException("Unknown renderer type");
+            rendererType = NOT_SET;
+            throw new IllegalArgumentException("Unknown renderer type " + renderer);
         }
     }
 
@@ -461,20 +467,6 @@ public class Driver implements LogEnabled, FOTreeListener {
         return renderer;
     }
 
-    /**
-     * Sets the renderer.
-     * @param rendererClassName the fully qualified classname of the renderer
-     * class to use.
-     * @param version version number
-     * @deprecated use renderer.setProducer(version) + setRenderer(renderer) or
-     * just setRenderer(rendererType) which will use the default producer string.
-     * @see #setRenderer(int)
-     * @see #setRenderer(Renderer)
-     */
-    public void setRenderer(String rendererClassName, String version) {
-        setRenderer(rendererClassName);
-    }
-
     /**
      * Set the class name of the Renderer to use as well as the
      * producer string for those renderers that can make use of it.
@@ -668,8 +660,10 @@ public class Driver implements LogEnabled, FOTreeListener {
         if (!isInitialized()) {
             initialize();
         }
-        if (renderer == null) {
-            setRenderer(RENDER_PDF);
+
+        if (renderer == null && rendererType != RENDER_RTF 
+            && rendererType != RENDER_MIF) {
+                setRenderer(RENDER_PDF);
         }
 
         if (source == null) {