diff options
| author | Simon Pepping <spepping@apache.org> | 2010-10-02 11:38:37 +0000 |
|---|---|---|
| committer | Simon Pepping <spepping@apache.org> | 2010-10-02 11:38:37 +0000 |
| commit | 3f407e611f060716f098a6136514ddbef2a2ca5a (patch) | |
| tree | 1f3357fda8558e2e920fdfcce03abc963161c046 /src/java/org/apache/fop/apps | |
| parent | 6d4f48908482cc16e20f90cfb239433517dd2def (diff) | |
| download | xmlgraphics-fop-3f407e611f060716f098a6136514ddbef2a2ca5a.tar.gz xmlgraphics-fop-3f407e611f060716f098a6136514ddbef2a2ca5a.zip | |
Make handling of configuration errors consistent
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1003775 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/apps')
| -rw-r--r-- | src/java/org/apache/fop/apps/FopFactoryConfigurator.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/java/org/apache/fop/apps/FopFactoryConfigurator.java b/src/java/org/apache/fop/apps/FopFactoryConfigurator.java index 093b8fb53..3ccd8c518 100644 --- a/src/java/org/apache/fop/apps/FopFactoryConfigurator.java +++ b/src/java/org/apache/fop/apps/FopFactoryConfigurator.java @@ -93,19 +93,6 @@ public class FopFactoryConfigurator { * @throws FOPException fop exception */ public void configure(FopFactory factory) throws FOPException { - if (log.isDebugEnabled()) { - log.debug("Initializing FopFactory Configuration"); - } - - if (cfg.getChild("accessibility", false) != null) { - try { - this.factory.setAccessibility( - cfg.getChild("accessibility").getValueAsBoolean()); - } catch (ConfigurationException e) { - throw new FOPException(e); - } - } - // strict configuration if (cfg.getChild("strict-configuration", false) != null) { try { @@ -116,6 +103,19 @@ public class FopFactoryConfigurator { } } boolean strict = factory.validateUserConfigStrictly(); + if (log.isDebugEnabled()) { + log.debug("Initializing FopFactory Configuration" + + "with " + (strict?"strict":"permissive") + " validation"); + } + + if (cfg.getChild("accessibility", false) != null) { + try { + this.factory.setAccessibility( + cfg.getChild("accessibility").getValueAsBoolean()); + } catch (ConfigurationException e) { + LogUtil.handleException(log, e, strict); + } + } // strict fo validation if (cfg.getChild("strict-validation", false) != null) { |