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 me...@apache.org on 2012/06/22 10:27:45 UTC
svn commit: r1352800 - in /xmlgraphics/fop/branches/Temp_URI_Unification:
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/fonts/
src/java/org/apache/fop/apps/ src/java/org/apache/fop/apps/io/
src/java/org/apache/fop/fonts/ src/java/org/apache/...
Author: mehdi
Date: Fri Jun 22 08:27:42 2012
New Revision: 1352800
URL: http://svn.apache.org/viewvc?rev=1352800&view=rev
Log:
Predominantly clean up and javadocs, very little functional change here
Modified:
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceLevel.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/fonts/CharacterSet.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetType.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.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/FopFactory.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolver.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/fonts/FontManagerConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.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/truetype/TTFFontLoaderTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfiguratorTestCase.java
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceLevel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceLevel.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceLevel.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPResourceLevel.java Fri Jun 22 08:27:42 2012
@@ -145,18 +145,18 @@ public class AFPResourceLevel {
}
/**
- * Returns the destination file path of the external resource group file
+ * Returns the URI of the external resource group.
*
- * @return the destination file path of the external resource group file
+ * @return the destination URI of the external resource group
*/
- public URI getExternalUri() {
+ public URI getExternalURI() {
return this.extUri;
}
/**
- * Sets the external destination of the resource
+ * Sets the URI of the external resource group.
*
- * @param filePath the external resource group file
+ * @param filePath the URI of the external resource group
*/
public void setExternalUri(URI uri) {
this.extUri = uri;
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -34,8 +34,8 @@ 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.InternalResourceResolver;
+import org.apache.fop.apps.io.TempResourceURIGenerator;
/**
* Manages the streaming of the AFP output
@@ -119,7 +119,7 @@ public class AFPStreamer implements Stre
return null;
}
if (level.isExternal()) {
- URI uri = level.getExternalUri();
+ URI uri = level.getExternalURI();
if (uri == null) {
LOG.warn("No file path provided for external resource, using default.");
uri = defaultResourceGroupUri;
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSet.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSet.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSet.java Fri Jun 22 08:27:42 2012
@@ -115,7 +115,7 @@ public class CharacterSet {
}
this.codePage = codePage;
this.encoding = encoding;
- this.encoder = CharactersetEncoder.newInstance(encoding, charsetType);
+ this.encoder = charsetType.getEncoder(encoding);
this.accessor = accessor;
this.characterSetOrientations = new HashMap<String, CharacterSetOrientation>(4);
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java Fri Jun 22 08:27:42 2012
@@ -40,6 +40,7 @@ import org.apache.fop.afp.AFPConstants;
import org.apache.fop.afp.AFPEventProducer;
import org.apache.fop.afp.util.AFPResourceAccessor;
import org.apache.fop.afp.util.StructuredFieldReader;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.Typeface;
/**
@@ -148,7 +149,7 @@ public abstract class CharacterSetBuilde
throws IOException {
URI uri;
try {
- uri = new URI(uriStr.trim());
+ uri = InternalResourceResolver.cleanURI(uriStr.trim());
} catch (URISyntaxException e) {
throw new MalformedURLException("Invalid uri: " + uriStr + " (" + e.getMessage() + ")");
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetType.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetType.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetType.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharacterSetType.java Fri Jun 22 08:27:42 2012
@@ -19,13 +19,39 @@
package org.apache.fop.afp.fonts;
+import org.apache.fop.afp.fonts.CharactersetEncoder.DefaultEncoder;
+import org.apache.fop.afp.fonts.CharactersetEncoder.EbcdicDoubleByteLineDataEncoder;
+
/**
* An enumeration of AFP characterset types.
*/
public enum CharacterSetType {
/** Double byte character sets; these do NOT have the shift-in;shift-out operators */
- DOUBLE_BYTE,
+ DOUBLE_BYTE {
+ @Override
+ CharactersetEncoder getEncoder(String encoding) {
+ return new DefaultEncoder(encoding, true);
+ }
+ },
/** Double byte character sets; these can have the shift-in;shift-out operators */
- DOUBLE_BYTE_LINE_DATA,
- SINGLE_BYTE;
+ DOUBLE_BYTE_LINE_DATA {
+ @Override
+ CharactersetEncoder getEncoder(String encoding) {
+ return new EbcdicDoubleByteLineDataEncoder(encoding);
+ }
+ },
+ SINGLE_BYTE {
+ @Override
+ CharactersetEncoder getEncoder(String encoding) {
+ return new DefaultEncoder(encoding, false);
+ }
+ };
+
+ /**
+ * Returns the character-set encoder
+ *
+ * @param encoding
+ * @return
+ */
+ abstract CharactersetEncoder getEncoder(String encoding);
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java Fri Jun 22 08:27:42 2012
@@ -87,7 +87,7 @@ public abstract class CharactersetEncode
*/
public static EncodedChars encodeSBCS(CharSequence chars, String encoding)
throws CharacterCodingException {
- CharactersetEncoder encoder = newInstance(encoding, CharacterSetType.SINGLE_BYTE);
+ CharactersetEncoder encoder = CharacterSetType.SINGLE_BYTE.getEncoder(encoding);
return encoder.encode(chars);
}
@@ -97,8 +97,8 @@ public abstract class CharactersetEncode
* sequence it will return its EBCDIC code-point, however, the "Shift In - Shift Out" operators
* are removed from the sequence of bytes. These are only used in Line Data.
*/
- private static final class EbcdicDoubleByteLineDataEncoder extends CharactersetEncoder {
- private EbcdicDoubleByteLineDataEncoder(String encoding) {
+ static final class EbcdicDoubleByteLineDataEncoder extends CharactersetEncoder {
+ EbcdicDoubleByteLineDataEncoder(String encoding) {
super(encoding);
}
@Override
@@ -115,10 +115,10 @@ public abstract class CharactersetEncode
* the primary format for most Latin character sets. This can also be used for Unicode double-
* byte character sets (DBCS).
*/
- private static final class DefaultEncoder extends CharactersetEncoder {
+ static final class DefaultEncoder extends CharactersetEncoder {
private final boolean isDBCS;
- private DefaultEncoder(String encoding, boolean isDBCS) {
+ DefaultEncoder(String encoding, boolean isDBCS) {
super(encoding);
this.isDBCS = isDBCS;
}
@@ -130,24 +130,6 @@ public abstract class CharactersetEncode
}
/**
- * Returns an new instance of a {@link CharactersetEncoder}.
- *
- * @param encoding the encoding for the underlying character encoder
- * @param isEbcdicDBCS whether or not this wraps a double-byte EBCDIC code page.
- * @return the CharactersetEncoder
- */
- static CharactersetEncoder newInstance(String encoding, CharacterSetType charsetType) {
- switch (charsetType) {
- case DOUBLE_BYTE_LINE_DATA:
- return new EbcdicDoubleByteLineDataEncoder(encoding);
- case DOUBLE_BYTE:
- return new DefaultEncoder(encoding, true);
- default:
- return new DefaultEncoder(encoding, false);
- }
- }
-
- /**
* A container for encoded character bytes
*/
// CSOFF: FinalClass - disabling "final" modifier so that this class can be mocked
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -21,8 +21,9 @@ package org.apache.fop.apps;
import java.net.URI;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.apps.io.ResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.FontCacheManager;
import org.apache.fop.fonts.FontCacheManagerFactory;
import org.apache.fop.fonts.FontDetector;
@@ -105,7 +106,8 @@ public final class EnvironmentalProfileF
private static FontManager createFontManager(URI defaultBaseUri, ResourceResolver resourceResolver,
FontDetector fontDetector, FontCacheManager fontCacheManager) {
- return new FontManager(new InternalResourceResolver(defaultBaseUri, resourceResolver), fontDetector,
- fontCacheManager);
+ InternalResourceResolver internalResolver = ResourceResolverFactory.createInternalResourceResolver(
+ defaultBaseUri, resourceResolver);
+ return new FontManager(internalResolver, 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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -402,11 +402,12 @@ public class FOUserAgent {
* @return A {@link javax.xml.transform.Source} object, or null if the URI
* cannot be resolved.
*/
- public Source resolveURI(String uri) {
- // TODO: What do we want to do when resources aren't found???
+ public StreamSource resolveURI(String uri) {
+ // TODO: What do we want to do when resources aren't found??? We also need to remove this
+ // method entirely
try {
// Have to do this so we can resolve data URIs
- Source src = new StreamSource(resourceResolver.getResource(uri));
+ StreamSource 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/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactory.java?rev=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -39,6 +39,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fo.ElementMapping;
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fonts.FontManager;
@@ -88,7 +89,8 @@ public final class FopFactory implements
private FopFactory(FopFactoryConfig config) {
this.config = config;
- this.resolver = new InternalResourceResolver(config.getBaseURI(), config.getResourceResolver());
+ this.resolver = ResourceResolverFactory.createInternalResourceResolver(config.getBaseURI(),
+ config.getResourceResolver());
this.elementMappingRegistry = new ElementMappingRegistry(this);
this.colorSpaceCache = new ColorSpaceCache(resolver);
this.rendererFactory = new RendererFactory(config.preferRenderer());
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/InternalResourceResolver.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/InternalResourceResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/InternalResourceResolver.java Fri Jun 22 08:27:42 2012
@@ -39,16 +39,16 @@ import org.apache.xmlgraphics.util.uri.D
*/
public class InternalResourceResolver {
private final URI baseUri;
- private final ResourceResolver uriResolver;
+ private final ResourceResolver resourceResolver;
private final DataURIResolver dataSchemeResolver = new DataURIResolver();
/**
* @param baseUri the base URI from which to resolve relative URIs
- * @param uriResolver the resolver to delegate to
+ * @param resourceResolver the resolver to delegate to
*/
- public InternalResourceResolver(URI baseUri, ResourceResolver uriResolver) {
+ InternalResourceResolver(URI baseUri, ResourceResolver resourceResolver) {
this.baseUri = baseUri;
- this.uriResolver = uriResolver;
+ this.resourceResolver = resourceResolver;
}
/**
@@ -87,7 +87,7 @@ public class InternalResourceResolver {
if (uri.getScheme() != null && uri.getScheme().startsWith("data")) {
return new Resource(resolveDataURI(uri.toASCIIString()));
}
- return uriResolver.getResource(resolveFromBase(uri));
+ return resourceResolver.getResource(resolveFromBase(uri));
}
/**
@@ -98,7 +98,7 @@ public class InternalResourceResolver {
* @throws IOException if an I/O error occurrred
*/
public OutputStream getOutputStream(URI uri) throws IOException {
- return uriResolver.getOutputStream(resolveFromBase(uri));
+ return resourceResolver.getOutputStream(resolveFromBase(uri));
}
/**
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolver.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolver.java Fri Jun 22 08:27:42 2012
@@ -23,10 +23,29 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
+/**
+ * Implementations of this resource resolver allow FOP users to control the URI resolution
+ * mechanism. All resource and output stream acquisition goes through this when its implementation
+ * is given to the {@link org.apache.fop.apps.EnvironmentProfile}.
+ */
public interface ResourceResolver {
+ /**
+ * Get a resource given the URI pointing to said resource.
+ *
+ * @param uri the resource URI
+ * @return the resource
+ * @throws IOException if an I/O error occured during resource acquisition
+ */
Resource getResource(URI uri) throws IOException;
+ /**
+ * Gets an output stream of a given URI.
+ *
+ * @param uri the output stream URI
+ * @return the output stream
+ * @throws IOException if an I/O error occured while creating an output stream
+ */
OutputStream getOutputStream(URI uri) throws IOException;
}
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -28,41 +28,74 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+/**
+ * A factory class for {@link ResourceResolver}s.
+ */
public final class ResourceResolverFactory {
private ResourceResolverFactory() {
}
+ /**
+ * Returns the default resource resolver, this is most basic resolver which can be used when
+ * no there are no I/O or file access restrictions.
+ *
+ * @return the default resource resolver
+ */
public static ResourceResolver createDefaultResourceResolver() {
return DefaultResourceResolver.INSTANCE;
}
- public static ResourceResolver createTempAwareResourceResolver(TempResourceResolver tempResourceResolver,
+ /**
+ * A helper merthod that creates an internal resource resolver using the default resover:
+ * {@link ResourceResolverFactory#createDefaultResourceResolver()}.
+ *
+ * @param baseURI the base URI from which to resolve URIs
+ * @return the default internal resource resolver
+ */
+ public static InternalResourceResolver createDefaultInternalResourceResolver(URI baseURI) {
+ return new InternalResourceResolver(baseURI, createDefaultResourceResolver());
+ }
+
+ /**
+ * Creates an interal resource resolver given a base URI and a resource resolver.
+ *
+ * @param baseURI the base URI from which to resolve URIs
+ * @param resolver the resource resolver
+ * @return the internal resource resolver
+ */
+ public static InternalResourceResolver createInternalResourceResolver(URI baseURI,
+ ResourceResolver resolver) {
+ return new InternalResourceResolver(baseURI, resolver);
+ }
+
+ /**
+ * Creates a temporary-resource-schema aware resource resolver. Temporary resource URIs are
+ * created by {@link TempResourceURIGenerator}.
+ *
+ * @param tempResourceResolver the temporary-resource-schema resolver to use
+ * @param defaultResourceResolver the default resource resolver to use
+ * @return the ressource resolver
+ */
+ public static ResourceResolver createTempAwareResourceResolver(
+ TempResourceResolver tempResourceResolver,
ResourceResolver defaultResourceResolver) {
return new TempAwareResourceResolver(tempResourceResolver, defaultResourceResolver);
}
- 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 InternalResourceResolver(thisUri, new DefaultResourceResolver());
- }
-
public static SchemaAwareResourceResolverBuilder createSchemaAwareResourceResolverBuilder(
ResourceResolver defaultResolver) {
return new SchemaAwareResourceResolverBuilderImpl(defaultResolver);
}
-
-
private static final class DefaultResourceResolver implements ResourceResolver {
private static final ResourceResolver INSTANCE = new DefaultResourceResolver();
private final TempAwareResourceResolver delegate;
- private DefaultResourceResolver() {
- delegate = new TempAwareResourceResolver(new DefaultTempResourceResolver(),
+ private DefaultResourceResolver() {
+ delegate = new TempAwareResourceResolver(new DefaultTempResourceResolver(),
new NormalResourceResolver());
}
@@ -123,7 +156,6 @@ public final class ResourceResolverFacto
public OutputStream getOutputStream(String id) throws IOException {
File file = getTempFile(id);
- // TODO handle error
file.createNewFile();
return new FileOutputStream(file);
}
@@ -145,7 +177,8 @@ public final class ResourceResolverFacto
private final ResourceResolver defaultResolver;
- private SchemaAwareResourceResolver(Map<String, ResourceResolver> schemaHandlingResourceResolvers,
+ private SchemaAwareResourceResolver(
+ Map<String, ResourceResolver> schemaHandlingResourceResolvers,
ResourceResolver defaultResolver) {
this.schemaHandlingResourceResolvers = schemaHandlingResourceResolvers;
this.defaultResolver = defaultResolver;
@@ -177,7 +210,7 @@ public final class ResourceResolverFacto
}
private static final class CompletedSchemaAwareResourceResolverBuilder
- implements SchemaAwareResourceResolverBuilder {
+ implements SchemaAwareResourceResolverBuilder {
private static final SchemaAwareResourceResolverBuilder INSTANCE
= new CompletedSchemaAwareResourceResolverBuilder();
@@ -193,7 +226,7 @@ public final class ResourceResolverFacto
}
private static final class ActiveSchemaAwareResourceResolverBuilder
- implements SchemaAwareResourceResolverBuilder {
+ implements SchemaAwareResourceResolverBuilder {
private final Map<String, ResourceResolver> schemaHandlingResourceResolvers
= new HashMap<String, ResourceResolver>();
@@ -204,7 +237,8 @@ public final class ResourceResolverFacto
this.defaultResolver = defaultResolver;
}
- public void registerResourceResolverForSchema(String schema, ResourceResolver resourceResolver) {
+ public void registerResourceResolverForSchema(String schema,
+ ResourceResolver resourceResolver) {
schemaHandlingResourceResolvers.put(schema, resourceResolver);
}
@@ -216,7 +250,7 @@ public final class ResourceResolverFacto
}
private static final class SchemaAwareResourceResolverBuilderImpl
- implements SchemaAwareResourceResolverBuilder {
+ implements SchemaAwareResourceResolverBuilder {
private SchemaAwareResourceResolverBuilder delegate;
@@ -224,7 +258,8 @@ public final class ResourceResolverFacto
this.delegate = new ActiveSchemaAwareResourceResolverBuilder(defaultResolver);
}
- public void registerResourceResolverForSchema(String schema, ResourceResolver resourceResolver) {
+ public void registerResourceResolverForSchema(String schema,
+ ResourceResolver resourceResolver) {
delegate.registerResourceResolverForSchema(schema, resourceResolver);
}
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFac
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.substitute.FontSubstitutions;
import org.apache.fop.fonts.substitute.FontSubstitutionsConfigurator;
import org.apache.fop.util.LogUtil;
@@ -89,13 +90,14 @@ public class FontManagerConfigurator {
try {
URI fontBase = InternalResourceResolver.getBaseURI(cfg.getChild("font-base").getValue(
null));
- fontManager.setResourceResolver(new InternalResourceResolver(
+ fontManager.setResourceResolver(ResourceResolverFactory.createInternalResourceResolver(
defaultBaseUri.resolve(fontBase), resourceResolver));
} catch (URISyntaxException use) {
LogUtil.handleException(log, use, true);
}
} else {
- fontManager.setResourceResolver(new InternalResourceResolver(defaultBaseUri, resourceResolver));
+ fontManager.setResourceResolver(ResourceResolverFactory.createInternalResourceResolver(
+ defaultBaseUri, resourceResolver));
}
// [GA] permit configuration control over base14 kerning; without this,
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java Fri Jun 22 08:27:42 2012
@@ -19,6 +19,8 @@
package org.apache.fop.render.pdf;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
@@ -33,6 +35,7 @@ import org.apache.commons.logging.LogFac
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.pdf.PDFAMode;
@@ -98,8 +101,8 @@ public final class PDFRendererConfig imp
return (PDFEncryptionParams) configOptions.get(ENCRYPTION_PARAMS);
}
- public String getOutputProfileURI() {
- return (String) configOptions.get(OUTPUT_PROFILE);
+ public URI getOutputProfileURI() {
+ return (URI) configOptions.get(OUTPUT_PROFILE);
}
public Boolean getDisableSRGBColorSpace() {
@@ -171,12 +174,13 @@ public final class PDFRendererConfig imp
}
put(ENCRYPTION_PARAMS, encryptionConfig);
}
- // TODO: Check this, I'm pretty sure the getChild(Str, bool) should be false!!!
- put(OUTPUT_PROFILE, parseConfig(cfg, OUTPUT_PROFILE));
+ put(OUTPUT_PROFILE, InternalResourceResolver.cleanURI(parseConfig(cfg, OUTPUT_PROFILE)));
put(DISABLE_SRGB_COLORSPACE, Boolean.valueOf(parseConfig(cfg, DISABLE_SRGB_COLORSPACE)));
put(VERSION, getPDFDocVersion(cfg));
} catch (ConfigurationException e) {
LogUtil.handleException(LOG, e, strict);
+ } catch (URISyntaxException use) {
+ LogUtil.handleException(LOG, use, strict);
}
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java Fri Jun 22 08:27:42 2012
@@ -24,17 +24,14 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Map;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.xmlgraphics.image.loader.util.ImageUtil;
import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
import org.apache.xmlgraphics.xmp.Metadata;
import org.apache.xmlgraphics.xmp.schemas.XMPBasicAdapter;
@@ -42,6 +39,7 @@ import org.apache.xmlgraphics.xmp.schema
import org.apache.fop.accessibility.Accessibility;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fo.extensions.xmp.XMPMetadata;
import org.apache.fop.pdf.PDFAMode;
import org.apache.fop.pdf.PDFArray;
@@ -118,7 +116,7 @@ class PDFRenderingUtil {
private boolean disableSRGBColorSpace = false;
/** Optional URI to an output profile to be used. */
- private String outputProfileURI;
+ private URI outputProfileURI;
private Version maxPDFVersion;
@@ -198,7 +196,7 @@ class PDFRenderingUtil {
}
s = (String) userAgent.getRendererOption(OUTPUT_PROFILE);
if (s != null) {
- this.outputProfileURI = s;
+ this.outputProfileURI = URI.create(s);
}
Object disableSRGBColorSpace = userAgent.getRendererOption(DISABLE_SRGB_COLORSPACE);
if (disableSRGBColorSpace != null) {
@@ -230,7 +228,7 @@ class PDFRenderingUtil {
* Sets the output color profile for the PDF renderer.
* @param outputProfileURI the URI to the output color profile
*/
- public void setOutputProfileURI(String outputProfileURI) {
+ public void setOutputProfileURI(URI outputProfileURI) {
this.outputProfileURI = outputProfileURI;
}
@@ -303,15 +301,7 @@ class PDFRenderingUtil {
InputStream in = null;
if (this.outputProfileURI != null) {
this.outputProfile = pdfDoc.getFactory().makePDFICCStream();
- Source src = getUserAgent().resolveURI(this.outputProfileURI);
- if (src == null) {
- throw new IOException("Output profile not found: " + this.outputProfileURI);
- }
- if (src instanceof StreamSource) {
- in = ((StreamSource)src).getInputStream();
- } else {
- in = new URL(src.getSystemId()).openStream();
- }
+ in = getUserAgent().getResourceResolver().getResource(outputProfileURI);
try {
profile = ColorProfileUtil.getICC_Profile(in);
} finally {
@@ -471,8 +461,13 @@ class PDFRenderingUtil {
//Create embedded file
PDFEmbeddedFile file = new PDFEmbeddedFile();
this.pdfDoc.registerObject(file);
- Source src = getUserAgent().resolveURI(embeddedFile.getSrc());
- InputStream in = ImageUtil.getInputStream(src);
+ URI srcURI;
+ try {
+ srcURI = InternalResourceResolver.cleanURI(embeddedFile.getSrc());
+ } catch (URISyntaxException use) {
+ throw new RuntimeException(use);
+ }
+ InputStream in = getUserAgent().getResourceResolver().getResource(srcURI);
if (in == null) {
throw new FileNotFoundException(embeddedFile.getSrc());
}
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -19,6 +19,8 @@
package org.apache.fop.svg;
+import java.io.File;
+import java.net.URI;
import java.util.List;
import org.apache.avalon.framework.configuration.Configuration;
@@ -85,7 +87,8 @@ public class PDFDocumentGraphics2DConfig
FontInfo fontInfo = new FontInfo();
final boolean strict = false;
if (cfg != null) {
- InternalResourceResolver resourceResolver = ResourceResolverFactory.createDefaultWrapper();
+ URI thisUri = new File(".").getAbsoluteFile().toURI();
+ InternalResourceResolver resourceResolver = ResourceResolverFactory.createDefaultInternalResourceResolver(thisUri);
//TODO The following could be optimized by retaining the FontManager somewhere
FontManager fontManager = new FontManager(resourceResolver, FontDetectorFactory.createDefault(),
FontCacheManagerFactory.createDefault());
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java Fri Jun 22 08:27:42 2012
@@ -20,6 +20,7 @@
package org.apache.fop;
import org.apache.batik.transcoder.Transcoder;
+
import org.apache.fop.svg.PDFTranscoder;
/**
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java Fri Jun 22 08:27:42 2012
@@ -20,6 +20,7 @@
package org.apache.fop.afp;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
import org.junit.Before;
@@ -41,7 +42,8 @@ public class AFPResourceManagerTestCase
@Before
public void setUp() throws IOException {
- sut = new AFPResourceManager(ResourceResolverFactory.createDefaultWrapper());
+ sut = new AFPResourceManager(ResourceResolverFactory.createDefaultInternalResourceResolver(
+ new File(".").toURI()));
AFPPaintingState paintingState = new AFPPaintingState();
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
DataStream stream = sut.createDataStream(paintingState, outStream);
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java Fri Jun 22 08:27:42 2012
@@ -39,9 +39,8 @@ public class CharactersetEncoderTestCase
@Before
public void setUp() {
- singlebyteEncoder = CharactersetEncoder.newInstance("cp500", CharacterSetType.SINGLE_BYTE);
- doublebyteEncoder = CharactersetEncoder.newInstance("cp937",
- CharacterSetType.DOUBLE_BYTE_LINE_DATA);
+ singlebyteEncoder = CharacterSetType.SINGLE_BYTE.getEncoder("cp500");
+ doublebyteEncoder = CharacterSetType.DOUBLE_BYTE_LINE_DATA.getEncoder("cp937");
}
// This is just an arbitrary CJK string
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -24,8 +24,8 @@ import java.io.File;
import org.junit.Before;
import org.junit.Test;
-import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
import static org.junit.Assert.assertEquals;
@@ -34,8 +34,8 @@ import static org.junit.Assert.assertEqu
*/
public class DejaVuLGCSerifTestCase {
- private InternalResourceResolver resolver = new InternalResourceResolver(new File(".").toURI(),
- ResourceResolverFactory.createDefaultResourceResolver());
+ private InternalResourceResolver resolver =
+ ResourceResolverFactory.createDefaultInternalResourceResolver(new File(".").toURI());
private CustomFont font;
/**
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -25,8 +25,8 @@ import java.net.URI;
import org.junit.Test;
-import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.EncodingMode;
import static org.junit.Assert.assertFalse;
@@ -42,18 +42,19 @@ public class TTFFontLoaderTestCase {
boolean useComplexScriptFeatures = false;
File file = new File("test/resources/fonts/ttf/DejaVuLGCSerif.ttf");
URI absoluteFilePath = file.toURI();
- InternalResourceResolver resolver = ResourceResolverFactory.createDefaultWrapper();
+ InternalResourceResolver resourceResolver = ResourceResolverFactory.createDefaultInternalResourceResolver(
+ new File(".").toURI());
String fontName = "Deja Vu";
boolean embedded = false;
boolean useKerning = true;
TTFFontLoader fontLoader = new TTFFontLoader(absoluteFilePath, fontName, embedded,
- EncodingMode.AUTO, useKerning, useComplexScriptFeatures, resolver);
+ EncodingMode.AUTO, useKerning, useComplexScriptFeatures, resourceResolver);
assertTrue(fontLoader.getFont().hasKerningInfo());
useKerning = false;
fontLoader = new TTFFontLoader(absoluteFilePath, fontName, embedded, EncodingMode.AUTO,
- useKerning, useComplexScriptFeatures, resolver);
+ useKerning, useComplexScriptFeatures, resourceResolver);
assertFalse(fontLoader.getFont().hasKerningInfo());
}
}
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=1352800&r1=1352799&r2=1352800&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 22 08:27:42 2012
@@ -19,10 +19,14 @@
package org.apache.fop.pdf;
+import java.io.File;
+import java.net.URI;
+
import org.junit.Test;
-import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.apps.io.ResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.CIDSubset;
import org.apache.fop.fonts.MultiByteFont;
@@ -56,7 +60,11 @@ public class PDFFactoryTestCase {
}
PDFDocument doc = new PDFDocument("Test");
PDFFactory pdfFactory = new PDFFactory(doc);
- MockedFont font = new MockedFont(ResourceResolverFactory.createDefaultWrapper());
+ URI thisURI = new File(".").toURI();
+ ResourceResolver resolver = ResourceResolverFactory.createDefaultResourceResolver();
+ InternalResourceResolver resourceResolver = ResourceResolverFactory.createInternalResourceResolver(
+ thisURI, resolver);
+ MockedFont font = new MockedFont(resourceResolver);
PDFFont pdfDejaVu = pdfFactory.makeFont("DejaVu", "DejaVu", "TTF", font, font);
assertEquals("/EAAAAA+DejaVu", pdfDejaVu.getBaseFont().toString());
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfiguratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfiguratorTestCase.java?rev=1352800&r1=1352799&r2=1352800&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfiguratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfiguratorTestCase.java Fri Jun 22 08:27:42 2012
@@ -22,6 +22,7 @@ package org.apache.fop.render.pdf;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
+import java.net.URI;
import java.util.List;
import java.util.Map;
@@ -221,9 +222,9 @@ public class PDFRendererConfiguratorTest
@Test
public void testSetProfile() throws Exception {
- String testString = "this string is purely for testing and has no contextual meaning";
+ String testString = "this.uri.is.purely.for.testing.and.has.no.contextual.meaning";
parseConfigMockUtil(createBuilder().setOutputProfile(testString));
- verify(pdfUtil).setOutputProfileURI(testString);
+ verify(pdfUtil).setOutputProfileURI(URI.create(testString));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org