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 ph...@apache.org on 2012/06/15 10:52:02 UTC
svn commit: r1350538 [1/2] - in
/xmlgraphics/fop/branches/Temp_URI_Unification:
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/util/
src/java/org/apache/fop/apps/ src/java/org/apache/fop/apps/io/
src/java/org/apache/fop/area/ src/java/org/apa...
Author: phancock
Date: Fri Jun 15 08:52:00 2012
New Revision: 1350538
URL: http://svn.apache.org/viewvc?rev=1350538&view=rev
Log:
Removed HyphenationTreeResolver and better Handling of 'data://' URIs
Plus other internal cleanup
Modified:
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceManager.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPStreamer.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopConfParser.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryBuilder.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryConfig.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/area/CachedRenderPagesModel.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CIDFont.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFont.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFontCollection.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontAdder.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontCache.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontDetectorFactory.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontLoader.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManager.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontReader.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontSetup.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/LazyFont.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/MultiByteFont.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/SingleByteFont.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/hyphenation/Hyphenator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRenderer.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPFontConfig.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPPainter.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/util/ColorSpaceCache.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceManager.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceManager.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceManager.java Fri Jun 15 08:52:00 2012
@@ -44,7 +44,7 @@ import org.apache.fop.afp.modca.Resource
import org.apache.fop.afp.modca.ResourceObject;
import org.apache.fop.afp.util.AFPResourceAccessor;
import org.apache.fop.afp.util.AFPResourceUtil;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
/**
* Manages the creation and storage of document resources
@@ -80,9 +80,9 @@ public class AFPResourceManager {
/**
* Main constructor
*/
- public AFPResourceManager(URIResolverWrapper uriResolverWrapper) {
+ public AFPResourceManager(InternalResourceResolver resourceResolver) {
this.factory = new Factory();
- this.streamer = new AFPStreamer(factory, uriResolverWrapper);
+ this.streamer = new AFPStreamer(factory, resourceResolver);
this.dataObjectFactory = new AFPDataObjectFactory(factory);
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPStreamer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPStreamer.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPStreamer.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPStreamer.java Fri Jun 15 08:52:00 2012
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
import org.apache.fop.afp.modca.ResourceGroup;
import org.apache.fop.afp.modca.StreamedResourceGroup;
import org.apache.fop.apps.io.TempResourceURIGenerator;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
/**
* Manages the streaming of the AFP output
@@ -51,7 +51,7 @@ public class AFPStreamer implements Stre
private final Factory factory;
- private final URIResolverWrapper uriResolverWrapper;
+ private final InternalResourceResolver resourceResolver;
/** A mapping of external resource destinations to resource groups */
private final Map<URI, ResourceGroup> pathResourceGroupMap = new HashMap<URI, ResourceGroup>();
@@ -75,10 +75,11 @@ public class AFPStreamer implements Stre
* Main constructor
*
* @param factory a factory
+ * @param resourceResolver resource resolver
*/
- public AFPStreamer(Factory factory, URIResolverWrapper uriResolverWrapper) {
+ public AFPStreamer(Factory factory, InternalResourceResolver resourceResolver) {
this.factory = factory;
- this.uriResolverWrapper = uriResolverWrapper;
+ this.resourceResolver = resourceResolver;
this.tempUri = TEMP_URI_GENERATOR.generate();
defaultResourceGroupUri = URI.create(DEFAULT_EXTERNAL_RESOURCE_FILENAME);
@@ -92,7 +93,7 @@ public class AFPStreamer implements Stre
* @throws IOException thrown if an I/O exception of some sort has occurred
*/
public DataStream createDataStream(AFPPaintingState paintingState) throws IOException {
- this.tempOutputStream = new BufferedOutputStream(uriResolverWrapper.resolveOut(tempUri));
+ this.tempOutputStream = new BufferedOutputStream(resourceResolver.getOutputStream(tempUri));
this.dataStream = factory.createDataStream(paintingState, tempOutputStream);
return dataStream;
}
@@ -127,7 +128,7 @@ public class AFPStreamer implements Stre
if (resourceGroup == null) {
OutputStream os = null;
try {
- os = new BufferedOutputStream(uriResolverWrapper.resolveOut(uri));
+ os = new BufferedOutputStream(resourceResolver.getOutputStream(uri));
} catch (IOException ioe) {
LOG.error("Failed to create/open external resource group for uri '"
+ uri + "'");
@@ -184,7 +185,7 @@ public class AFPStreamer implements Stre
/** {@inheritDoc} */
public void writeToStream(OutputStream os) throws IOException {
tempOutputStream.close();
- InputStream tempInputStream = uriResolverWrapper.resolveIn(tempUri);
+ InputStream tempInputStream = resourceResolver.getResource(tempUri);
IOUtils.copy(tempInputStream, os);
//TODO this should notify the stream provider that it is safe to delete the temp data
tempInputStream.close();
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java Fri Jun 15 08:52:00 2012
@@ -24,34 +24,36 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
/**
* Defines an interface through which external resource objects can be accessed.
*/
public final class AFPResourceAccessor {
- private final URIResolverWrapper resolver;
+ private final InternalResourceResolver resourceResolver;
private final String baseURI;
/**
* Constructor for resource to be accessed via the {@link FOUserAgent}. This contructor
- * can take two base URIs: the category base URI is the one to use when differentiating between
- * normal resources (ex. images) and font resources. So, if fonts need to be accessed, you can
- * set the {@link org.apache.fop.fonts.FontManager}'s base URI instead of the one on the
- * {@link org.apache.fop.apps.FopFactory}.
- * @param userAgent the FO user agent
- * @param categoryBaseURI the category base URI (may be null)
+ * takes a base URI for resolving font resource URIs. So, if fonts need to be accessed, you can
+ * set the {@link FontManager}'s base URI instead of the one on the {@link FopFactory}.
+ *
+ * @param InternalResourceResolver resource resolver
* @param baseURI the custom base URI to resolve relative URIs against (may be null)
*/
- public AFPResourceAccessor(URIResolverWrapper resolver, String baseURI) {
- this.resolver = resolver;
+ public AFPResourceAccessor(InternalResourceResolver resourceResolver, String baseURI) {
+ this.resourceResolver = resourceResolver;
this.baseURI = baseURI;
}
- public AFPResourceAccessor(URIResolverWrapper resolver) {
- this.resolver = resolver;
- this.baseURI = null;
+ /**
+ * Constructor for resource to be accessed via the {@link FOUserAgent}.
+ *
+ * @param InternalResourceResolver resource resolver
+ */
+ public AFPResourceAccessor(InternalResourceResolver resourceResolver) {
+ this(resourceResolver, null);
}
private URI getResourceURI(URI uri) {
@@ -59,7 +61,7 @@ public final class AFPResourceAccessor {
return uri;
}
try {
- URI baseURI = URIResolverWrapper.getBaseURI(this.baseURI);
+ URI baseURI = InternalResourceResolver.getBaseURI(this.baseURI);
return baseURI.resolve(uri);
} catch (URISyntaxException use) {
return uri;
@@ -68,7 +70,7 @@ public final class AFPResourceAccessor {
/** {@inheritDoc} */
public InputStream createInputStream(URI uri) throws IOException {
- return resolver.resolveIn(getResourceURI(uri));
+ return resourceResolver.getResource(getResourceURI(uri));
}
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java Fri Jun 15 08:52:00 2012
@@ -22,7 +22,7 @@ package org.apache.fop.apps;
import java.net.URI;
import org.apache.fop.apps.io.ResourceResolver;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.FontCacheManager;
import org.apache.fop.fonts.FontCacheManagerFactory;
import org.apache.fop.fonts.FontDetector;
@@ -105,7 +105,7 @@ public final class EnvironmentalProfileF
private static FontManager createFontManager(URI defaultBaseUri, ResourceResolver resourceResolver,
FontDetector fontDetector, FontCacheManager fontCacheManager) {
- return new FontManager(new URIResolverWrapper(defaultBaseUri, resourceResolver), fontDetector,
+ return new FontManager(new InternalResourceResolver(defaultBaseUri, resourceResolver), fontDetector,
fontCacheManager);
}
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FOUserAgent.java Fri Jun 15 08:52:00 2012
@@ -45,7 +45,7 @@ import org.apache.fop.Version;
import org.apache.fop.accessibility.Accessibility;
import org.apache.fop.accessibility.DummyStructureTreeEventHandler;
import org.apache.fop.accessibility.StructureTreeEventHandler;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.events.DefaultEventBroadcaster;
import org.apache.fop.events.Event;
import org.apache.fop.events.EventBroadcaster;
@@ -93,7 +93,7 @@ public class FOUserAgent {
private final FopFactory factory;
- private final URIResolverWrapper newUriResolver;
+ private final InternalResourceResolver resourceResolver;
private float targetResolution = FopFactoryConfig.DEFAULT_TARGET_RESOLUTION;
private Map rendererOptions = new java.util.HashMap();
@@ -151,11 +151,12 @@ public class FOUserAgent {
* Main constructor. <b>This constructor should not be called directly. Please use the
* methods from FopFactory to construct FOUserAgent instances!</b>
* @param factory the factory that provides environment-level information
+ * @param resourceResolver the resolver used to acquire resources
* @see org.apache.fop.apps.FopFactory
*/
- FOUserAgent(FopFactory factory, URIResolverWrapper uriResolver) {
+ FOUserAgent(FopFactory factory, InternalResourceResolver resourceResolver) {
this.factory = factory;
- this.newUriResolver = uriResolver;
+ this.resourceResolver = resourceResolver;
setTargetResolution(factory.getTargetResolution());
setAccessibility(factory.isAccessibilityEnabled());
}
@@ -197,12 +198,12 @@ public class FOUserAgent {
/**
- * Returns the URI Resolver.
+ * Returns the resource resolver.
*
- * @return the URI resolver
+ * @return the resource resolver
*/
- public URIResolverWrapper getNewURIResolver() {
- return newUriResolver;
+ public InternalResourceResolver getResourceResolver() {
+ return resourceResolver;
}
// ---------------------------------------------- rendering-run dependent stuff
@@ -405,7 +406,7 @@ public class FOUserAgent {
// TODO: What do we want to do when resources aren't found???
try {
// Have to do this so we can resolve data URIs
- Source src = new StreamSource(newUriResolver.resolveIn(uri));
+ Source src = new StreamSource(resourceResolver.getResource(uri));
src.setSystemId(uri);
return src;
} catch (URISyntaxException use) {
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopConfParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopConfParser.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopConfParser.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopConfParser.java Fri Jun 15 08:52:00 2012
@@ -41,7 +41,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.FontManagerConfigurator;
import org.apache.fop.hyphenation.HyphenationTreeCache;
import org.apache.fop.util.LogUtil;
@@ -87,13 +87,13 @@ public class FopConfParser {
*
* @param fopConfStream the fop conf input stream
* @param defaultBaseURI the default base URI
- * @param resolver the URI resolver
+ * @param resourceResolver the URI resolver
* @throws SAXException if a SAX error was thrown parsing the FOP conf
* @throws IOException if an I/O error is thrown while parsing the FOP conf
*/
public FopConfParser(InputStream fopConfStream, URI defaultBaseURI,
- ResourceResolver resolver) throws SAXException, IOException {
- this(fopConfStream, EnvironmentalProfileFactory.createDefault(defaultBaseURI, resolver));
+ ResourceResolver resourceResolver) throws SAXException, IOException {
+ this(fopConfStream, EnvironmentalProfileFactory.createDefault(defaultBaseURI, resourceResolver));
}
/**
@@ -125,17 +125,17 @@ public class FopConfParser {
* Constructor that parses the FOP conf and uses the URI resolver given.
*
* @param fopConfFile the FOP conf file
- * @param resolver the URI resolver
+ * @param resourceResolver the URI resolver
* @throws SAXException if a SAX error was thrown parsing the FOP conf
* @throws IOException if an I/O error is thrown while parsing the FOP conf
*/
- public FopConfParser(File fopConfFile, ResourceResolver resolver)
+ public FopConfParser(File fopConfFile, ResourceResolver resourceResolver)
throws SAXException, IOException {
this(new FileInputStream(fopConfFile),
- fopConfFile.getAbsoluteFile().getParentFile().toURI(), resolver);
+ fopConfFile.getAbsoluteFile().getParentFile().toURI(), resourceResolver);
}
- private void configure(final URI defaultBaseURI, final ResourceResolver resolver,
+ private void configure(final URI defaultBaseURI, final ResourceResolver resourceResolver,
Configuration cfg) throws FOPException {
if (log.isDebugEnabled()) {
log.debug("Initializing FopFactory Configuration");
@@ -164,7 +164,7 @@ public class FopConfParser {
// base definitions for relative path resolution
if (cfg.getChild("base", false) != null) {
try {
- URI confUri = URIResolverWrapper.getBaseURI(cfg.getChild("base").getValue(null));
+ URI confUri = InternalResourceResolver.getBaseURI(cfg.getChild("base").getValue(null));
fopFactoryBuilder.setBaseURI(defaultBaseURI.resolve(confUri));
} catch (URISyntaxException use) {
LogUtil.handleException(log, use, strict);
@@ -233,7 +233,7 @@ public class FopConfParser {
}
// configure font manager
- new FontManagerConfigurator(cfg, fopFactoryBuilder.getBaseUri(), resolver).configure(
+ new FontManagerConfigurator(cfg, fopFactoryBuilder.getBaseUri(), resourceResolver).configure(
fopFactoryBuilder.getFontManager(), strict);
// configure image loader framework
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactory.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactory.java Fri Jun 15 08:52:00 2012
@@ -38,7 +38,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.util.UnitConv;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fo.ElementMapping;
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fonts.FontManager;
@@ -82,15 +82,15 @@ public final class FopFactory implements
private final FopFactoryConfig config;
- private final URIResolverWrapper uriResolverWrapper;
+ private final InternalResourceResolver resolver;
private final Map<String, RendererConfig> rendererConfig;
private FopFactory(FopFactoryConfig config) {
this.config = config;
- this.uriResolverWrapper = new URIResolverWrapper(config.getBaseURI(), config.getNewURIResolver());
+ this.resolver = new InternalResourceResolver(config.getBaseURI(), config.getResourceResolver());
this.elementMappingRegistry = new ElementMappingRegistry(this);
- this.colorSpaceCache = new ColorSpaceCache(uriResolverWrapper);
+ this.colorSpaceCache = new ColorSpaceCache(resolver);
this.rendererFactory = new RendererFactory(config.preferRenderer());
this.xmlHandlers = new XMLHandlerRegistry();
this.imageHandlers = new ImageHandlerRegistry();
@@ -163,7 +163,7 @@ public final class FopFactory implements
* @throws FOPException
*/
public FOUserAgent newFOUserAgent() {
- FOUserAgent userAgent = new FOUserAgent(this, uriResolverWrapper);
+ FOUserAgent userAgent = new FOUserAgent(this, resolver);
return userAgent;
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryBuilder.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryBuilder.java Fri Jun 15 08:52:00 2012
@@ -26,8 +26,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.xml.transform.URIResolver;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.xmlgraphics.image.loader.ImageContext;
@@ -75,10 +73,10 @@ public final class FopFactoryBuilder {
* A builder class for {@link FopFactory} which can be used for setting configuration.
*
* @param defaultBaseURI the default base URI for resolving URIs against
- * @param uriResolver the URI resolver
+ * @param resourceResolver the URI resolver
*/
- public FopFactoryBuilder(URI defaultBaseURI, ResourceResolver uriResolver) {
- this(EnvironmentalProfileFactory.createDefault(defaultBaseURI, uriResolver));
+ public FopFactoryBuilder(URI defaultBaseURI, ResourceResolver resourceResolver) {
+ this(EnvironmentalProfileFactory.createDefault(defaultBaseURI, resourceResolver));
}
/**
@@ -164,19 +162,6 @@ public final class FopFactoryBuilder {
}
/**
- * Sets the URI resolver to be used for controlling FOP's file access.
- *
- * @param resolver the URI resolver
- * @return <code>this</code>
- * @deprecated this URIResolver will be phased out in favour of a unified URI resolution
- * mechanism
- */
- public FopFactoryBuilder setURIResolver(URIResolver resolver) {
- fopFactoryConfigBuilder.setURIResolver(resolver);
- return this;
- }
-
- /**
* Sets the base URI, this will be used for resolving all URIs given to FOP.
*
* @param baseURI the base URI
@@ -351,8 +336,6 @@ public final class FopFactoryBuilder {
private Set<String> ignoredNamespaces = new HashSet<String>();
- private URIResolver resolver;
-
private Configuration cfg;
private boolean preferRenderer;
@@ -391,16 +374,11 @@ public final class FopFactoryBuilder {
}
/** {@inheritDoc} */
- public ResourceResolver getNewURIResolver() {
+ public ResourceResolver getResourceResolver() {
return enviro.getResourceResolver();
}
/** {@inheritDoc} */
- public URIResolver getURIResolver() {
- return resolver;
- }
-
- /** {@inheritDoc} */
public URI getBaseURI() {
return baseURI;
}
@@ -485,8 +463,6 @@ public final class FopFactoryBuilder {
void setLayoutManagerMakerOverride(LayoutManagerMaker lmMaker);
- void setURIResolver(URIResolver resolver);
-
void setBaseURI(URI baseURI);
void setStrictFOValidation(boolean validateStrictly);
@@ -534,18 +510,10 @@ public final class FopFactoryBuilder {
}
- public void setURIResolver(URIResolver resolver) {
- throwIllegalStateException();
- }
-
public void setBaseURI(URI baseURI) {
throwIllegalStateException();
}
- public void setHyphenationBaseURI(URI hyphenationBase) {
- throwIllegalStateException();
- }
-
public void setStrictFOValidation(boolean validateStrictly) {
throwIllegalStateException();
}
@@ -617,10 +585,6 @@ public final class FopFactoryBuilder {
config.layoutManagerMaker = lmMaker;
}
- public void setURIResolver(URIResolver resolver) {
- config.resolver = resolver;
- }
-
public void setBaseURI(URI baseURI) {
config.baseURI = baseURI;
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryConfig.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryConfig.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryConfig.java Fri Jun 15 08:52:00 2012
@@ -72,7 +72,7 @@ public interface FopFactoryConfig {
*
* @return the URI resolver
*/
- ResourceResolver getNewURIResolver();
+ ResourceResolver getResourceResolver();
/**
* The base URI from which URIs are resolved against.
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java Fri Jun 15 08:52:00 2012
@@ -42,10 +42,10 @@ public final class ResourceResolverFacto
return new TempAwareResourceResolver(tempResourceResolver, defaultResourceResolver);
}
- public static URIResolverWrapper createDefaultWrapper() {
+ public static InternalResourceResolver createDefaultWrapper() {
// Not sure if this is the right place for this, but I don't have any better ideas as of yet
URI thisUri = new File(".").getAbsoluteFile().toURI();
- return new URIResolverWrapper(thisUri, new DefaultResourceResolver());
+ return new InternalResourceResolver(thisUri, new DefaultResourceResolver());
}
public static SchemaAwareResourceResolverBuilder createSchemaAwareResourceResolverBuilder(
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/area/CachedRenderPagesModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/area/CachedRenderPagesModel.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/area/CachedRenderPagesModel.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/area/CachedRenderPagesModel.java Fri Jun 15 08:52:00 2012
@@ -80,7 +80,7 @@ public class CachedRenderPagesModel exte
// load page from cache
URI tempURI = pageMap.get(pageViewport);
log.debug("Loading page from: " + tempURI);
- InputStream inStream = renderer.getUserAgent().getNewURIResolver().resolveIn(tempURI);
+ InputStream inStream = renderer.getUserAgent().getResourceResolver().getResource(tempURI);
ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(inStream));
try {
pageViewport.loadPage(in);
@@ -124,7 +124,7 @@ public class CachedRenderPagesModel exte
ObjectOutputStream tempstream;
String fname = "fop-page-" + page.getPageIndex() + ".ser";
URI tempURI = tempBaseURI.resolve(fname);
- OutputStream outStream = renderer.getUserAgent().getNewURIResolver().resolveOut(tempURI);
+ OutputStream outStream = renderer.getUserAgent().getResourceResolver().getOutputStream(tempURI);
tempstream = new ObjectOutputStream(new BufferedOutputStream(outStream));
try {
page.savePage(tempstream);
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java Fri Jun 15 08:52:00 2012
@@ -71,7 +71,7 @@ public class SVGElement extends SVGObj {
/* if width and height are zero, get the bounds of the content. */
try {
- URI baseUri = getUserAgent().getNewURIResolver().getBaseURI();
+ URI baseUri = getUserAgent().getResourceResolver().getBaseURI();
if (baseUri != null) {
SVGOMDocument svgdoc = (SVGOMDocument)doc;
svgdoc.setURLObject(baseUri.toURL());
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CIDFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CIDFont.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CIDFont.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CIDFont.java Fri Jun 15 08:52:00 2012
@@ -19,7 +19,7 @@
package org.apache.fop.fonts;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
//Java
@@ -32,10 +32,10 @@ public abstract class CIDFont extends Cu
protected int[] width = null;
/**
- * @param resolver the URI resolver for controlling file access
+ * @param resourceResolver the URI resolver for controlling file access
*/
- public CIDFont(URIResolverWrapper resolver) {
- super(resolver);
+ public CIDFont(InternalResourceResolver resourceResolver) {
+ super(resourceResolver);
}
// ---- Required ----
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFont.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFont.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFont.java Fri Jun 15 08:52:00 2012
@@ -28,7 +28,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
/**
@@ -43,7 +43,7 @@ public abstract class CustomFont extends
private String fontSubName;
private URI embedFileURI;
private String embedResourceName;
- private final URIResolverWrapper resolver;
+ private final InternalResourceResolver resourceResolver;
private int capHeight;
private int xHeight;
@@ -65,10 +65,10 @@ public abstract class CustomFont extends
private boolean useAdvanced = true;
/**
- * @param resolver the URI resolver for controlling file access
+ * @param resourceResolver the URI resource resolver for controlling file access
*/
- public CustomFont(URIResolverWrapper resolver) {
- this.resolver = resolver;
+ public CustomFont(InternalResourceResolver resourceResolver) {
+ this.resourceResolver = resourceResolver;
}
/** {@inheritDoc} */
@@ -127,7 +127,7 @@ public abstract class CustomFont extends
* @throws IOException if embedFileName is not null but Source is not found
*/
public InputStream getInputStream() throws IOException {
- return resolver.resolveIn(embedFileURI);
+ return resourceResolver.getResource(embedFileURI);
}
/**
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFontCollection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFontCollection.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFontCollection.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/CustomFontCollection.java Fri Jun 15 08:52:00 2012
@@ -21,7 +21,7 @@ package org.apache.fop.fonts;
import java.util.List;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
/**
* Sets up a set of custom (embedded) fonts
@@ -29,7 +29,7 @@ import org.apache.fop.apps.io.URIResolve
public class CustomFontCollection implements FontCollection {
private final List<EmbedFontInfo> embedFontInfoList;
- private final URIResolverWrapper uriResolver;
+ private final InternalResourceResolver uriResolver;
private final boolean useComplexScripts;
/**
@@ -38,7 +38,7 @@ public class CustomFontCollection implem
* @param customFonts the list of custom fonts
* @param useComplexScriptFeatures true if complex script features enabled
*/
- public CustomFontCollection(URIResolverWrapper fontResolver,
+ public CustomFontCollection(InternalResourceResolver fontResolver,
List<EmbedFontInfo> customFonts, boolean useComplexScriptFeatures) {
this.uriResolver = fontResolver;
this.embedFontInfoList = customFonts;
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java Fri Jun 15 08:52:00 2012
@@ -31,7 +31,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.DefaultFontConfig.Directory;
import org.apache.fop.fonts.autodetect.FontFileFinder;
import org.apache.fop.fonts.autodetect.FontInfoFinder;
@@ -46,7 +46,7 @@ public class DefaultFontConfigurator imp
protected static Log log = LogFactory.getLog(DefaultFontConfigurator.class);
private final FontManager fontManager;
- private final URIResolverWrapper uriResolver;
+ private final InternalResourceResolver resourceResolver;
private final FontEventListener listener;
private final boolean strict;
@@ -59,7 +59,7 @@ public class DefaultFontConfigurator imp
*/
public DefaultFontConfigurator(FontManager fontManager, FontEventListener listener, boolean strict) {
this.fontManager = fontManager;
- this.uriResolver = fontManager.getURIResolver();
+ this.resourceResolver = fontManager.getResourceResolver();
this.listener = listener;
this.strict = strict;
}
@@ -78,7 +78,7 @@ public class DefaultFontConfigurator imp
log.debug("Starting font configuration...");
start = System.currentTimeMillis();
}
- FontAdder fontAdder = new FontAdder(fontManager, uriResolver, listener);
+ FontAdder fontAdder = new FontAdder(fontManager, resourceResolver, listener);
// native o/s search (autodetect) configuration
fontManager.autoDetectFonts(adobeFontInfoConfig.isAutoDetectFonts(), fontAdder, strict,
listener, fontInfoList);
@@ -146,19 +146,19 @@ public class DefaultFontConfigurator imp
String embed = font.getEmbedURI();
String metrics = font.getMetrics();
String subFont = font.getSubFont();
- URI metricsUri = metrics == null ? null : URIResolverWrapper.cleanURI(metrics);
- URI embedUri = URIResolverWrapper.cleanURI(embed);
+ URI metricsUri = metrics == null ? null : InternalResourceResolver.cleanURI(metrics);
+ URI embedUri = InternalResourceResolver.cleanURI(embed);
List<FontTriplet> tripletList = font.getTripletList();
// no font triplet info
if (tripletList.size() == 0) {
//TODO: could be problematic!!
- URI fontUri = uriResolver.getBaseURI().resolve(embedUri);
+ URI fontUri = resourceResolver.resolveFromBase(embedUri);
if (fontUri != null) {
FontInfoFinder finder = new FontInfoFinder();
finder.setEventListener(listener);
- EmbedFontInfo[] infos = finder.find(fontUri, uriResolver, fontCache);
+ EmbedFontInfo[] infos = finder.find(fontUri, resourceResolver, fontCache);
return infos[0]; //When subFont is set, only one font is returned
} else {
return null;
@@ -169,7 +169,7 @@ public class DefaultFontConfigurator imp
font.isAdvanced(), tripletList, embedUri, subFont, encodingMode);
if (fontCache != null) {
if (!fontCache.containsFont(embedFontInfo)) {
- fontCache.addFont(embedFontInfo, uriResolver);
+ fontCache.addFont(embedFontInfo, resourceResolver);
}
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontAdder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontAdder.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontAdder.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontAdder.java Fri Jun 15 08:52:00 2012
@@ -23,7 +23,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.List;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.autodetect.FontInfoFinder;
/**
@@ -31,18 +31,19 @@ import org.apache.fop.fonts.autodetect.F
*/
public class FontAdder {
private final FontEventListener listener;
- private final URIResolverWrapper resolver;
+ private final InternalResourceResolver resourceResolver;
private final FontManager manager;
/**
* Main constructor
* @param manager a font manager
- * @param resolver a font resolver
+ * @param resourceResolver a font resolver
* @param listener a font event handler
*/
- public FontAdder(FontManager manager, URIResolverWrapper resolver, FontEventListener listener) {
+ public FontAdder(FontManager manager, InternalResourceResolver resourceResolver,
+ FontEventListener listener) {
this.manager = manager;
- this.resolver = resolver;
+ this.resourceResolver = resourceResolver;
this.listener = listener;
}
@@ -59,7 +60,7 @@ public class FontAdder {
finder.setEventListener(listener);
for (URL fontURL : fontURLList) {
- EmbedFontInfo[] embedFontInfos = finder.find(fontURL.toURI(), resolver, cache);
+ EmbedFontInfo[] embedFontInfos = finder.find(fontURL.toURI(), resourceResolver, cache);
if (embedFontInfos == null) {
continue;
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontCache.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontCache.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontCache.java Fri Jun 15 08:52:00 2012
@@ -41,7 +41,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.util.LogUtil;
/**
@@ -320,7 +320,7 @@ public final class FontCache implements
* @param fontInfo
* font info
*/
- public void addFont(EmbedFontInfo fontInfo, URIResolverWrapper resolver) {
+ public void addFont(EmbedFontInfo fontInfo, InternalResourceResolver resourceResolver) {
String cacheKey = getCacheKey(fontInfo);
synchronized (changeLock) {
CachedFontFile cachedFontFile;
@@ -331,8 +331,7 @@ public final class FontCache implements
}
} else {
// try and determine modified date
- // TODO: This could be problematic?!!?!?!
- URI fontUri = resolver.getBaseURI().resolve(fontInfo.getEmbedURI());
+ URI fontUri = resourceResolver.resolveFromBase(fontInfo.getEmbedURI());
File fontFile = new File(fontUri);
long lastModified = (fontFile != null ? fontFile.lastModified() : -1);
cachedFontFile = new CachedFontFile(lastModified);
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontDetectorFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontDetectorFactory.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontDetectorFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontDetectorFactory.java Fri Jun 15 08:52:00 2012
@@ -90,15 +90,13 @@ public final class FontDetectorFactory {
// search in font base if it is defined and
// is a directory but don't recurse
FontFileFinder fontFileFinder = new FontFileFinder(eventListener);
- URI fontBaseURI = fontManager.getURIResolver().getBaseURI();
- if (fontBaseURI != null) {
- File fontBase = FileUtils.toFile(fontBaseURI.toURL());
- if (fontBase != null) {
- List<URL> fontURLList = fontFileFinder.find(fontBase.getAbsolutePath());
- fontAdder.add(fontURLList, fontInfoList);
+ URI fontBaseURI = fontManager.getResourceResolver().getBaseURI();
+ File fontBase = FileUtils.toFile(fontBaseURI.toURL());
+ if (fontBase != null) {
+ List<URL> fontURLList = fontFileFinder.find(fontBase.getAbsolutePath());
+ fontAdder.add(fontURLList, fontInfoList);
- //Can only use the font base URL if it's a file URL
- }
+ //Can only use the font base URL if it's a file URL
}
// native o/s font directory finding
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontLoader.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontLoader.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontLoader.java Fri Jun 15 08:52:00 2012
@@ -25,7 +25,7 @@ import java.net.URI;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.truetype.TTFFontLoader;
import org.apache.fop.fonts.type1.Type1FontLoader;
@@ -39,8 +39,8 @@ public abstract class FontLoader {
/** URI representing the font file */
protected final URI fontFileURI;
- /** the FontResolver to use for font URI resolution */
- protected final URIResolverWrapper resolver;
+ /** the resource resolver to use for font URI resolution */
+ protected final InternalResourceResolver resourceResolver;
/** the loaded font */
protected CustomFont returnFont;
@@ -60,15 +60,15 @@ public abstract class FontLoader {
* @param useKerning indicates whether kerning information shall be loaded if available
* @param useAdvanced indicates whether advanced typographic information shall be loaded if
* available
- * @param resolver the font resolver used to resolve URIs
+ * @param resourceResolver the font resolver used to resolve URIs
*/
public FontLoader(URI fontFileURI, boolean embedded, boolean useKerning,
- boolean useAdvanced, URIResolverWrapper resolver) {
+ boolean useAdvanced, InternalResourceResolver resourceResolver) {
this.fontFileURI = fontFileURI;
this.embedded = embedded;
this.useKerning = useKerning;
this.useAdvanced = useAdvanced;
- this.resolver = resolver;
+ this.resourceResolver = resourceResolver;
}
private static boolean isType1(URI fontURI) {
@@ -84,13 +84,13 @@ public abstract class FontLoader {
* @param useKerning indicates whether kerning information should be loaded if available
* @param useAdvanced indicates whether advanced typographic information shall be loaded if
* available
- * @param resolver the font resolver to use when resolving URIs
+ * @param resourceResolver the font resolver to use when resolving URIs
* @return the newly loaded font
* @throws IOException In case of an I/O error
*/
public static CustomFont loadFont(URI fontFileURI, String subFontName,
boolean embedded, EncodingMode encodingMode, boolean useKerning,
- boolean useAdvanced, URIResolverWrapper resolver) throws IOException {
+ boolean useAdvanced, InternalResourceResolver resourceResolver) throws IOException {
boolean type1 = isType1(fontFileURI);
FontLoader loader;
if (type1) {
@@ -98,10 +98,10 @@ public abstract class FontLoader {
throw new IllegalArgumentException(
"CID encoding mode not supported for Type 1 fonts");
}
- loader = new Type1FontLoader(fontFileURI, embedded, useKerning, resolver);
+ loader = new Type1FontLoader(fontFileURI, embedded, useKerning, resourceResolver);
} else {
loader = new TTFFontLoader(fontFileURI, subFontName,
- embedded, encodingMode, useKerning, useAdvanced, resolver);
+ embedded, encodingMode, useKerning, useAdvanced, resourceResolver);
}
return loader.getFont();
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManager.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManager.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManager.java Fri Jun 15 08:52:00 2012
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.List;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.FontTriplet.Matcher;
import org.apache.fop.fonts.substitute.FontSubstitutions;
@@ -36,8 +36,8 @@ import org.apache.fop.fonts.substitute.F
*/
public class FontManager {
- /** The base URL for all font URL resolutions. */
- private URIResolverWrapper uriResolver;
+ /** The resource resolver */
+ private InternalResourceResolver resourceResolver;
private final FontDetector fontDetector;
@@ -58,27 +58,27 @@ public class FontManager {
/**
* Main constructor
*
- * @param uriResolver the URI resolver
+ * @param resourceResolver the URI resolver
* @param fontDetector the font detector
* @param fontCacheManager the font cache manager
*/
- public FontManager(URIResolverWrapper uriResolver, FontDetector fontDetector,
+ public FontManager(InternalResourceResolver resourceResolver, FontDetector fontDetector,
FontCacheManager fontCacheManager) {
- this.uriResolver = uriResolver;
+ this.resourceResolver = resourceResolver;
this.fontDetector = fontDetector;
this.fontCacheManager = fontCacheManager;
}
/**
- * Sets the font URI resolver
- * @param uriResolver font base URI
+ * Sets the font resource resolver
+ * @param resourceResolver resource resolver
*/
- public void setFontURIResolver(URIResolverWrapper uriResolver) {
- this.uriResolver = uriResolver;
+ public void setResourceResolver(InternalResourceResolver resourceResolver) {
+ this.resourceResolver = resourceResolver;
}
- public URIResolverWrapper getURIResolver() {
- return this.uriResolver;
+ public InternalResourceResolver getResourceResolver() {
+ return this.resourceResolver;
}
/** @return true if kerning on base 14 fonts is enabled */
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManagerConfigurator.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManagerConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontManagerConfigurator.java Fri Jun 15 08:52:00 2012
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.io.ResourceResolver;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.substitute.FontSubstitutions;
import org.apache.fop.fonts.substitute.FontSubstitutionsConfigurator;
import org.apache.fop.util.LogUtil;
@@ -49,19 +49,19 @@ public class FontManagerConfigurator {
private final URI defaultBaseUri;
- private final ResourceResolver uriResolver;
+ private final ResourceResolver resourceResolver;
/**
* Main constructor
* @param cfg the font manager configuration object
* @param defaultBaseUri the default URI base to use for URI resolution
- * @param resolver the URI resolver
+ * @param resourceResolver the resource resolver
*/
public FontManagerConfigurator(Configuration cfg, URI defaultBaseUri,
- ResourceResolver resolver) {
+ ResourceResolver resourceResolver) {
this.cfg = cfg;
this.defaultBaseUri = defaultBaseUri;
- this.uriResolver = resolver;
+ this.resourceResolver = resourceResolver;
}
/**
@@ -88,15 +88,15 @@ public class FontManagerConfigurator {
}
if (cfg.getChild("font-base", false) != null) {
try {
- URI fontBase = URIResolverWrapper.getBaseURI(cfg.getChild("font-base").getValue(
+ URI fontBase = InternalResourceResolver.getBaseURI(cfg.getChild("font-base").getValue(
null));
- fontManager.setFontURIResolver(new URIResolverWrapper(
- defaultBaseUri.resolve(fontBase), uriResolver));
+ fontManager.setResourceResolver(new InternalResourceResolver(
+ defaultBaseUri.resolve(fontBase), resourceResolver));
} catch (URISyntaxException use) {
LogUtil.handleException(log, use, true);
}
} else {
- fontManager.setFontURIResolver(new URIResolverWrapper(defaultBaseUri, uriResolver));
+ fontManager.setResourceResolver(new InternalResourceResolver(defaultBaseUri, resourceResolver));
}
// [GA] permit configuration control over base14 kerning; without this,
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontReader.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontReader.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontReader.java Fri Jun 15 08:52:00 2012
@@ -39,7 +39,7 @@ import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.apps.TTFReader;
/**
@@ -58,7 +58,7 @@ public class FontReader extends DefaultH
private CustomFont returnFont;
private MultiByteFont multiFont;
private SingleByteFont singleFont;
- private final URIResolverWrapper resolver;
+ private final InternalResourceResolver resourceResolver;
private StringBuffer text = new StringBuffer();
private List<Integer> cidWidths;
@@ -74,8 +74,8 @@ public class FontReader extends DefaultH
* @param source Source of the font metric file
* @throws FOPException if loading the font fails
*/
- public FontReader(InputSource source, URIResolverWrapper resolver) throws FOPException {
- this.resolver = resolver;
+ public FontReader(InputSource source, InternalResourceResolver resourceResolver) throws FOPException {
+ this.resourceResolver = resourceResolver;
createFont(source);
}
@@ -156,25 +156,25 @@ public class FontReader extends DefaultH
throws SAXException {
if (localName.equals("font-metrics")) {
if ("TYPE0".equals(attributes.getValue("type"))) {
- multiFont = new MultiByteFont(resolver);
+ multiFont = new MultiByteFont(resourceResolver);
returnFont = multiFont;
isCID = true;
TTFReader.checkMetricsVersion(attributes);
} else if ("TRUETYPE".equals(attributes.getValue("type"))) {
- singleFont = new SingleByteFont(resolver);
+ singleFont = new SingleByteFont(resourceResolver);
singleFont.setFontType(FontType.TRUETYPE);
returnFont = singleFont;
isCID = false;
TTFReader.checkMetricsVersion(attributes);
} else {
- singleFont = new SingleByteFont(resolver);
+ singleFont = new SingleByteFont(resourceResolver);
singleFont.setFontType(FontType.TYPE1);
returnFont = singleFont;
isCID = false;
}
} else if ("embed".equals(localName)) {
try {
- returnFont.setEmbedURI(URIResolverWrapper.cleanURI(attributes.getValue("file")));
+ returnFont.setEmbedURI(InternalResourceResolver.cleanURI(attributes.getValue("file")));
} catch (URISyntaxException e) {
// TODO: dunno what to do here?!?!
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontSetup.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontSetup.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontSetup.java Fri Jun 15 08:52:00 2012
@@ -22,7 +22,7 @@ package org.apache.fop.fonts;
// FOP (base 14 fonts)
import java.util.List;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.base14.Courier;
import org.apache.fop.fonts.base14.CourierBold;
import org.apache.fop.fonts.base14.CourierBoldOblique;
@@ -69,11 +69,11 @@ public final class FontSetup {
*
* @param fontInfo the font info object to set up
* @param embedFontInfoList a list of EmbedFontInfo objects
- * @param resolver the font resolver
+ * @param resourceResolver the font resolver
* @param base14Kerning true if base14 kerning applies
*/
public static void setup(FontInfo fontInfo, List embedFontInfoList,
- URIResolverWrapper resolver, boolean base14Kerning) {
+ InternalResourceResolver resourceResolver, boolean base14Kerning) {
fontInfo.addMetrics("F1", new Helvetica(base14Kerning));
fontInfo.addMetrics("F2", new HelveticaOblique(base14Kerning));
fontInfo.addMetrics("F3", new HelveticaBold(base14Kerning));
@@ -179,7 +179,7 @@ public final class FontSetup {
final int startNum = 15;
/* Add configured fonts */
- addConfiguredFonts(fontInfo, embedFontInfoList, startNum, resolver, base14Kerning);
+ addConfiguredFonts(fontInfo, embedFontInfoList, startNum, resourceResolver, base14Kerning);
}
/**
@@ -187,15 +187,15 @@ public final class FontSetup {
* @param fontInfo the font info to set up
* @param embedFontInfoList a list of EmbedFontInfo objects
* @param num starting index for internal font numbering
- * @param resolver the font resolver
+ * @param resourceResolver the font resolver
*/
private static void addConfiguredFonts(FontInfo fontInfo,
- List<EmbedFontInfo> embedFontInfoList, int num, URIResolverWrapper resolver,
+ List<EmbedFontInfo> embedFontInfoList, int num, InternalResourceResolver resourceResolver,
boolean base14Kerning) {
if (embedFontInfoList == null) {
return; //No fonts to process
}
- assert resolver != null;
+ assert resourceResolver != null;
String internalName = null;
@@ -203,7 +203,7 @@ public final class FontSetup {
internalName = "F" + num;
num++;
- LazyFont font = new LazyFont(embedFontInfo, resolver, false);
+ LazyFont font = new LazyFont(embedFontInfo, resourceResolver, false);
fontInfo.addMetrics(internalName, font);
List<FontTriplet> triplets = embedFontInfo.getFontTriplets();
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/LazyFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/LazyFont.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/LazyFont.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/LazyFont.java Fri Jun 15 08:52:00 2012
@@ -30,7 +30,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.complexscripts.fonts.Positionable;
import org.apache.fop.complexscripts.fonts.Substitutable;
@@ -48,7 +48,7 @@ public class LazyFont extends Typeface i
private final EncodingMode encodingMode;
private final boolean embedded;
private final String subFontName;
- private final URIResolverWrapper resolver;
+ private final InternalResourceResolver resourceResolver;
private boolean isMetricsLoaded;
private Typeface realFont;
@@ -57,13 +57,14 @@ public class LazyFont extends Typeface i
/**
* Main constructor
* @param fontInfo the font info to embed
- * @param resolver the font resolver to handle font URIs
+ * @param resourceResolver the font resolver to handle font URIs
*/
- public LazyFont(EmbedFontInfo fontInfo, URIResolverWrapper resolver, boolean useComplexScripts) {
+ public LazyFont(EmbedFontInfo fontInfo, InternalResourceResolver resourceResolver,
+ boolean useComplexScripts) {
this.metricsURI = fontInfo.getMetricsURI();
this.fontEmbedURI = fontInfo.getEmbedURI();
this.useKerning = fontInfo.getKerning();
- if (resolver != null) {
+ if (resourceResolver != null) {
this.useAdvanced = useComplexScripts;
} else {
this.useAdvanced = fontInfo.getAdvanced();
@@ -72,7 +73,7 @@ public class LazyFont extends Typeface i
: EncodingMode.AUTO;
this.subFontName = fontInfo.getSubFontName();
this.embedded = fontInfo.isEmbedded();
- this.resolver = resolver;
+ this.resourceResolver = resourceResolver;
}
/** {@inheritDoc} */
@@ -93,10 +94,10 @@ public class LazyFont extends Typeface i
if (metricsURI != null) {
/**@todo Possible thread problem here */
FontReader reader = null;
- InputStream in = resolver.resolveIn(metricsURI);
+ InputStream in = resourceResolver.getResource(metricsURI);
InputSource src = new InputSource(in);
src.setSystemId(metricsURI.toASCIIString());
- reader = new FontReader(src, resolver);
+ reader = new FontReader(src, resourceResolver);
reader.setKerningEnabled(useKerning);
reader.setAdvancedEnabled(useAdvanced);
if (this.embedded) {
@@ -108,7 +109,7 @@ public class LazyFont extends Typeface i
throw new RuntimeException("Cannot load font. No font URIs available.");
}
realFont = FontLoader.loadFont(fontEmbedURI, this.subFontName,
- this.embedded, this.encodingMode, useKerning, useAdvanced, resolver);
+ this.embedded, this.encodingMode, useKerning, useAdvanced, resourceResolver);
}
if (realFont instanceof FontDescriptor) {
realFontDescriptor = (FontDescriptor) realFont;
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/MultiByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/MultiByteFont.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/MultiByteFont.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/MultiByteFont.java Fri Jun 15 08:52:00 2012
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.complexscripts.fonts.GlyphDefinitionTable;
import org.apache.fop.complexscripts.fonts.GlyphPositioningTable;
import org.apache.fop.complexscripts.fonts.GlyphSubstitutionTable;
@@ -75,10 +75,10 @@ public class MultiByteFont extends CIDFo
private int lastUnmapped;
/**
- * @param resolver the URI resolver for controlling file access
+ * @param resourceResolver the resource resolver for accessing the font
*/
- public MultiByteFont(URIResolverWrapper resolver) {
- super(resolver);
+ public MultiByteFont(InternalResourceResolver resourceResolver) {
+ super(resourceResolver);
subset.setupFirstGlyph();
setFontType(FontType.TYPE0);
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/SingleByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/SingleByteFont.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/SingleByteFont.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/SingleByteFont.java Fri Jun 15 08:52:00 2012
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.fonts.Glyphs;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
/**
* Generic SingleByte font
@@ -52,10 +52,10 @@ public class SingleByteFont extends Cust
/**
- * @param resolver the URI resolver for controlling file access
+ * @param resourceResolver the URI resolver for controlling file access
*/
- public SingleByteFont(URIResolverWrapper resolver) {
- super(resolver);
+ public SingleByteFont(InternalResourceResolver resourceResolver) {
+ super(resourceResolver);
setEncoding(CodePointMapping.WIN_ANSI_ENCODING);
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java Fri Jun 15 08:52:00 2012
@@ -30,7 +30,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.CustomFont;
import org.apache.fop.fonts.EmbedFontInfo;
import org.apache.fop.fonts.EncodingMode;
@@ -131,15 +131,8 @@ public class FontInfoFinder {
return style;
}
- /**
- * Attempts to determine FontInfo from a given custom font
- * @param fontUri the font URI
- * @param customFont the custom font
- * @param fontCache font cache (may be null)
- * @return FontInfo from the given custom font
- */
private EmbedFontInfo getFontInfoFromCustomFont(URI fontUri, CustomFont customFont,
- FontCache fontCache, URIResolverWrapper resolver) {
+ FontCache fontCache, InternalResourceResolver resourceResolver) {
List<FontTriplet> fontTripletList = new java.util.ArrayList<FontTriplet>();
generateTripletsFromFont(customFont, fontTripletList);
String subFontName = null;
@@ -150,7 +143,7 @@ public class FontInfoFinder {
customFont.isAdvancedEnabled(), fontTripletList, fontUri, subFontName);
fontInfo.setPostScriptName(customFont.getFontName());
if (fontCache != null) {
- fontCache.addFont(fontInfo, resolver);
+ fontCache.addFont(fontInfo, resourceResolver);
}
return fontInfo;
}
@@ -159,13 +152,13 @@ public class FontInfoFinder {
* Attempts to determine EmbedFontInfo from a given font file.
*
* @param fontURI the URI of the font resource
- * @param resolver font resolver used to resolve font
+ * @param resourceResolver font resolver used to resolve font
* @param fontCache font cache (may be null)
* @return an array of newly created embed font info. Generally, this array
* will have only one entry, unless the fontUrl is a TrueType Collection
*/
- public EmbedFontInfo[] find(URI fontURI, URIResolverWrapper resolver, FontCache fontCache) {
- URI embedUri = resolver.getBaseURI().resolve(fontURI);
+ public EmbedFontInfo[] find(URI fontURI, InternalResourceResolver resourceResolver, FontCache fontCache) {
+ URI embedUri = resourceResolver.resolveFromBase(fontURI);
String embedStr = embedUri.toASCIIString();
boolean useKerning = true;
boolean useAdvanced = true;
@@ -196,7 +189,7 @@ public class FontInfoFinder {
List<String> ttcNames = null;
InputStream in = null;
try {
- in = resolver.resolveIn(fontURI);
+ in = resourceResolver.getResource(fontURI);
TTFFile ttf = new TTFFile(false, false);
FontFileReader reader = new FontFileReader(in);
ttcNames = ttf.getTTCnames(reader);
@@ -219,7 +212,7 @@ public class FontInfoFinder {
}
try {
TTFFontLoader ttfLoader = new TTFFontLoader(fontURI, fontName, true,
- EncodingMode.AUTO, useKerning, useAdvanced, resolver);
+ EncodingMode.AUTO, useKerning, useAdvanced, resourceResolver);
customFont = ttfLoader.getFont();
if (this.eventListener != null) {
customFont.setEventListener(this.eventListener);
@@ -235,7 +228,7 @@ public class FontInfoFinder {
continue;
}
EmbedFontInfo fi = getFontInfoFromCustomFont(fontURI, customFont, fontCache,
- resolver);
+ resourceResolver);
if (fi != null) {
embedFontInfoList.add(fi);
}
@@ -246,7 +239,7 @@ public class FontInfoFinder {
// The normal case
try {
customFont = FontLoader.loadFont(fontURI, null, true, EncodingMode.AUTO,
- useKerning, useAdvanced, resolver);
+ useKerning, useAdvanced, resourceResolver);
if (this.eventListener != null) {
customFont.setEventListener(this.eventListener);
}
@@ -260,7 +253,7 @@ public class FontInfoFinder {
}
return null;
}
- EmbedFontInfo fi = getFontInfoFromCustomFont(fontURI, customFont, fontCache, resolver);
+ EmbedFontInfo fi = getFontInfoFromCustomFont(fontURI, customFont, fontCache, resourceResolver);
if (fi != null) {
return new EmbedFontInfo[] {fi};
} else {
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java Fri Jun 15 08:52:00 2012
@@ -31,7 +31,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.xmlgraphics.fonts.Glyphs;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.BFEntry;
import org.apache.fop.fonts.CIDFontType;
import org.apache.fop.fonts.EncodingMode;
@@ -54,10 +54,10 @@ public class TTFFontLoader extends FontL
/**
* Default constructor
* @param fontFileURI the URI representing the font file
- * @param resolver the FontResolver for font URI resolution
+ * @param resourceResolver the resource resolver for font URI resolution
*/
- public TTFFontLoader(URI fontFileURI, URIResolverWrapper resolver) {
- this(fontFileURI, null, true, EncodingMode.AUTO, true, true, resolver);
+ public TTFFontLoader(URI fontFileURI, InternalResourceResolver resourceResolver) {
+ this(fontFileURI, null, true, EncodingMode.AUTO, true, true, resourceResolver);
}
/**
@@ -73,7 +73,7 @@ public class TTFFontLoader extends FontL
*/
public TTFFontLoader(URI fontFileURI, String subFontName,
boolean embedded, EncodingMode encodingMode, boolean useKerning,
- boolean useAdvanced, URIResolverWrapper resolver) {
+ boolean useAdvanced, InternalResourceResolver resolver) {
super(fontFileURI, embedded, useKerning, useAdvanced, resolver);
this.subFontName = subFontName;
this.encodingMode = encodingMode;
@@ -95,7 +95,7 @@ public class TTFFontLoader extends FontL
* @throws IOException if an I/O error occurs
*/
private void read(String ttcFontName) throws IOException {
- InputStream in = resolver.resolveIn(this.fontFileURI);
+ InputStream in = resourceResolver.getResource(this.fontFileURI);
try {
TTFFile ttf = new TTFFile(useKerning, useAdvanced);
FontFileReader reader = new FontFileReader(in);
@@ -123,11 +123,11 @@ public class TTFFontLoader extends FontL
}
if (isCid) {
- multiFont = new MultiByteFont(resolver);
+ multiFont = new MultiByteFont(resourceResolver);
returnFont = multiFont;
multiFont.setTTCName(ttcFontName);
} else {
- singleFont = new SingleByteFont(resolver);
+ singleFont = new SingleByteFont(resourceResolver);
returnFont = singleFont;
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java?rev=1350538&r1=1350537&r2=1350538&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java Fri Jun 15 08:52:00 2012
@@ -30,7 +30,7 @@ import java.util.Set;
import org.apache.commons.io.IOUtils;
-import org.apache.fop.apps.io.URIResolverWrapper;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.CodePointMapping;
import org.apache.fop.fonts.FontLoader;
import org.apache.fop.fonts.FontType;
@@ -49,12 +49,12 @@ public class Type1FontLoader extends Fon
* @param fontFileURI the URI to the PFB file of a Type 1 font
* @param embedded indicates whether the font is embedded or referenced
* @param useKerning indicates whether to load kerning information if available
- * @param resolver the font resolver used to resolve URIs
+ * @param resourceResolver the font resolver used to resolve URIs
* @throws IOException In case of an I/O error
*/
public Type1FontLoader(URI fontFileURI, boolean embedded, boolean useKerning,
- URIResolverWrapper resolver) throws IOException {
- super(fontFileURI, embedded, useKerning, true, resolver);
+ InternalResourceResolver resourceResolver) throws IOException {
+ super(fontFileURI, embedded, useKerning, true, resourceResolver);
}
private String getPFMURI(String pfbURI) {
@@ -79,7 +79,7 @@ public class Type1FontLoader extends Fon
for (int i = 0; i < AFM_EXTENSIONS.length; i++) {
try {
afmUri = partialAfmUri + AFM_EXTENSIONS[i];
- afmIn = resolver.resolveIn(afmUri);
+ afmIn = resourceResolver.getResource(afmUri);
if (afmIn != null) {
break;
}
@@ -102,7 +102,7 @@ public class Type1FontLoader extends Fon
String pfmUri = getPFMURI(fontFileStr);
InputStream pfmIn = null;
try {
- pfmIn = resolver.resolveIn(pfmUri);
+ pfmIn = resourceResolver.getResource(pfmUri);
} catch (IOException ioe) {
// Ignore, PFM probably not available under the URI
} catch (URISyntaxException e) {
@@ -134,7 +134,7 @@ public class Type1FontLoader extends Fon
if (afm == null && pfm == null) {
throw new IllegalArgumentException("Need at least an AFM or a PFM!");
}
- singleFont = new SingleByteFont(resolver);
+ singleFont = new SingleByteFont(resourceResolver);
singleFont.setFontType(FontType.TYPE1);
if (this.embedded) {
singleFont.setEmbedURI(this.fontFileURI);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org