You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by me...@apache.org on 2012/07/04 17:27:21 UTC
svn commit: r1357307 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop:
apps/FopConfParser.java cli/CommandLineOptions.java
Author: mehdi
Date: Wed Jul 4 15:27:21 2012
New Revision: 1357307
URL: http://svn.apache.org/viewvc?rev=1357307&view=rev
Log:
Fixed regression re:strict-validation parameter in fop.xconf
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java?rev=1357307&r1=1357306&r2=1357307&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java Wed Jul 4 15:27:21 2012
@@ -142,12 +142,20 @@ public class FopConfParser {
log.debug("Initializing FopFactory Configuration");
}
- // TODO: This makes this variable both strict FO and user-config validation, is that right?
- boolean strict = false;
// strict fo validation
if (cfg.getChild("strict-validation", false) != null) {
try {
- strict = cfg.getChild("strict-validation").getValueAsBoolean();
+ boolean strict = cfg.getChild("strict-validation").getValueAsBoolean();
+ fopFactoryBuilder.setStrictFOValidation(strict);
+ } catch (ConfigurationException e) {
+ LogUtil.handleException(log, e, false);
+ }
+ }
+
+ boolean strict = false;
+ if (cfg.getChild("strict-configuration", false) != null) {
+ try {
+ strict = cfg.getChild("strict-configuration").getValueAsBoolean();
fopFactoryBuilder.setStrictUserConfigValidation(strict);
} catch (ConfigurationException e) {
LogUtil.handleException(log, e, false);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1357307&r1=1357306&r2=1357307&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java Wed Jul 4 15:27:21 2012
@@ -1031,14 +1031,15 @@ public class CommandLineOptions {
FopFactoryBuilder fopFactoryBuilder;
if (userConfigFile == null) {
fopFactoryBuilder = new FopFactoryBuilder(new File(".").toURI());
+ fopFactoryBuilder.setStrictFOValidation(strictValidation);
+ fopFactoryBuilder.setTargetResolution(targetResolution);
+ fopFactoryBuilder.setComplexScriptFeatures(useComplexScriptFeatures);
} else {
try {
fopFactoryBuilder = new FopConfParser(userConfigFile).getFopFactoryBuilder();
} catch (SAXException e) {
throw new FOPException(e);
}
- fopFactoryBuilder.setStrictFOValidation(strictValidation);
- fopFactoryBuilder.setComplexScriptFeatures(useComplexScriptFeatures);
}
factory = fopFactoryBuilder.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org