Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/hyphenation/Hyphenator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/hyphenation/Hyphenator.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/hyphenation/Hyphenator.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/hyphenation/Hyphenator.java Fri Jun 15 08:52:00 2012 @@ -32,7 +32,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; /** * <p>This class is the main entry point to the hyphenation package. @@ -69,12 +69,12 @@ public final class Hyphenator { * The hyphenation trees are cached. * @param lang the language * @param country the country (may be null or "none") - * @param resolver resolver to find the hyphenation files + * @param resourceResolver resolver to find the hyphenation files * @param hyphPatNames the map with user-configured hyphenation pattern file names * @return the hyphenation tree */ public static HyphenationTree getHyphenationTree(String lang, - String country, URIResolverWrapper resolver, Map hyphPatNames) { + String country, InternalResourceResolver resourceResolver, Map hyphPatNames) { String llccKey = HyphenationTreeCache.constructLlccKey(lang, country); HyphenationTreeCache cache = getHyphenationTreeCache(); @@ -83,13 +83,13 @@ public final class Hyphenator { return null; } - HyphenationTree hTree = getHyphenationTree2(lang, country, resolver, hyphPatNames); + HyphenationTree hTree = getHyphenationTree2(lang, country, resourceResolver, hyphPatNames); // fallback to lang only if (hTree == null && country != null && !country.equals("none")) { String llKey = HyphenationTreeCache.constructLlccKey(lang, null); if (!cache.isMissing(llKey)) { - hTree = getHyphenationTree2(lang, null, resolver, hyphPatNames); + hTree = getHyphenationTree2(lang, null, resourceResolver, hyphPatNames); if (hTree != null && log.isDebugEnabled()) { log.debug("Couldn't find hyphenation pattern " + "for lang=\"" + lang + "\",country=\"" + country + "\"." @@ -125,12 +125,12 @@ public final class Hyphenator { * The hyphenation trees are cached. * @param lang the language * @param country the country (may be null or "none") - * @param resolver resolver to find the hyphenation files + * @param resourceResolver resource resolver to find the hyphenation files * @param hyphPatNames the map with user-configured hyphenation pattern file names * @return the hyphenation tree */ public static HyphenationTree getHyphenationTree2(String lang, - String country, URIResolverWrapper resolver, Map hyphPatNames) { + String country, InternalResourceResolver resourceResolver, Map hyphPatNames) { String llccKey = HyphenationTreeCache.constructLlccKey(lang, country); HyphenationTreeCache cache = getHyphenationTreeCache(); @@ -146,8 +146,8 @@ public final class Hyphenator { key = llccKey; } - if (resolver != null) { - hTree = getUserHyphenationTree(key, resolver); + if (resourceResolver != null) { + hTree = getUserHyphenationTree(key, resourceResolver); } if (hTree == null) { hTree = getFopHyphenationTree(key); @@ -229,11 +229,11 @@ public final class Hyphenator { * Load tree from serialized file or xml file * using configuration settings * @param key language key for the requested hyphenation file - * @param resolver resolver to find the hyphenation files + * @param resourceResolver resource resolver to find the hyphenation files * @return the requested HypenationTree or null if it is not available */ public static HyphenationTree getUserHyphenationTree(String key, - URIResolverWrapper resolver) { + InternalResourceResolver resourceResolver) { HyphenationTree hTree = null; // I use here the following convention. The file name specified in // the configuration is taken as the base name. First we try @@ -243,7 +243,7 @@ public final class Hyphenator { // first try serialized object String name = key + ".hyp"; try { - InputStream in = getHyphenationTreeStream(name, resolver); + InputStream in = getHyphenationTreeStream(name, resourceResolver); try { hTree = readHyphenationTree(in); } finally { @@ -260,7 +260,7 @@ public final class Hyphenator { name = key + ".xml"; hTree = new HyphenationTree(); try { - InputStream in = getHyphenationTreeStream(name, resolver); + InputStream in = getHyphenationTreeStream(name, resourceResolver); try { InputSource src = new InputSource(in); src.setSystemId(name); @@ -284,10 +284,10 @@ public final class Hyphenator { } } - private static InputStream getHyphenationTreeStream(String name, URIResolverWrapper resolver) - throws IOException { + private static InputStream getHyphenationTreeStream(String name, + InternalResourceResolver resourceResolver) throws IOException { try { - return new BufferedInputStream(resolver.resolveIn(name)); + return new BufferedInputStream(resourceResolver.getResource(name)); } catch (URISyntaxException use) { log.debug("An exception was thrown while attempting to load " + name, use); } @@ -298,7 +298,7 @@ public final class Hyphenator { * Hyphenates a word. * @param lang the language * @param country the optional country code (may be null or "none") - * @param resolver resolver to find the hyphenation files + * @param resourceResolver resource resolver to find the hyphenation files * @param hyphPatNames the map with user-configured hyphenation pattern file names * @param word the word to hyphenate * @param leftMin the minimum number of characters before the hyphenation point @@ -306,8 +306,9 @@ public final class Hyphenator { * @return the hyphenation result */ public static Hyphenation hyphenate(String lang, String country, - URIResolverWrapper resolver, Map hyphPatNames, String word, int leftMin, int rightMin) { - HyphenationTree hTree = getHyphenationTree(lang, country, resolver, hyphPatNames); + InternalResourceResolver resourceResolver, Map hyphPatNames, String word, int leftMin, + int rightMin) { + HyphenationTree hTree = getHyphenationTree(lang, country, resourceResolver, hyphPatNames); if (hTree == null) { return null; }
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Fri Jun 15 08:52:00 2012 @@ -1398,7 +1398,7 @@ public class LineLayoutManager extends I // on an inline or wrapper below the block level. Hyphenation hyph = Hyphenator.hyphenate(hyphenationProperties.language.getString(), hyphenationProperties.country.getString(), - getFObj().getUserAgent().getNewURIResolver(), + getFObj().getUserAgent().getResourceResolver(), getFObj().getUserAgent().getHyphPatNames(), sbChars.toString(), hyphenationProperties.hyphenationRemainCharacterCount.getValue(), Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRenderer.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRenderer.java Fri Jun 15 08:52:00 2012 @@ -92,7 +92,7 @@ public abstract class PrintRenderer exte FontManager fontManager = userAgent.getFontManager(); FontCollection[] fontCollections = new FontCollection[] { new Base14FontCollection(fontManager.isBase14KerningEnabled()), - new CustomFontCollection(fontManager.getURIResolver(), getFontList(), + new CustomFontCollection(fontManager.getResourceResolver(), getFontList(), userAgent.isComplexScriptFeaturesEnabled()) }; fontManager.setup(getFontInfo(), fontCollections); Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRendererConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRendererConfigurator.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRendererConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/PrintRendererConfigurator.java Fri Jun 15 08:52:00 2012 @@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFac import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; -import org.apache.fop.apps.io.URIResolverWrapper; +import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.fonts.CustomFontCollection; import org.apache.fop.fonts.DefaultFontConfigurator; import org.apache.fop.fonts.EmbedFontInfo; @@ -108,13 +108,13 @@ public abstract class PrintRendererConfi public void setupFontInfo(String mimeType, FontInfo fontInfo) throws FOPException { FontManager fontManager = userAgent.getFontManager(); List<FontCollection> fontCollections = getDefaultFontCollection(); - fontCollections.add(getCustomFontCollection(fontManager.getURIResolver(), mimeType)); + fontCollections.add(getCustomFontCollection(fontManager.getResourceResolver(), mimeType)); fontManager.setup(fontInfo, fontCollections.toArray(new FontCollection[fontCollections.size()])); } protected abstract List<FontCollection> getDefaultFontCollection(); - protected FontCollection getCustomFontCollection(URIResolverWrapper uriResolverWrapper, String mimeType) + protected FontCollection getCustomFontCollection(InternalResourceResolver resolver, String mimeType) throws FOPException { List<EmbedFontInfo> fontList; if (rendererConfigParser == null) { @@ -122,12 +122,12 @@ public abstract class PrintRendererConfi } else { fontList = fontInfoConfigurator.configure(getRendererConfig(mimeType).getFontInfoConfig()); } - return createCollectionFromFontList(uriResolverWrapper, fontList); + return createCollectionFromFontList(resolver, fontList); } - protected FontCollection createCollectionFromFontList(URIResolverWrapper uriResolverWrapper, + protected FontCollection createCollectionFromFontList(InternalResourceResolver resolver, List<EmbedFontInfo> fontList) { - return new CustomFontCollection(uriResolverWrapper, fontList, + return new CustomFontCollection(resolver, fontList, userAgent.isComplexScriptFeaturesEnabled()); } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java Fri Jun 15 08:52:00 2012 @@ -104,7 +104,7 @@ public class AFPDocumentHandler extends */ public AFPDocumentHandler(IFContext context) { super(context); - this.resourceManager = new AFPResourceManager(context.getUserAgent().getNewURIResolver()); + this.resourceManager = new AFPResourceManager(context.getUserAgent().getResourceResolver()); this.paintingState = new AFPPaintingState(); this.unitConv = paintingState.getUnitConverter(); } @@ -386,7 +386,7 @@ public class AFPDocumentHandler extends } else if (extension instanceof AFPIncludeFormMap) { AFPIncludeFormMap formMap = (AFPIncludeFormMap)extension; AFPResourceAccessor accessor = new AFPResourceAccessor( - getUserAgent().getNewURIResolver()); + getUserAgent().getResourceResolver()); try { getResourceManager().createIncludedResource(formMap.getName(), formMap.getSrc(), accessor, Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPFontConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPFontConfig.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPFontConfig.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPFontConfig.java Fri Jun 15 08:52:00 2012 @@ -40,7 +40,7 @@ import org.apache.fop.afp.fonts.OutlineF import org.apache.fop.afp.fonts.RasterFont; import org.apache.fop.afp.util.AFPResourceAccessor; import org.apache.fop.apps.FOPException; -import org.apache.fop.apps.io.URIResolverWrapper; +import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.events.EventProducer; import org.apache.fop.fonts.FontConfig; import org.apache.fop.fonts.FontManager; @@ -302,11 +302,11 @@ public final class AFPFontConfig impleme return font != null ? new AFPFontInfo(font, config.triplets) : null; } - abstract AFPFontInfo getFontInfo(URIResolverWrapper resolver, AFPEventProducer eventProducer) - throws IOException; + abstract AFPFontInfo getFontInfo(InternalResourceResolver resourceResolver, + AFPEventProducer eventProducer) throws IOException; - AFPResourceAccessor getAccessor(URIResolverWrapper resolver) { - return new AFPResourceAccessor(resolver, uri); + AFPResourceAccessor getAccessor(InternalResourceResolver resourceResolver) { + return new AFPResourceAccessor(resourceResolver, uri); } } @@ -324,9 +324,9 @@ public final class AFPFontConfig impleme } @Override - AFPFontInfo getFontInfo(URIResolverWrapper resolver, AFPEventProducer eventProducer) + AFPFontInfo getFontInfo(InternalResourceResolver resourceResolver, AFPEventProducer eventProducer) throws IOException { - AFPResourceAccessor accessor = getAccessor(resolver); + AFPResourceAccessor accessor = getAccessor(resourceResolver); CharacterSet characterSet = CharacterSetBuilder.getDoubleByteInstance().buildDBCS( characterset, super.codePage, super.encoding, charsetType, accessor, eventProducer); return getFontInfo(new DoubleByteFont(super.codePage, super.embeddable, characterSet), @@ -346,7 +346,7 @@ public final class AFPFontConfig impleme } @Override - AFPFontInfo getFontInfo(URIResolverWrapper resolver, AFPEventProducer eventProducer) + AFPFontInfo getFontInfo(InternalResourceResolver resourceResolver, AFPEventProducer eventProducer) throws IOException { CharacterSet characterSet = null; if (base14 != null) { @@ -370,7 +370,7 @@ public final class AFPFontConfig impleme LOG.error(msg); } } else { - AFPResourceAccessor accessor = getAccessor(resolver); + AFPResourceAccessor accessor = getAccessor(resourceResolver); characterSet = CharacterSetBuilder.getSingleByteInstance().buildSBCS( characterset, super.codePage, super.encoding, accessor, eventProducer); } @@ -389,7 +389,7 @@ public final class AFPFontConfig impleme } @Override - AFPFontInfo getFontInfo(URIResolverWrapper resolver, AFPEventProducer eventProducer) + AFPFontInfo getFontInfo(InternalResourceResolver resourceResolver, AFPEventProducer eventProducer) throws IOException { RasterFont rasterFont = new RasterFont(super.name, super.embeddable); for (RasterCharactersetData charset : charsets) { @@ -415,7 +415,7 @@ public final class AFPFontConfig impleme LOG.error(msg); } } else { - AFPResourceAccessor accessor = getAccessor(resolver); + AFPResourceAccessor accessor = getAccessor(resourceResolver); rasterFont.addCharacterSet(charset.size, CharacterSetBuilder.getSingleByteInstance().buildSBCS(charset.characterset, super.codePage, super.encoding, accessor, eventProducer)); Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPPainter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPPainter.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPPainter.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPPainter.java Fri Jun 15 08:52:00 2012 @@ -203,7 +203,7 @@ public class AFPPainter extends Abstract //Do we need to embed an external page segment? if (pageSegment.getURI() != null) { AFPResourceAccessor accessor = new AFPResourceAccessor( - documentHandler.getUserAgent().getNewURIResolver()); + documentHandler.getUserAgent().getResourceResolver()); try { URI resourceUri = new URI(pageSegment.getURI()); documentHandler.getResourceManager().createIncludedResourceFromExternal( Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java Fri Jun 15 08:52:00 2012 @@ -32,7 +32,7 @@ import org.apache.fop.afp.fonts.AFPFontC import org.apache.fop.afp.fonts.AFPFontInfo; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; -import org.apache.fop.apps.io.URIResolverWrapper; +import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.fonts.FontCollection; import org.apache.fop.render.PrintRendererConfigurator; import org.apache.fop.render.RendererConfig.RendererConfigParser; @@ -128,7 +128,7 @@ public class AFPRendererConfigurator ext } @Override - protected FontCollection getCustomFontCollection(URIResolverWrapper uriResolverWrapper, + protected FontCollection getCustomFontCollection(InternalResourceResolver uriResolverWrapper, String mimeType) throws FOPException { AFPRendererConfig config = (AFPRendererConfig) getRendererConfig(mimeType); if (config != null) { @@ -150,7 +150,7 @@ public class AFPRendererConfigurator ext throws FOPException, IOException { List<AFPFontInfo> afpFonts = new ArrayList<AFPFontInfo>(); for (AFPFontConfigData config : fontConfig.getFontConfig()) { - afpFonts.add(config.getFontInfo(userAgent.getFontManager().getURIResolver(), + afpFonts.add(config.getFontInfo(userAgent.getFontManager().getResourceResolver(), eventProducer)); } return afpFonts; Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java Fri Jun 15 08:52:00 2012 @@ -24,7 +24,7 @@ import java.util.List; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; -import org.apache.fop.apps.io.URIResolverWrapper; +import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.fonts.EmbedFontInfo; import org.apache.fop.fonts.FontCollection; import org.apache.fop.render.RendererConfig.RendererConfigParser; @@ -85,9 +85,9 @@ public class BitmapRendererConfigurator } @Override - protected FontCollection createCollectionFromFontList(URIResolverWrapper uriResolverWrapper, + protected FontCollection createCollectionFromFontList(InternalResourceResolver resourceResolver, List<EmbedFontInfo> fontList) { - return new ConfiguredFontCollection(uriResolverWrapper, fontList, userAgent.isComplexScriptFeaturesEnabled()); + return new ConfiguredFontCollection(resourceResolver, fontList, userAgent.isComplexScriptFeaturesEnabled()); } @Override Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java Fri Jun 15 08:52:00 2012 @@ -64,7 +64,7 @@ public abstract class AbstractBinaryWrit } try { URI resultURI = URI.create(streamResult.getSystemId()); - out = new BufferedOutputStream(getUserAgent().getNewURIResolver().resolveOut(resultURI)); + out = new BufferedOutputStream(getUserAgent().getResourceResolver().getOutputStream(resultURI)); } catch (IOException ioe) { throw new IFException("I/O error while opening output stream" , ioe); } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java Fri Jun 15 08:52:00 2012 @@ -26,7 +26,7 @@ import java.util.List; 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; @@ -43,19 +43,19 @@ public class ConfiguredFontCollection im private static Log log = LogFactory.getLog(ConfiguredFontCollection.class); - private final URIResolverWrapper uriResolver; + private final InternalResourceResolver resourceResolver; private final List<EmbedFontInfo> embedFontInfoList; private final boolean useComplexScripts; /** * Main constructor - * @param uriResolver a font resolver + * @param resourceResolver a font resolver * @param customFonts the list of custom fonts * @param useComplexScriptFeatures true if complex script features enabled */ - public ConfiguredFontCollection(URIResolverWrapper uriResolver, + public ConfiguredFontCollection(InternalResourceResolver resourceResolver, List<EmbedFontInfo> customFonts, boolean useComplexScriptFeatures) { - this.uriResolver = uriResolver; + this.resourceResolver = resourceResolver; this.embedFontInfoList = customFonts; this.useComplexScripts = useComplexScriptFeatures; } @@ -78,14 +78,14 @@ public class ConfiguredFontCollection im // If the user specified an XML-based metrics file, we'll use it // Otherwise, calculate metrics directly from the font file. if (metricsURI != null) { - LazyFont fontMetrics = new LazyFont(configFontInfo, uriResolver, useComplexScripts); - InputStream fontSource = uriResolver.resolveIn(fontURI); + LazyFont fontMetrics = new LazyFont(configFontInfo, resourceResolver, useComplexScripts); + InputStream fontSource = resourceResolver.getResource(fontURI); font = new CustomFontMetricsMapper(fontMetrics, fontSource); } else { CustomFont fontMetrics = FontLoader.loadFont( fontURI, null, true, EncodingMode.AUTO, configFontInfo.getKerning(), - configFontInfo.getAdvanced(), uriResolver); + configFontInfo.getAdvanced(), resourceResolver); font = new CustomFontMetricsMapper(fontMetrics); } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/Java2DRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Fri Jun 15 08:52:00 2012 @@ -180,7 +180,7 @@ public abstract class Java2DRenderer ext FontCollection[] fontCollections = new FontCollection[] { new Base14FontCollection(java2DFontMetrics), new InstalledFontCollection(java2DFontMetrics), - new ConfiguredFontCollection(fontManager.getURIResolver(), getFontList(), + new ConfiguredFontCollection(fontManager.getResourceResolver(), getFontList(), userAgent.isComplexScriptFeaturesEnabled()) }; fontManager.setup(getFontInfo(), fontCollections); Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java Fri Jun 15 08:52:00 2012 @@ -23,7 +23,7 @@ import java.util.List; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; -import org.apache.fop.apps.io.URIResolverWrapper; +import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.fonts.EmbedFontInfo; import org.apache.fop.fonts.FontCollection; import org.apache.fop.render.PrintRendererConfigurator; @@ -81,9 +81,9 @@ public class PCLRendererConfigurator ext } @Override - protected FontCollection createCollectionFromFontList(URIResolverWrapper uriResolverWrapper, + protected FontCollection createCollectionFromFontList(InternalResourceResolver resourceResolver, List<EmbedFontInfo> fontList) { - return new ConfiguredFontCollection(uriResolverWrapper, fontList, + return new ConfiguredFontCollection(resourceResolver, fontList, userAgent.isComplexScriptFeaturesEnabled()); } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/PSDocumentHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/PSDocumentHandler.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/PSDocumentHandler.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/PSDocumentHandler.java Fri Jun 15 08:52:00 2012 @@ -149,7 +149,7 @@ public class PSDocumentHandler extends A final OutputStream out; if (psUtil.isOptimizeResources()) { tempURI = TEMP_URI_GENERATOR.generate(); - out = new BufferedOutputStream(getUserAgent().getNewURIResolver().resolveOut(tempURI)); + out = new BufferedOutputStream(getUserAgent().getResourceResolver().getOutputStream(tempURI)); } else { out = this.outputStream; } @@ -256,7 +256,7 @@ public class PSDocumentHandler extends A log.debug("Processing PostScript resources..."); long startTime = System.currentTimeMillis(); ResourceTracker resTracker = gen.getResourceTracker(); - InputStream in = new BufferedInputStream(getUserAgent().getNewURIResolver().resolveIn(tempURI)); + InputStream in = new BufferedInputStream(getUserAgent().getResourceResolver().getResource(tempURI)); try { try { ResourceHandler handler = new ResourceHandler(getUserAgent(), this.fontInfo, Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/rtf/RTFHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/rtf/RTFHandler.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/rtf/RTFHandler.java Fri Jun 15 08:52:00 2012 @@ -168,7 +168,7 @@ public class RTFHandler extends FOEventH bDefer = true; boolean base14Kerning = false; - FontSetup.setup(fontInfo, null, userAgent.getNewURIResolver(), base14Kerning); + FontSetup.setup(fontInfo, null, userAgent.getResourceResolver(), base14Kerning); } /** Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java Fri Jun 15 08:52:00 2012 @@ -26,7 +26,7 @@ import org.apache.avalon.framework.confi import org.apache.fop.apps.FOPException; 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.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfigurator; import org.apache.fop.fonts.EmbedFontInfo; @@ -85,9 +85,9 @@ public class PDFDocumentGraphics2DConfig FontInfo fontInfo = new FontInfo(); final boolean strict = false; if (cfg != null) { - URIResolverWrapper resolver = ResourceResolverFactory.createDefaultWrapper(); + InternalResourceResolver resourceResolver = ResourceResolverFactory.createDefaultWrapper(); //TODO The following could be optimized by retaining the FontManager somewhere - FontManager fontManager = new FontManager(resolver, FontDetectorFactory.createDefault(), + FontManager fontManager = new FontManager(resourceResolver, FontDetectorFactory.createDefault(), FontCacheManagerFactory.createDefault()); //TODO Make use of fontBaseURL, font substitution and referencing configuration @@ -101,7 +101,7 @@ public class PDFDocumentGraphics2DConfig = new DefaultFontConfigurator(fontManager, listener, strict); List<EmbedFontInfo> fontInfoList = fontInfoConfigurator.configure(fontInfoConfig); fontManager.saveCache(); - FontSetup.setup(fontInfo, fontInfoList, resolver, useComplexScriptFeatures); + FontSetup.setup(fontInfo, fontInfoList, resourceResolver, useComplexScriptFeatures); } else { FontSetup.setup(fontInfo, useComplexScriptFeatures); } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/util/ColorSpaceCache.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/util/ColorSpaceCache.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/util/ColorSpaceCache.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/util/ColorSpaceCache.java Fri Jun 15 08:52:00 2012 @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac import org.apache.xmlgraphics.java2d.color.ICCColorSpaceWithIntent; import org.apache.xmlgraphics.java2d.color.RenderingIntent; -import org.apache.fop.apps.io.URIResolverWrapper; +import org.apache.fop.apps.io.InternalResourceResolver; /** * Map with cached ICC based ColorSpace objects. @@ -41,15 +41,15 @@ public class ColorSpaceCache { /** logger instance */ private static Log log = LogFactory.getLog(ColorSpaceCache.class); - private URIResolverWrapper resolver; + private InternalResourceResolver resourceResolver; private Map<String, ColorSpace> colorSpaceMap = Collections.synchronizedMap(new HashMap<String, ColorSpace>()); /** * Default constructor - * @param resolver uri resolver + * @param resourceResolver uri resolver */ - public ColorSpaceCache(URIResolverWrapper resolver) { - this.resolver = resolver; + public ColorSpaceCache(InternalResourceResolver resourceResolver) { + this.resourceResolver = resourceResolver; } /** @@ -77,7 +77,7 @@ public class ColorSpaceCache { ICC_Profile iccProfile = null; // First attempt to use the FOP URI resolver to locate the ICC // profile - InputStream stream = resolver.resolveIn(iccProfileSrc); + InputStream stream = resourceResolver.getResource(iccProfileSrc); if (stream != null) { // FOP URI resolver found ICC profile - create ICC profile // from the Source Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/sandbox/org/apache/fop/render/mif/MIFHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/sandbox/org/apache/fop/render/mif/MIFHandler.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/src/sandbox/org/apache/fop/render/mif/MIFHandler.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/src/sandbox/org/apache/fop/render/mif/MIFHandler.java Fri Jun 15 08:52:00 2012 @@ -90,7 +90,7 @@ public class MIFHandler extends FOEventH super(ua); outStream = os; boolean base14Kerning = false; //TODO - FIXME - FontSetup.setup(fontInfo, null, ua.getNewURIResolver(), base14Kerning); + FontSetup.setup(fontInfo, null, ua.getResourceResolver(), base14Kerning); } /** {@inheritDoc} */ Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java Fri Jun 15 08:52:00 2012 @@ -85,8 +85,8 @@ public class URIResolverWrapperTestCase @Test public void getBaseURI() throws URISyntaxException { - assertEquals(URIResolverWrapper.getBaseURI("x/y/z/"), new URI("x/y/z/")); - assertEquals(URIResolverWrapper.getBaseURI("x/y/z"), new URI("x/y/z/")); + assertEquals(InternalResourceResolver.getBaseURI("x/y/z/"), new URI("x/y/z/")); + assertEquals(InternalResourceResolver.getBaseURI("x/y/z"), new URI("x/y/z/")); } @Test @@ -94,19 +94,19 @@ public class URIResolverWrapperTestCase String[] uris = new String[] {".", "path/to/resource", "path\\to\\resource", "bad resource name"}; for (String uri : uris) { - assertEquals(URIResolverWrapper.cleanURI(uri), cleanURI(uri)); + assertEquals(InternalResourceResolver.cleanURI(uri), cleanURI(uri)); } - assertNull(URIResolverWrapper.cleanURI(null)); + assertNull(InternalResourceResolver.cleanURI(null)); } private void test(String uriStr, URI uri, URI expected) throws IOException, URISyntaxException { ResourceResolver resolver = mock(ResourceResolver.class); - URIResolverWrapper sut = new URIResolverWrapper(base, resolver); - sut.resolveIn(uriStr); + InternalResourceResolver sut = new InternalResourceResolver(base, resolver); + sut.getResource(uriStr); verify(resolver).getResource(eq(expected)); resolver = mock(ResourceResolver.class); - sut = new URIResolverWrapper(base, resolver); - sut.resolveIn(uri); + sut = new InternalResourceResolver(base, resolver); + sut.getResource(uri); verify(resolver).getResource(eq(expected)); } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java Fri Jun 15 08:52:00 2012 @@ -66,7 +66,7 @@ public class FontsSubstitutionTestCase e FontManager fontManager = ua.getFontManager(); FontCollection[] fontCollections = new FontCollection[] { new Base14FontCollection(fontManager.isBase14KerningEnabled()), - new CustomFontCollection(fontManager.getURIResolver(), renderer.getFontList(), + new CustomFontCollection(fontManager.getResourceResolver(), renderer.getFontList(), ua.isComplexScriptFeaturesEnabled()) }; fontManager.setup(fontInfo, fontCollections); Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java Fri Jun 15 08:52:00 2012 @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.apache.fop.apps.io.ResourceResolverFactory; -import org.apache.fop.apps.io.URIResolverWrapper; +import org.apache.fop.apps.io.InternalResourceResolver; import static org.junit.Assert.assertEquals; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEqu */ public class DejaVuLGCSerifTestCase { - private URIResolverWrapper resolver = new URIResolverWrapper(new File(".").toURI(), + private InternalResourceResolver resolver = new InternalResourceResolver(new File(".").toURI(), ResourceResolverFactory.createDefaultResourceResolver()); private CustomFont font; Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java Fri Jun 15 08:52:00 2012 @@ -71,14 +71,14 @@ public class FontManagerConfiguratorTest String actualBase = "../../resources/fonts/ttf/"; FontManager fontManager = setBaseAndGetManager(actualBase); URI expectedURI = baseURI.resolve(actualBase); - assertEquals(expectedURI, fontManager.getURIResolver().getBaseURI()); + assertEquals(expectedURI, fontManager.getResourceResolver().getBaseURI()); } @Test public void currentRelativeFontBaseTest() { String actualBase = "."; FontManager fontManager = setBaseAndGetManager(actualBase); - assertEquals(baseURI, fontManager.getURIResolver().getBaseURI()); + assertEquals(baseURI, fontManager.getResourceResolver().getBaseURI()); } /** @@ -93,7 +93,7 @@ public class FontManagerConfiguratorTest String actualBase = "non-existing-dir/"; FontManager fontManager = setBaseAndGetManager(actualBase); assertEquals(baseURI.resolve("non-existing-dir/"), - fontManager.getURIResolver().getBaseURI()); + fontManager.getResourceResolver().getBaseURI()); } /** @@ -105,13 +105,13 @@ public class FontManagerConfiguratorTest builder.setBaseURI(actualBase); FontManager fontManager = getManager(); assertEquals(baseURI.resolve(actualBase), - fontManager.getURIResolver().getBaseURI()); + fontManager.getResourceResolver().getBaseURI()); } @Test public void absoluteBaseURI() { String absoluteBase = "test:///absolute/"; FontManager fontManager = setBaseAndGetManager(absoluteBase); - assertEquals(URI.create(absoluteBase), fontManager.getURIResolver().getBaseURI()); + assertEquals(URI.create(absoluteBase), fontManager.getResourceResolver().getBaseURI()); } } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java Fri Jun 15 08:52:00 2012 @@ -26,7 +26,7 @@ import java.net.URI; import org.junit.Test; 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.EncodingMode; import static org.junit.Assert.assertFalse; @@ -42,7 +42,7 @@ public class TTFFontLoaderTestCase { boolean useComplexScriptFeatures = false; File file = new File("test/resources/fonts/ttf/DejaVuLGCSerif.ttf"); URI absoluteFilePath = file.toURI(); - URIResolverWrapper resolver = ResourceResolverFactory.createDefaultWrapper(); + InternalResourceResolver resolver = ResourceResolverFactory.createDefaultWrapper(); String fontName = "Deja Vu"; boolean embedded = false; boolean useKerning = true; Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java Fri Jun 15 08:52:00 2012 @@ -203,8 +203,8 @@ public class FOTreeTestCase { return delegate.getLayoutManagerMakerOverride(); } - public ResourceResolver getNewURIResolver() { - return delegate.getNewURIResolver(); + public ResourceResolver getResourceResolver() { + return delegate.getResourceResolver(); } public URI getBaseURI() { Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java?rev=1350538&r1=1350537&r2=1350538&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java Fri Jun 15 08:52:00 2012 @@ -22,7 +22,7 @@ package org.apache.fop.pdf; import org.junit.Test; 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.CIDSubset; import org.apache.fop.fonts.MultiByteFont; @@ -40,7 +40,7 @@ public class PDFFactoryTestCase { @Test public void testSubsetFontNamePrefix() { class MockedFont extends MultiByteFont { - public MockedFont(URIResolverWrapper resolver) { + public MockedFont(InternalResourceResolver resolver) { super(resolver); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
