Addressed some of the comments made by VH re:Temp_URI_Unification merge

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1357140 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/apps/EnvironmentProfile.java b/src/java/org/apache/fop/apps/EnvironmentProfile.java
index c35219353a61fcb1843d8964d1f9032f721fd3fa..c964120e35a3eb9b4ced1b99bb8fe2fc05ca337c 100644 (file)
--- a/src/java/org/apache/fop/apps/EnvironmentProfile.java
+++ b/src/java/org/apache/fop/apps/EnvironmentProfile.java
@@ -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 {
 

diff --git a/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java b/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
index 374074b8a41413bba20c6286272b5631b20173a2..9ba7632d248c6fc8a2bff99bcfdc404e018ee9e1 100644 (file)
--- a/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
+++ b/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
@@ -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;

diff --git a/src/java/org/apache/fop/apps/FOUserAgent.java b/src/java/org/apache/fop/apps/FOUserAgent.java
index 488b6247457dd82efc6341fafd018da26e3d4bd9..b4c69c6e35444bbdff9f6215a67caa486a1fd34b 100644 (file)
--- a/src/java/org/apache/fop/apps/FOUserAgent.java
+++ b/src/java/org/apache/fop/apps/FOUserAgent.java
@@ -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();
     }
 }
 

diff --git a/src/java/org/apache/fop/apps/FopFactory.java b/src/java/org/apache/fop/apps/FopFactory.java
index ec72669579537ba29586f32ad93062c00ec0c96e..4508ea7fac930e908f23edded4585ecffe0a2265 100644 (file)
--- a/src/java/org/apache/fop/apps/FopFactory.java
+++ b/src/java/org/apache/fop/apps/FopFactory.java
@@ -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();
     }
 
     /**

diff --git a/src/java/org/apache/fop/apps/FopFactoryBuilder.java b/src/java/org/apache/fop/apps/FopFactoryBuilder.java
index 44c44c119e7ed00ee222c1a12fdb99a04d56c021..6c3da57f32735ae9c3ea1af62fde94ee04b77122 100644 (file)
--- a/src/java/org/apache/fop/apps/FopFactoryBuilder.java
+++ b/src/java/org/apache/fop/apps/FopFactoryBuilder.java
@@ -452,7 +452,7 @@ public final class FopFactoryBuilder {
             return isComplexScript;
         }
 
-        public Map<String, String> getHyphPatNames() {
+        public Map<String, String> getHyphenationPatternNames() {
             return hyphPatNames;
         }
     }

diff --git a/src/java/org/apache/fop/apps/FopFactoryConfig.java b/src/java/org/apache/fop/apps/FopFactoryConfig.java
index 1ef958fae973a087de7616a9dc09be4805ef6e2d..2545eea5e74abd704b5d647b754d1829e3ac1c5f 100644 (file)
--- a/src/java/org/apache/fop/apps/FopFactoryConfig.java
+++ b/src/java/org/apache/fop/apps/FopFactoryConfig.java
@@ -126,5 +126,6 @@ public interface FopFactoryConfig {
 
     boolean isComplexScriptFeaturesEnabled();
 
-    Map<String, String> getHyphPatNames();
+    /** @see {@link FopFactory#getHyphenationPatternNames()} */
+    Map<String, String> getHyphenationPatternNames();
 }

diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
index 56c534f90b6dfd28222e88b2f3a9fa14a3c48403..5b81454324cffbd060780607a9b903016f948aa3 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
@@ -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());

diff --git a/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java b/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
index b03e3597154cac20200f0706b15c5914881381c1..ab6411b3a2c368f398d12c695a91834afec35e45 100644 (file)
--- a/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
+++ b/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
@@ -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();
         }
     }
-
 }