vmote       2003/08/15 11:53:18

  Modified:    src/java/org/apache/fop/apps Fop.java
  Log:
  add back test to make sure a renderer is present, which is needed for 
StructureRenderers
  
  Revision  Changes    Path
  1.6       +17 -15    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Fop.java  12 Aug 2003 22:40:49 -0000      1.5
  +++ Fop.java  15 Aug 2003 18:53:18 -0000      1.6
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    The Apache Software License, Version 1.1
    * ============================================================================
  - * 
  + *
    * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without modifica-
    * tion, are permitted provided that the following conditions are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright notice,
    *    this list of conditions and the following disclaimer.
  - * 
  + *
    * 2. Redistributions in binary form must reproduce the above copyright notice,
    *    this list of conditions and the following disclaimer in the documentation
    *    and/or other materials provided with the distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution, if any, must
    *    include the following acknowledgment: "This product includes software
    *    developed by the Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself, if
    *    and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "FOP" and "Apache Software Foundation" must not be used to
    *    endorse or promote products derived from this software without prior
    *    written permission. For written permission, please contact
    *    [EMAIL PROTECTED]
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache", nor may
    *    "Apache" appear in their name, without prior written permission of the
    *    Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,12 +42,12 @@
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    * ============================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many individuals
    * on behalf of the Apache Software Foundation and was originally created by
    * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.apps;
   
   // Java
  @@ -86,17 +86,19 @@
               try {
                   if (options.getOutputMode() == CommandLineOptions.AWT_OUTPUT) {
                       driver.setRenderer(new AWTRenderer(inputHandler));
  -                } else { 
  +                } else {
                       driver.setRenderer(options.getRenderer());
  -    
  +
                       if (options.getOutputFile() != null) {
                           bos = new BufferedOutputStream(new FileOutputStream(
                               options.getOutputFile()));
                           driver.setOutputStream(bos);
                       }
                   }
  -        
  -                driver.getRenderer().setOptions(options.getRendererOptions());
  +
  +                if (driver.getRenderer() != null) {
  +                    driver.getRenderer().setOptions(options.getRendererOptions());
  +                }
                   driver.render(inputHandler);
               } finally {
                   if (bos != null) {
  @@ -121,7 +123,7 @@
               } else {
                   System.err.println("Turn on debugging for more information");
               }
  -        } 
  +        }
       }
   }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to