1 files changed, 267 insertions, 258 deletions
diff --git a/src/org/apache/fop/apps/Driver.java b/src/org/apache/fop/apps/Driver.java
index ff2ad79bc..46b922970 100644
--- a/src/org/apache/fop/apps/Driver.java
+++ b/src/org/apache/fop/apps/Driver.java
@@ -1,36 +1,36 @@
-/*-- $Id$ -- 
+/*-- $Id$ --
 
  ============================================================================
                    The Apache Software License, Version 1.1
  ============================================================================
- 
+
     Copyright (C) 1999 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
     apache@apache.org.
- 
+
  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
@@ -41,12 +41,12 @@
  ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  (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 <jtauber@jtauber.com>. For more  information on the Apache 
+ James Tauber <jtauber@jtauber.com>. For more  information on the Apache
  Software Foundation, please see <http://www.apache.org/>.
- 
+
  */
 
 package org.apache.fop.apps;
@@ -131,307 +131,316 @@ public class Driver {
 
     /** If true, full error stacks are reported */
     protected boolean errorDump;
-    
+
     /** create a new Driver */
     public Driver() {
-	this.treeBuilder = new FOTreeBuilder();
+        this.treeBuilder = new FOTreeBuilder();
     }
-   
+
     /** Set the error dump option
-     * @param dump if true, full stacks will be reported to the error log 
-     */
-    public void setErrorDump(boolean dump) 
-    {
-	errorDump = dump;
+      * @param dump if true, full stacks will be reported to the error log
+      */
+    public void setErrorDump(boolean dump) {
+        errorDump = dump;
     }
-    
+
     /** set the Renderer to use */
     public void setRenderer(Renderer renderer) {
-	this.renderer = renderer;
+        this.renderer = renderer;
     }
 
     /**
-     * set the class name of the Renderer to use as well as the
-     * producer string for those renderers that can make use of it
-     */
+      * set the class name of the Renderer to use as well as the
+      * producer string for those renderers that can make use of it
+      */
     public void setRenderer(String rendererClassName, String producer) {
-	this.renderer = createRenderer(rendererClassName);
-	this.renderer.setProducer(producer);
+        this.renderer = createRenderer(rendererClassName);
+        this.renderer.setProducer(producer);
     }
 
     /**
-     * protected method used by setRenderer(String, String) to
-     * instantiate the Renderer class
-     */
+      * protected method used by setRenderer(String, String) to
+      * instantiate the Renderer class
+      */
     protected Renderer createRenderer(String rendererClassName) {
-    MessageHandler.logln("using renderer " + rendererClassName);
-
-	try {
-	    return (Renderer)
-		Class.forName(rendererClassName).newInstance();
-	} catch (ClassNotFoundException e) {
-	    MessageHandler.errorln("Could not find " + rendererClassName);
-	} catch (InstantiationException e) {
-	    MessageHandler.errorln("Could not instantiate "
-			       + rendererClassName);
-	} catch (IllegalAccessException e) {
-	    MessageHandler.errorln("Could not access " + rendererClassName);
-	} catch (ClassCastException e) {
-	    MessageHandler.errorln(rendererClassName + " is not a renderer"); 
-	}
-	return null;
+        MessageHandler.logln("using renderer " + rendererClassName);
+
+        try {
+            return (Renderer) Class.forName(
+                     rendererClassName).newInstance();
+        } catch (ClassNotFoundException e) {
+            MessageHandler.errorln("Could not find " + rendererClassName);
+        }
+        catch (InstantiationException e) {
+            MessageHandler.errorln("Could not instantiate " +
+                                   rendererClassName);
+        }
+        catch (IllegalAccessException e) {
+            MessageHandler.errorln("Could not access " + rendererClassName);
+        }
+        catch (ClassCastException e) {
+            MessageHandler.errorln(rendererClassName + " is not a renderer");
+        }
+        return null;
     }
-    
+
     /**
-     * add the given element mapping.
-     *
-     * an element mapping maps element names to Java classes
-     */
+      * add the given element mapping.
+      *
+      * an element mapping maps element names to Java classes
+      */
     public void addElementMapping(ElementMapping mapping) {
-	mapping.addToBuilder(this.treeBuilder);
+        mapping.addToBuilder(this.treeBuilder);
     }
-    
+
     /**
-     * add the element mapping with the given class name
-     */
+      * add the element mapping with the given class name
+      */
     public void addElementMapping(String mappingClassName) {
-	createElementMapping(mappingClassName).addToBuilder(this.treeBuilder);
+        createElementMapping(mappingClassName).addToBuilder(
+          this.treeBuilder);
     }
 
     /**
-     * protected method used by addElementMapping(String) to
-     * instantiate element mapping class
-     */
-    protected ElementMapping createElementMapping(String mappingClassName) {
-    MessageHandler.logln("using element mapping " + mappingClassName);
-
-	try {
-	    return (ElementMapping)
-		Class.forName(mappingClassName).newInstance();
-	} catch (ClassNotFoundException e) {
-	    MessageHandler.errorln("Could not find " + mappingClassName);
-	    dumpError(e);
-	} catch (InstantiationException e) {
-	    MessageHandler.errorln("Could not instantiate "
-			       + mappingClassName);
-	    dumpError(e);
-	} catch (IllegalAccessException e) {
-	    MessageHandler.errorln("Could not access " + mappingClassName);
-	    dumpError(e);
-	} catch (ClassCastException e) {
-	    MessageHandler.errorln(mappingClassName + " is not an element mapping"); 
-	    dumpError(e);
-	}
-	return null;
+      * protected method used by addElementMapping(String) to
+      * instantiate element mapping class
+      */
+    protected ElementMapping createElementMapping(
+      String mappingClassName) {
+        MessageHandler.logln("using element mapping " + mappingClassName);
+
+        try {
+            return (ElementMapping) Class.forName(
+                     mappingClassName).newInstance();
+        } catch (ClassNotFoundException e) {
+            MessageHandler.errorln("Could not find " + mappingClassName);
+            dumpError(e);
+        }
+        catch (InstantiationException e) {
+            MessageHandler.errorln("Could not instantiate " +
+                                   mappingClassName);
+            dumpError(e);
+        }
+        catch (IllegalAccessException e) {
+            MessageHandler.errorln("Could not access " + mappingClassName);
+            dumpError(e);
+        }
+        catch (ClassCastException e) {
+            MessageHandler.errorln(mappingClassName + " is not an element mapping");
+            dumpError(e);
+        }
+        return null;
     }
 
     /**
-     * add the element mapping with the given class name
-     */
+      * add the element mapping with the given class name
+      */
     public void addPropertyList(String listClassName) {
-	createPropertyList(listClassName).addToBuilder(this.treeBuilder);
+        createPropertyList(listClassName).addToBuilder(this.treeBuilder);
     }
 
     /**
-     * protected method used by addPropertyList(String) to
-     * instantiate list mapping class
-     */
-    protected PropertyListMapping createPropertyList(String listClassName) {
-    MessageHandler.logln("using property list mapping " + listClassName);
-
-	try {
-	    return (PropertyListMapping)
-		Class.forName(listClassName).newInstance();
-	} catch (ClassNotFoundException e) {
-	    MessageHandler.errorln("Could not find " + listClassName);
-	    dumpError(e);
-	} catch (InstantiationException e) {
-	    MessageHandler.errorln("Could not instantiate "
-			       + listClassName);
-	    dumpError(e);
-	} catch (IllegalAccessException e) {
-	    MessageHandler.errorln("Could not access " + listClassName);
-	    dumpError(e);
-	} catch (ClassCastException e) {
-	    MessageHandler.errorln(listClassName + " is not an property list"); 
-	    dumpError(e);
-	}
-	return null;
+      * protected method used by addPropertyList(String) to
+      * instantiate list mapping class
+      */
+    protected PropertyListMapping createPropertyList(
+      String listClassName) {
+        MessageHandler.logln("using property list mapping " +
+                             listClassName);
+
+        try {
+            return (PropertyListMapping) Class.forName(
+                     listClassName).newInstance();
+        } catch (ClassNotFoundException e) {
+            MessageHandler.errorln("Could not find " + listClassName);
+            dumpError(e);
+        }
+        catch (InstantiationException e) {
+            MessageHandler.errorln("Could not instantiate " +
+                                   listClassName);
+            dumpError(e);
+        }
+        catch (IllegalAccessException e) {
+            MessageHandler.errorln("Could not access " + listClassName);
+            dumpError(e);
+        }
+        catch (ClassCastException e) {
+            MessageHandler.errorln(listClassName + " is not an property list");
+            dumpError(e);
+        }
+        return null;
     }
 
     /**
-     * return the tree builder (a SAX DocumentHandler).
-     *
-     * used in situations where SAX is used but not via a FOP-invoked
-     * SAX parser. A good example is an XSLT engine that fires SAX
-     * events but isn't a SAX Parser itself.
-     */
+      * return the tree builder (a SAX DocumentHandler).
+      *
+      * used in situations where SAX is used but not via a FOP-invoked
+      * SAX parser. A good example is an XSLT engine that fires SAX
+      * events but isn't a SAX Parser itself.
+      */
     public ContentHandler getContentHandler() {
-	return this.treeBuilder;
+        return this.treeBuilder;
     }
 
     /**
-     * build the formatting object tree using the given SAX Parser and
-     * SAX InputSource
-     */
-    public void buildFOTree(XMLReader parser, InputSource source)
-		throws FOPException {
-
-	parser.setContentHandler(this.treeBuilder);
-	try {
-	    parser.parse(source);
-	} catch (SAXException e) {
-	    if (e.getException() instanceof FOPException) {
-		dumpError(e.getException());
-		throw (FOPException) e.getException();
-	    }
-	    else {
-		dumpError(e);
-		throw new FOPException(e.getMessage());
-	    }
-	} catch (IOException e) {
-	    dumpError(e);
-	    throw new FOPException(e.getMessage());
-	}
+      * build the formatting object tree using the given SAX Parser and
+      * SAX InputSource
+      */
+    public void buildFOTree(XMLReader parser,
+                            InputSource source) throws FOPException {
+
+        parser.setContentHandler(this.treeBuilder);
+        try {
+            parser.parse(source);
+        } catch (SAXException e) {
+            if (e.getException() instanceof FOPException) {
+                dumpError(e.getException());
+                throw (FOPException) e.getException();
+            } else {
+                dumpError(e);
+                throw new FOPException(e.getMessage());
+            }
+        }
+        catch (IOException e) {
+            dumpError(e);
+            throw new FOPException(e.getMessage());
+        }
     }
 
     /**
-     * build the formatting object tree using the given DOM Document
-     */
-    public void buildFOTree(Document document) 
-	throws FOPException {
-
-	/* most of this code is modified from John Cowan's */
-
-	Node currentNode;
-	AttributesImpl currentAtts;
-	
-	/* temporary array for making Strings into character arrays */
-	char[] array = null;
-
-	currentAtts = new AttributesImpl();
-	
-	/* start at the document element */
-	currentNode = document;
-
-	try {
-	    while (currentNode != null) {
-		switch (currentNode.getNodeType()) {
-		case Node.DOCUMENT_NODE:
-		    this.treeBuilder.startDocument();
-		    break;
-		case Node.CDATA_SECTION_NODE:
-		case Node.TEXT_NODE:
-		    String data = currentNode.getNodeValue();
-		    int datalen = data.length();
-		    if (array == null || array.length < datalen) {
-			/* if the array isn't big enough, make a new
-			   one */
-			array = new char[datalen];
-		    }
-		    data.getChars(0, datalen, array, 0);
-		    this.treeBuilder.characters(array, 0, datalen);
-		    break;
-		case Node.PROCESSING_INSTRUCTION_NODE:
-		    this.treeBuilder.processingInstruction(
-	  	        currentNode.getNodeName(),
-			currentNode.getNodeValue());
-		    break;
-		case Node.ELEMENT_NODE:
-		    NamedNodeMap map = currentNode.getAttributes();
-		    currentAtts.clear();
-		    for (int i = map.getLength() - 1; i >= 0; i--) {
-			Attr att = (Attr)map.item(i);
-			currentAtts.addAttribute(att.getNamespaceURI(),
-                         att.getLocalName(),
-                         att.getName(),
-                         "CDATA",
-                         att.getValue());
-		    }
-		    this.treeBuilder.startElement(
-			currentNode.getNamespaceURI(), currentNode.getLocalName(), currentNode.getNodeName(), currentAtts);
-		    break;
-		}
-		
-		Node nextNode = currentNode.getFirstChild();
-		if (nextNode != null) {
-		    currentNode = nextNode;
-		    continue;
-		}
-		
-		while (currentNode != null) {
-		    switch (currentNode.getNodeType()) {
-		    case Node.DOCUMENT_NODE:
-			this.treeBuilder.endDocument();
-			break;
-		    case Node.ELEMENT_NODE:
-			this.treeBuilder.endElement(
-			    currentNode.getNamespaceURI(), currentNode.getLocalName(), currentNode.getNodeName());
-			break;
-		    }
-		    
-		    nextNode = currentNode.getNextSibling();
-		    if (nextNode != null) {
-			currentNode = nextNode;
-			break;
-		    }
-		    
-		    currentNode = currentNode.getParentNode();
-		}
-	    }
-	} catch (SAXException e) {
-	    dumpError(e);
-	    throw new FOPException(e.getMessage());
-	}
+      * build the formatting object tree using the given DOM Document
+      */
+    public void buildFOTree(Document document) throws FOPException {
+
+        /* most of this code is modified from John Cowan's */
+
+        Node currentNode;
+        AttributesImpl currentAtts;
+
+        /* temporary array for making Strings into character arrays */
+        char[] array = null;
+
+        currentAtts = new AttributesImpl();
+
+        /* start at the document element */
+        currentNode = document;
+
+        try {
+            while (currentNode != null) {
+                switch (currentNode.getNodeType()) {
+                    case Node.DOCUMENT_NODE:
+                        this.treeBuilder.startDocument();
+                        break;
+                    case Node.CDATA_SECTION_NODE:
+                    case Node.TEXT_NODE:
+                        String data = currentNode.getNodeValue();
+                        int datalen = data.length();
+                        if (array == null || array.length < datalen) {
+                            /* if the array isn't big enough, make a new
+                                one */
+                            array = new char[datalen];
+                        }
+                        data.getChars(0, datalen, array, 0);
+                        this.treeBuilder.characters(array, 0, datalen);
+                        break;
+                    case Node.PROCESSING_INSTRUCTION_NODE:
+                        this.treeBuilder.processingInstruction(
+                          currentNode.getNodeName(),
+                          currentNode.getNodeValue());
+                        break;
+                    case Node.ELEMENT_NODE:
+                        NamedNodeMap map = currentNode.getAttributes();
+                        currentAtts.clear();
+                        for (int i = map.getLength() - 1; i >= 0; i--) {
+                            Attr att = (Attr) map.item(i);
+                            currentAtts.addAttribute( att.getNamespaceURI(),
+                                                      att.getLocalName(), att.getName(),
+                                                      "CDATA", att.getValue());
+                        }
+                        this.treeBuilder.startElement(
+                          currentNode.getNamespaceURI(),
+                          currentNode.getLocalName(),
+                          currentNode.getNodeName(), currentAtts);
+                        break;
+                }
+
+                Node nextNode = currentNode.getFirstChild();
+                if (nextNode != null) {
+                    currentNode = nextNode;
+                    continue;
+                }
+
+                while (currentNode != null) {
+                    switch (currentNode.getNodeType()) {
+                        case Node.DOCUMENT_NODE:
+                            this.treeBuilder.endDocument();
+                            break;
+                        case Node.ELEMENT_NODE:
+                            this.treeBuilder.endElement(
+                              currentNode.getNamespaceURI(),
+                              currentNode.getLocalName(),
+                              currentNode.getNodeName());
+                            break;
+                    }
+
+                    nextNode = currentNode.getNextSibling();
+                    if (nextNode != null) {
+                        currentNode = nextNode;
+                        break;
+                    }
+
+                    currentNode = currentNode.getParentNode();
+                }
+            }
+        } catch (SAXException e) {
+            dumpError(e);
+            throw new FOPException(e.getMessage());
+        }
     }
 
     /**
-     * Dumps an error
-     */
-    public void dumpError(Exception e) 
-    {
-	if (errorDump) {
-	    if (e instanceof SAXException) {
-		e.printStackTrace();
-		if (((SAXException)e).getException() != null) {
-		    ((SAXException)e).getException().printStackTrace();
-		}
-	    }
-	    else {
-		e.printStackTrace();
-	    }
-	}
-		
+      * Dumps an error
+      */
+    public void dumpError(Exception e) {
+        if (errorDump) {
+            if (e instanceof SAXException) {
+                e.printStackTrace();
+                if (((SAXException) e).getException() != null) {
+                    ((SAXException) e).getException().printStackTrace();
+                }
+            } else {
+                e.printStackTrace();
+            }
+        }
+
     }
-    
+
 
     /**
-     * set the PrintWriter to use to output the result of the Renderer
-     * (if applicable)
-     */
+      * set the PrintWriter to use to output the result of the Renderer
+      * (if applicable)
+      */
     public void setWriter(PrintWriter writer) {
-	this.writer = writer;
+        this.writer = writer;
     }
 
     /**
-     * format the formatting object tree into an area tree
-     */
-    public void format()
-	throws FOPException {
-	FontInfo fontInfo = new FontInfo();
-	this.renderer.setupFontInfo(fontInfo);
+      * format the formatting object tree into an area tree
+      */
+    public void format() throws FOPException {
+        FontInfo fontInfo = new FontInfo();
+        this.renderer.setupFontInfo(fontInfo);
 
-	this.areaTree = new AreaTree();
-	this.areaTree.setFontInfo(fontInfo);
+        this.areaTree = new AreaTree();
+        this.areaTree.setFontInfo(fontInfo);
 
-	this.treeBuilder.format(areaTree);
+        this.treeBuilder.format(areaTree);
     }
 
     /**
-     * render the area tree to the output form
-     */
-    public void render()
-	throws IOException, FOPException {
-	this.renderer.render(areaTree, this.writer);
+      * render the area tree to the output form
+      */
+    public void render() throws IOException, FOPException {
+        this.renderer.render(areaTree, this.writer);
     }
 }