diff options
Diffstat (limited to 'src/org/apache/fop/configuration/ConfigurationReader.java')
| -rw-r--r-- | src/org/apache/fop/configuration/ConfigurationReader.java | 101 |
1 files changed, 24 insertions, 77 deletions
diff --git a/src/org/apache/fop/configuration/ConfigurationReader.java b/src/org/apache/fop/configuration/ConfigurationReader.java index 7a22e40f6..1d92f3afb 100644 --- a/src/org/apache/fop/configuration/ConfigurationReader.java +++ b/src/org/apache/fop/configuration/ConfigurationReader.java @@ -1,52 +1,7 @@ -/* - - ============================================================================ - 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 - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - 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 - Software Foundation, please see <http://www.apache.org/>. - +/* $Id$ + * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. + * For details on use and redistribution please refer to the + * LICENSE file included with these sources. */ package org.apache.fop.configuration; @@ -59,6 +14,7 @@ import java.io.IOException; import org.xml.sax.InputSource; //fop +import org.apache.fop.apps.Driver; import org.apache.fop.messaging.MessageHandler; import org.apache.fop.apps.FOPException; import org.apache.fop.configuration.Configuration; @@ -77,7 +33,6 @@ import org.apache.fop.configuration.Configuration; * Once the configuration has been setup, the information can be accessed with * the methods of StandardConfiguration. */ - public class ConfigurationReader { /** show a full dump on error */ private static boolean errorDump = false; @@ -94,10 +49,9 @@ public class ConfigurationReader { this.filename = filename; } - /** - * intantiates parser and starts parsing of config file - */ + * intantiates parser and starts parsing of config file + */ public void start () throws FOPException { XMLReader parser = createParser(); @@ -106,7 +60,7 @@ public class ConfigurationReader { parser.setFeature("http://xml.org/sax/features/namespace-prefixes", false); } catch (SAXException e) { - throw new FOPException("You need a parser which supports SAX version 2",e); + throw new FOPException("You need a parser which supports SAX version 2",e); } ConfigurationParser configurationParser = new ConfigurationParser(); parser.setContentHandler(configurationParser); @@ -125,20 +79,14 @@ public class ConfigurationReader { } } - /** - * creates a SAX parser, using the value of org.xml.sax.parser - * defaulting to org.apache.xerces.parsers.SAXParser - * - * @return the created SAX parser - */ - public static XMLReader createParser() - throws FOPException - { - String parserClassName = System.getProperty("org.xml.sax.parser"); - if (parserClassName == null) { - parserClassName = "org.apache.xerces.parsers.SAXParser"; - } + * creates a SAX parser, using the value of org.xml.sax.parser + * defaulting to org.apache.xerces.parsers.SAXParser + * + * @return the created SAX parser + */ + public static XMLReader createParser() throws FOPException { + String parserClassName = Driver.getParserClassName(); if (errorDump) { MessageHandler.logln( "configuration reader using SAX parser " + parserClassName); @@ -148,14 +96,15 @@ public class ConfigurationReader { return (XMLReader) Class.forName( parserClassName).newInstance(); } catch (ClassNotFoundException e) { - throw new FOPException("Could not find " + parserClassName,e); + throw new FOPException("Could not find " + parserClassName, e); } catch (InstantiationException e) { throw new FOPException("Could not instantiate " + - parserClassName,e); + parserClassName, e); } catch (IllegalAccessException e) { - throw new FOPException("Could not access " + parserClassName,e); + throw new FOPException("Could not access " + + parserClassName, e); } catch (ClassCastException e) { throw new FOPException(parserClassName + " is not a SAX driver",e); @@ -163,8 +112,8 @@ public class ConfigurationReader { } /** - * Dumps an error - */ + * Dumps an error + */ public void dumpError(Exception e) { if (errorDump) { if (e instanceof SAXException) { @@ -177,14 +126,12 @@ public class ConfigurationReader { } } } - /** - * long or short error messages - * - */ + * long or short error messages + * + */ public void setDumpError(boolean dumpError) { errorDump = dumpError; } - } |