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 09:54:44 UTC
svn commit: r1357140 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/apps/ src/java/org/apache/fop/layoutmgr/inline/
test/java/org/apache/fop/fotreetest/
Author: mehdi
Date: Wed Jul 4 07:54:43 2012
New Revision: 1357140
URL: http://svn.apache.org/viewvc?rev=1357140&view=rev
Log:
Addressed some of the comments made by VH re:Temp_URI_Unification merge
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java Wed Jul 4 07:54:43 2012
@@ -25,7 +25,10 @@ import org.apache.fop.apps.io.ResourceRe
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 {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java Wed Jul 4 07:54:43 2012
@@ -84,7 +84,10 @@ public final class EnvironmentalProfileF
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java Wed Jul 4 07:54:43 2012
@@ -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();
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java Wed Jul 4 07:54:43 2012
@@ -341,9 +341,9 @@ public final class FopFactory implements
return config.getLayoutManagerMakerOverride();
}
-
- public Map<String, String> getHyphPatNames() {
- return config.getHyphPatNames();
+ /** @return the hyphenation pattern names */
+ public Map<String, String> getHyphenationPatternNames() {
+ return config.getHyphenationPatternNames();
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java Wed Jul 4 07:54:43 2012
@@ -452,7 +452,7 @@ public final class FopFactoryBuilder {
return isComplexScript;
}
- public Map<String, String> getHyphPatNames() {
+ public Map<String, String> getHyphenationPatternNames() {
return hyphPatNames;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java Wed Jul 4 07:54:43 2012
@@ -126,5 +126,6 @@ public interface FopFactoryConfig {
boolean isComplexScriptFeaturesEnabled();
- Map<String, String> getHyphPatNames();
+ /** @see {@link FopFactory#getHyphenationPatternNames()} */
+ Map<String, String> getHyphenationPatternNames();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Wed Jul 4 07:54:43 2012
@@ -1399,7 +1399,7 @@ public class LineLayoutManager extends I
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());
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java?rev=1357140&r1=1357139&r2=1357140&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java Wed Jul 4 07:54:43 2012
@@ -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();
}
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org