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 je...@apache.org on 2009/03/23 08:54:43 UTC
svn commit: r757341 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop:
apps/FOUserAgent.java render/DefaultFontResolver.java
Author: jeremias
Date: Mon Mar 23 07:54:43 2009
New Revision: 757341
URL: http://svn.apache.org/viewvc?rev=757341&view=rev
Log:
Deprecated font base url methods on user agent level in favor of the methods on the FontManager accessible via FopFactory as proposed in:
http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/200903.mbox/%3C20090310161419.8FA8.60BA733C@jeremias-maerki.ch%3E
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/DefaultFontResolver.java
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=757341&r1=757340&r2=757341&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 Mon Mar 23 07:54:43 2009
@@ -21,6 +21,7 @@
// Java
import java.io.File;
+import java.net.MalformedURLException;
import java.util.Date;
import java.util.Map;
@@ -43,6 +44,7 @@
import org.apache.fop.events.FOPEventListenerProxy;
import org.apache.fop.events.LoggingEventListener;
import org.apache.fop.fo.FOEventHandler;
+import org.apache.fop.fonts.FontManager;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.RendererFactory;
import org.apache.fop.render.XMLHandlerRegistry;
@@ -84,9 +86,6 @@
*/
private String base = null;
- /** The base URL for all font URL resolutions. */
- private String fontBase = null;
-
/** A user settable URI Resolver */
private URIResolver uriResolver = null;
@@ -152,7 +151,6 @@
}
this.factory = factory;
setBaseURL(factory.getBaseURL());
- setFontBaseURL(factory.getFontManager().getFontBaseURL());
setTargetResolution(factory.getTargetResolution());
}
@@ -345,11 +343,16 @@
}
/**
- * sets font base URL
+ * Sets font base URL.
* @param fontBaseUrl font base URL
+ * @deprecated Use {@link FontManager#setFontBaseURL(String)} instead.
*/
public void setFontBaseURL(String fontBaseUrl) {
- this.fontBase = fontBaseUrl;
+ try {
+ getFactory().getFontManager().setFontBaseURL(fontBaseUrl);
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException(e.getMessage());
+ }
}
/**
@@ -484,8 +487,13 @@
// ---------------------------------------------- environment-level stuff
// (convenience access to FopFactory methods)
- /** @return the font base URL */
+ /**
+ * Returns the font base URL.
+ * @return the font base URL
+ * @deprecated Use {@link FontManager#getFontBaseURL()} instead. This method is not used by FOP.
+ */
public String getFontBaseURL() {
+ String fontBase = getFactory().getFontManager().getFontBaseURL();
return fontBase != null ? fontBase : getBaseURL();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/DefaultFontResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/DefaultFontResolver.java?rev=757341&r1=757340&r2=757341&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/DefaultFontResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/DefaultFontResolver.java Mon Mar 23 07:54:43 2009
@@ -41,7 +41,7 @@
/** {@inheritDoc} */
public Source resolve(String href) {
- return userAgent.resolveURI(href, userAgent.getFontBaseURL());
+ return userAgent.resolveURI(href, userAgent.getFactory().getFontManager().getFontBaseURL());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org