fop-commits  

svn commit: r654869 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java

acumiskey
Fri, 09 May 2008 09:14:09 -0700

Author: acumiskey
Date: Fri May  9 09:13:47 2008
New Revision: 654869

URL: http://svn.apache.org/viewvc?rev=654869&view=rev
Log:
Moved the instantiation of the FontManager to the constructor along with all 
the other aggregated objects.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java

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=654869&r1=654868&r2=654869&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 Fri May  
9 09:13:47 2008
@@ -144,6 +144,14 @@
         this.config = new FopFactoryConfigurator(this);
         this.elementMappingRegistry = new ElementMappingRegistry(this);
         this.foURIResolver = new FOURIResolver(validateUserConfigStrictly());
+        this.fontManager = new FontManager() {
+
+            /** [EMAIL PROTECTED] */
+            public void setFontBaseURL(String fontBase) throws 
MalformedURLException {
+                
super.setFontBaseURL(getFOURIResolver().checkBaseURL(fontBase));
+            }
+
+        };
         this.colorSpaceCache = new ColorSpaceCache(foURIResolver);
         this.imageManager = new ImageManager(this);
         this.rendererFactory = new RendererFactory();
@@ -696,16 +704,6 @@
      * @return the font manager
      */
     public FontManager getFontManager() {
-        if (fontManager == null) {
-            this.fontManager = new FontManager() {
-
-                /** [EMAIL PROTECTED] */
-                public void setFontBaseURL(String fontBase) throws 
MalformedURLException {
-                    
super.setFontBaseURL(getFOURIResolver().checkBaseURL(fontBase));
-                }
-
-            };
-        }
         return this.fontManager;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

  • svn commit: r654869 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java acumiskey