Author: acumiskey
Date: Fri Mar 20 16:27:10 2009
New Revision: 756583
URL: http://svn.apache.org/viewvc?rev=756583&view=rev
Log:
Moved the font cache change check from outside PrintRendererConfigurator to
inside the FontInfoConfigurator.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java?rev=756583&r1=756582&r2=756583&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
Fri Mar 20 16:27:10 2009
@@ -100,7 +100,12 @@
// Update referenced fonts (fonts which are not to be embedded)
fontManager.updateReferencedFonts(fontInfoList);
-
+
+ // Update font cache if it has changed
+ if (fontCache != null && fontCache.hasChanged()) {
+ fontCache.save();
+ }
+
if (log.isDebugEnabled()) {
log.debug("Finished font configuration in "
+ (System.currentTimeMillis() - start) + "ms");
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java?rev=756583&r1=756582&r2=756583&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
Fri Mar 20 16:27:10 2009
@@ -100,17 +100,12 @@
}
boolean strict = factory.validateUserConfigStrictly();
- FontCache fontCache = fontManager.getFontCache();
//Read font configuration
FontInfoConfigurator fontInfoConfigurator
= new FontInfoConfigurator(cfg, fontManager, fontResolver,
listener, strict);
List/*<EmbedFontInfo>*/ fontInfoList = new
java.util.ArrayList/*<EmbedFontInfo>*/();
fontInfoConfigurator.configure(fontInfoList);
-
- if (fontCache != null && fontCache.hasChanged()) {
- fontCache.save();
- }
return fontInfoList;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
