git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1357140 13f79535-47bb-0310-9956-ffa450edef68pull/26/head
@@ -25,7 +25,10 @@ import org.apache.fop.apps.io.ResourceResolver; | |||
import org.apache.fop.fonts.FontManager; | |||
/** | |||
* The environment profile represents the restrictions and allowances that FOP is | |||
* The environment profile represents the system in which FOP is invoked. Some of FOPs services rely | |||
* upon features within the system, as such, the client may want to restrict access to these | |||
* services. This object allows clients to control those restrictions by implementing the interfaces | |||
* that the environment profile holds. | |||
*/ | |||
public interface EnvironmentProfile { | |||
@@ -84,7 +84,10 @@ public final class EnvironmentalProfileFactory { | |||
throw new IllegalArgumentException("Default base URI must not be null"); | |||
} | |||
if (resourceResolver == null) { | |||
throw new IllegalArgumentException("URI Resolver must not be null"); | |||
throw new IllegalArgumentException("ResourceResolver must not be null"); | |||
} | |||
if (fontManager == null) { | |||
throw new IllegalArgumentException("The FontManager must not be null"); | |||
} | |||
this.defaultBaseURI = defaultBaseURI; | |||
this.resourceResolver = resourceResolver; |
@@ -786,13 +786,14 @@ public class FOUserAgent { | |||
return factory.getImageHandlerRegistry(); | |||
} | |||
/** TODO: javadoc*/ | |||
/** @return the color space cache */ | |||
public ColorSpaceCache getColorSpaceCache() { | |||
return factory.getColorSpaceCache(); | |||
} | |||
public Map<String, String> getHyphPatNames() { | |||
return factory.getHyphPatNames(); | |||
/** @see {@link FopFactory#getHyphenationPatternNames()} */ | |||
public Map<String, String> getHyphenationPatternNames() { | |||
return factory.getHyphenationPatternNames(); | |||
} | |||
} | |||
@@ -341,9 +341,9 @@ public final class FopFactory implements ImageContext { | |||
return config.getLayoutManagerMakerOverride(); | |||
} | |||
public Map<String, String> getHyphPatNames() { | |||
return config.getHyphPatNames(); | |||
/** @return the hyphenation pattern names */ | |||
public Map<String, String> getHyphenationPatternNames() { | |||
return config.getHyphenationPatternNames(); | |||
} | |||
/** |
@@ -452,7 +452,7 @@ public final class FopFactoryBuilder { | |||
return isComplexScript; | |||
} | |||
public Map<String, String> getHyphPatNames() { | |||
public Map<String, String> getHyphenationPatternNames() { | |||
return hyphPatNames; | |||
} | |||
} |
@@ -126,5 +126,6 @@ public interface FopFactoryConfig { | |||
boolean isComplexScriptFeaturesEnabled(); | |||
Map<String, String> getHyphPatNames(); | |||
/** @see {@link FopFactory#getHyphenationPatternNames()} */ | |||
Map<String, String> getHyphenationPatternNames(); | |||
} |
@@ -1399,7 +1399,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager | |||
Hyphenation hyph = Hyphenator.hyphenate(hyphenationProperties.language.getString(), | |||
hyphenationProperties.country.getString(), | |||
getFObj().getUserAgent().getResourceResolver(), | |||
getFObj().getUserAgent().getHyphPatNames(), | |||
getFObj().getUserAgent().getHyphenationPatternNames(), | |||
sbChars.toString(), | |||
hyphenationProperties.hyphenationRemainCharacterCount.getValue(), | |||
hyphenationProperties.hyphenationPushCharacterCount.getValue()); |
@@ -275,9 +275,8 @@ public class FOTreeTestCase { | |||
return delegate.isComplexScriptFeaturesEnabled(); | |||
} | |||
public Map<String, String> getHyphPatNames() { | |||
return delegate.getHyphPatNames(); | |||
public Map<String, String> getHyphenationPatternNames() { | |||
return delegate.getHyphenationPatternNames(); | |||
} | |||
} | |||
} |