diff options
Diffstat (limited to 'src/java/org/apache/fop/apps/FopFactoryConfigurator.java')
-rw-r--r-- | src/java/org/apache/fop/apps/FopFactoryConfigurator.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/java/org/apache/fop/apps/FopFactoryConfigurator.java b/src/java/org/apache/fop/apps/FopFactoryConfigurator.java index ad0869ea1..161bd4a8f 100644 --- a/src/java/org/apache/fop/apps/FopFactoryConfigurator.java +++ b/src/java/org/apache/fop/apps/FopFactoryConfigurator.java @@ -33,6 +33,7 @@ import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.xmlgraphics.image.GraphicsConstants; import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry; import org.apache.xmlgraphics.image.loader.util.Penalty; @@ -61,10 +62,10 @@ public class FopFactoryConfigurator { public static final String DEFAULT_PAGE_HEIGHT = "11in"; /** Defines the default source resolution (72dpi) for FOP */ - public static final float DEFAULT_SOURCE_RESOLUTION = 72.0f; //dpi + public static final float DEFAULT_SOURCE_RESOLUTION = GraphicsConstants.DEFAULT_DPI; //dpi /** Defines the default target resolution (72dpi) for FOP */ - public static final float DEFAULT_TARGET_RESOLUTION = 72.0f; //dpi + public static final float DEFAULT_TARGET_RESOLUTION = GraphicsConstants.DEFAULT_DPI; //dpi private static final String PREFER_RENDERER = "prefer-renderer"; @@ -159,7 +160,7 @@ public class FopFactoryConfigurator { lang = hyphPatConfig[i].getAttribute("lang", null); if (lang == null) { - addError("The lang attribute of a hyphenation-pattern configuration" + addError("The lang attribute of a hyphenation-pattern configuration" + " element must exist (" + location + ")", error); } else if (!lang.matches("[a-zA-Z]{2}")) { addError("The lang attribute of a hyphenation-pattern configuration" @@ -191,7 +192,7 @@ public class FopFactoryConfigurator { LogUtil.handleError(log, error.toString(), strict); continue; } - + String llccKey = HyphenationTreeCache.constructLlccKey(lang, country); hyphPatNames.put(llccKey, filename); if (log.isDebugEnabled()) { @@ -270,7 +271,7 @@ public class FopFactoryConfigurator { } error.append(message); } - + private void configureImageLoading(Configuration parent, boolean strict) throws FOPException { if (parent == null) { return; |