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/07/03 16:32:09 UTC
svn commit: r1356755 - in /xmlgraphics/fop/trunk/src:
java/org/apache/fop/afp/modca/ java/org/apache/fop/afp/util/
java/org/apache/fop/apps/ java/org/apache/fop/apps/io/
java/org/apache/fop/cli/ java/org/apache/fop/fonts/
java/org/apache/fop/render/ ja...
Author: mehdi
Date: Tue Jul 3 14:32:03 2012
New Revision: 1356755
URL: http://svn.apache.org/viewvc?rev=1356755&view=rev
Log:
Check style and find bugs now pass without errors
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPShadingMode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEncryptionOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorSpaceCache.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java Tue Jul 3 14:32:03 2012
@@ -26,9 +26,8 @@ import java.net.URI;
import org.apache.commons.io.IOUtils;
-import org.apache.fop.afp.util.AFPResourceUtil;
import org.apache.fop.afp.util.AFPResourceAccessor;
-
+import org.apache.fop.afp.util.AFPResourceUtil;
/**
* Encapsulates an included resource object that is loaded from an external file.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java Tue Jul 3 14:32:03 2012
@@ -24,8 +24,6 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.io.InternalResourceResolver;
/**
@@ -37,9 +35,10 @@ public final class AFPResourceAccessor {
private final String baseURI;
/**
- * Constructor for resource to be accessed via the {@link FOUserAgent}. This contructor
- * 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}.
+ * Constructor for resource to be accessed via the {@link org.apache.fop.apps.FOUserAgent}. This
+ * contructor 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 org.apache.fop.apps.FopFactory}.
*
* @param InternalResourceResolver resource resolver
* @param baseURI the custom base URI to resolve relative URIs against (may be null)
@@ -50,7 +49,7 @@ public final class AFPResourceAccessor {
}
/**
- * Constructor for resource to be accessed via the {@link FOUserAgent}.
+ * Constructor for resource to be accessed via the {@link org.apache.fop.apps.FOUserAgent}.
*
* @param InternalResourceResolver resource resolver
*/
@@ -74,5 +73,4 @@ public final class AFPResourceAccessor {
public InputStream createInputStream(URI uri) throws IOException {
return resourceResolver.getResource(getResourceURI(uri));
}
-
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java Tue Jul 3 14:32:03 2012
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import org.xml.sax.SAXException;
@@ -39,9 +40,9 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry;
import org.apache.xmlgraphics.image.loader.util.Penalty;
+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.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.FontManagerConfigurator;
import org.apache.fop.hyphenation.HyphenationTreeCache;
import org.apache.fop.util.LogUtil;
@@ -233,7 +234,7 @@ public class FopConfParser {
}
// configure font manager
- new FontManagerConfigurator(cfg, fopFactoryBuilder.getBaseUri(), resourceResolver).configure(
+ new FontManagerConfigurator(cfg, fopFactoryBuilder.getBaseURI(), resourceResolver).configure(
fopFactoryBuilder.getFontManager(), strict);
// configure image loader framework
@@ -261,7 +262,7 @@ public class FopConfParser {
+ " element must consist of exactly two letters ("
+ location + ")", error);
}
- lang = lang.toLowerCase();
+ lang = lang.toLowerCase(Locale.getDefault());
country = hyphPatConfig[i].getAttribute("country", null);
if ("".equals(country)) {
@@ -273,7 +274,7 @@ public class FopConfParser {
+ " element must consist of exactly two letters ("
+ location + ")", error);
}
- country = country.toUpperCase();
+ country = country.toUpperCase(Locale.getDefault());
}
filename = hyphPatConfig[i].getValue(null);
@@ -318,7 +319,7 @@ public class FopConfParser {
String className = penaltyCfg.getAttribute("class");
String value = penaltyCfg.getAttribute("value");
Penalty p = null;
- if (value.toUpperCase().startsWith("INF")) {
+ if (value.toUpperCase(Locale.getDefault()).startsWith("INF")) {
p = Penalty.INFINITE_PENALTY;
} else {
try {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java Tue Jul 3 14:32:03 2012
@@ -115,7 +115,7 @@ public final class FopFactoryBuilder {
*
* @return the base URI
*/
- URI getBaseUri() {
+ URI getBaseURI() {
return config.getBaseURI();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java Tue Jul 3 14:32:03 2012
@@ -156,8 +156,11 @@ public final class ResourceResolverFacto
public OutputStream getOutputStream(String id) throws IOException {
File file = getTempFile(id);
- file.createNewFile();
- return new FileOutputStream(file);
+ if (file.createNewFile()) {
+ return new FileOutputStream(file);
+ } else {
+ throw new IOException("Filed to create temporary file: " + id);
+ }
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java Tue Jul 3 14:32:03 2012
@@ -1038,6 +1038,7 @@ public class CommandLineOptions {
throw new FOPException(e);
}
fopFactoryBuilder.setStrictFOValidation(strictValidation);
+ fopFactoryBuilder.setComplexScriptFeatures(useComplexScriptFeatures);
}
factory = fopFactoryBuilder.build();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfig.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfig.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfig.java Tue Jul 3 14:32:03 2012
@@ -38,7 +38,7 @@ import org.apache.fop.util.LogUtil;
*/
public final class DefaultFontConfig implements FontConfig {
- protected static Log log = LogFactory.getLog(DefaultFontConfig.class);
+ private static final Log log = LogFactory.getLog(DefaultFontConfig.class);
private final List<Directory> directories = new ArrayList<Directory>();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java Tue Jul 3 14:32:03 2012
@@ -43,7 +43,7 @@ import org.apache.fop.util.LogUtil;
*/
public class DefaultFontConfigurator implements FontConfigurator<EmbedFontInfo> {
/** logger instance */
- protected static Log log = LogFactory.getLog(DefaultFontConfigurator.class);
+ protected static final Log log = LogFactory.getLog(DefaultFontConfigurator.class);
private final FontManager fontManager;
private final InternalResourceResolver resourceResolver;
@@ -68,11 +68,11 @@ public class DefaultFontConfigurator imp
* Initializes font info settings from the user configuration
* @throws FOPException if an exception occurs while processing the configuration
*/
- public List<EmbedFontInfo> configure(FontConfig fontInfoConfig)
- throws FOPException {
+ public List<EmbedFontInfo> configure(FontConfig fontInfoConfig) throws FOPException {
List<EmbedFontInfo> fontInfoList = new ArrayList<EmbedFontInfo>();
- DefaultFontConfig adobeFontInfoConfig = (DefaultFontConfig) fontInfoConfig;
- if (adobeFontInfoConfig != null) {
+ if (fontInfoConfig != null) {
+ assert fontInfoConfig instanceof DefaultFontConfig;
+ DefaultFontConfig adobeFontInfoConfig = (DefaultFontConfig) fontInfoConfig;
long start = 0;
if (log.isDebugEnabled()) {
log.debug("Starting font configuration...");
@@ -154,14 +154,10 @@ public class DefaultFontConfigurator imp
// no font triplet info
if (tripletList.size() == 0) {
URI fontUri = resourceResolver.resolveFromBase(embedUri);
- if (fontUri != null) {
- FontInfoFinder finder = new FontInfoFinder();
- finder.setEventListener(listener);
- EmbedFontInfo[] infos = finder.find(fontUri, resourceResolver, fontCache);
- return infos[0]; //When subFont is set, only one font is returned
- } else {
- return null;
- }
+ FontInfoFinder finder = new FontInfoFinder();
+ finder.setEventListener(listener);
+ EmbedFontInfo[] infos = finder.find(fontUri, resourceResolver, fontCache);
+ return infos[0]; //When subFont is set, only one font is returned
}
EncodingMode encodingMode = EncodingMode.getValue(font.getEncodingMode());
EmbeddingMode embeddingMode = EmbeddingMode.getValue(font.getEmbeddingMode());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java Tue Jul 3 14:32:03 2012
@@ -333,7 +333,7 @@ public final class FontCache implements
// try and determine modified date
URI fontUri = resourceResolver.resolveFromBase(fontInfo.getEmbedURI());
File fontFile = new File(fontUri);
- long lastModified = (fontFile != null ? fontFile.lastModified() : -1);
+ long lastModified = fontFile.lastModified();
cachedFontFile = new CachedFontFile(lastModified);
if (log.isTraceEnabled()) {
log.trace("Font added to cache: " + cacheKey);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java Tue Jul 3 14:32:03 2012
@@ -106,7 +106,7 @@ public abstract class FontLoader {
loader = new Type1FontLoader(fontFileURI, embedded, useKerning, resourceResolver);
} else {
loader = new TTFFontLoader(fontFileURI, subFontName, embedded, embeddingMode,
- encodingMode, useKerning, useAdvanced, resourceResolver);
+ encodingMode, useKerning, useAdvanced, resourceResolver);
}
return loader.getFont();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java Tue Jul 3 14:32:03 2012
@@ -39,8 +39,6 @@ import org.apache.fop.fonts.FontManager;
import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.fonts.base14.Base14FontCollection;
-import sun.font.FontResolver;
-
/** Abstract base class of "Print" type renderers. */
public abstract class PrintRenderer extends AbstractRenderer {
@@ -54,9 +52,6 @@ public abstract class PrintRenderer exte
/** Font configuration */
protected FontInfo fontInfo;
- /** Font resolver */
- protected FontResolver fontResolver = null;
-
/** list of fonts */
protected List<EmbedFontInfo> embedFontInfoList = null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java Tue Jul 3 14:32:03 2012
@@ -22,9 +22,6 @@ package org.apache.fop.render;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.io.InternalResourceResolver;
@@ -46,9 +43,6 @@ import org.apache.fop.render.intermediat
public abstract class PrintRendererConfigurator extends AbstractRendererConfigurator
implements IFDocumentHandlerConfigurator {
- /** logger instance */
- private static Log LOG = LogFactory.getLog(PrintRendererConfigurator.class);
-
private final RendererConfigParser rendererConfigParser;
private final FontConfigurator<EmbedFontInfo> fontInfoConfigurator;
@@ -170,4 +164,13 @@ public abstract class PrintRendererConfi
private List<EmbedFontInfo> buildFontList(String mimeType) throws FOPException {
return fontInfoConfigurator.configure(getRendererConfig(mimeType).getFontInfoConfig());
}
+
+ public static PrintRendererConfigurator createDefaultInstance(FOUserAgent userAgent) {
+ return new PrintRendererConfigurator(userAgent, null) {
+ @Override
+ protected List<FontCollection> getDefaultFontCollection() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java Tue Jul 3 14:32:03 2012
@@ -351,19 +351,10 @@ public final class AFPFontConfig impleme
CharacterSet characterSet = null;
if (base14 != null) {
try {
- Class<? extends Typeface> clazz = Class.forName(
- "org.apache.fop.fonts.base14." + base14).asSubclass(Typeface.class);
- try {
- Typeface tf = clazz.newInstance();
- characterSet = CharacterSetBuilder.getSingleByteInstance()
- .build(characterset, super.codePage,
- super.encoding,
- tf, eventProducer);
- } catch (Exception ie) {
- String msg = "The base 14 font class " + clazz.getName()
- + " could not be instantiated";
- LOG.error(msg);
- }
+ Typeface tf = getTypeFace(base14);
+ characterSet = CharacterSetBuilder.getSingleByteInstance()
+ .build(characterset, super.codePage,
+ super.encoding, tf, eventProducer);
} catch (ClassNotFoundException cnfe) {
String msg = "The base 14 font class for " + characterset
+ " could not be found";
@@ -378,6 +369,22 @@ public final class AFPFontConfig impleme
}
}
+ private static Typeface getTypeFace(String base14Name) throws ClassNotFoundException {
+ try {
+ Class<? extends Typeface> clazz = Class.forName("org.apache.fop.fonts.base14."
+ + base14Name).asSubclass(Typeface.class);
+ return clazz.newInstance();
+ } catch (IllegalAccessException iae) {
+ LOG.error(iae.getMessage());
+ } catch (ClassNotFoundException cnfe) {
+ LOG.error(cnfe.getMessage());
+ } catch (InstantiationException ie) {
+ LOG.error(ie.getMessage());
+ }
+ throw new ClassNotFoundException("Couldn't load file for AFP font with base14 name: "
+ + base14Name);
+ }
+
static final class RasterFontConfig extends AFPFontConfigData {
private final List<RasterCharactersetData> charsets;
@@ -395,24 +402,20 @@ public final class AFPFontConfig impleme
for (RasterCharactersetData charset : charsets) {
if (charset.base14 != null) {
try {
- Class<? extends Typeface> clazz = Class.forName(
- "org.apache.fop.fonts.base14." + charset.base14).asSubclass(
- Typeface.class);
- try {
- Typeface tf = clazz.newInstance();
- rasterFont.addCharacterSet(charset.size,
- CharacterSetBuilder.getSingleByteInstance().build(
- charset.characterset, super.codePage, super.encoding,
- tf, eventProducer));
- } catch (Exception ie) {
- String msg = "The base 14 font class " + clazz.getName()
- + " could not be instantiated";
- LOG.error(msg);
- }
+ Typeface tf = getTypeFace(charset.base14);
+ rasterFont.addCharacterSet(charset.size,
+ CharacterSetBuilder.getSingleByteInstance().build(
+ charset.characterset, super.codePage, super.encoding,
+ tf, eventProducer));
+
} catch (ClassNotFoundException cnfe) {
String msg = "The base 14 font class for " + charset.characterset
+ " could not be found";
LOG.error(msg);
+ } catch (IOException ie) {
+ String msg = "The base 14 font class " + charset.characterset
+ + " could not be instantiated";
+ LOG.error(msg);
}
} else {
AFPResourceAccessor accessor = getAccessor(resourceResolver);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java Tue Jul 3 14:32:03 2012
@@ -208,7 +208,7 @@ public final class AFPRendererConfig imp
/** {@inheritDoc} */
public AFPRendererConfig build(FOUserAgent userAgent, Configuration cfg) throws FOPException {
- boolean strict = userAgent != null ? userAgent.validateUserConfigStrictly() : false;
+ boolean strict = userAgent.validateUserConfigStrictly();
AFPRendererConfig config = null;
AFPEventProducer eventProducer = AFPEventProducer.Provider.get(userAgent.getEventBroadcaster());
try {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java Tue Jul 3 14:32:03 2012
@@ -46,7 +46,7 @@ import org.apache.fop.util.LogUtil;
*/
public class AFPRendererConfigurator extends PrintRendererConfigurator implements
IFDocumentHandlerConfigurator {
- private static Log LOG = LogFactory.getLog(AFPRendererConfigurator.class);
+ private static Log log = LogFactory.getLog(AFPRendererConfigurator.class);
private final AFPEventProducer eventProducer;
@@ -137,10 +137,10 @@ public class AFPRendererConfigurator ext
config.getFontInfoConfig(), mimeType));
} catch (IOException e) {
eventProducer.invalidConfiguration(this, e);
- LogUtil.handleException(LOG, e, userAgent.validateUserConfigStrictly());
+ LogUtil.handleException(log, e, userAgent.validateUserConfigStrictly());
} catch (IllegalArgumentException iae) {
eventProducer.invalidConfiguration(this, iae);
- LogUtil.handleException(LOG, iae, userAgent.validateUserConfigStrictly());
+ LogUtil.handleException(log, iae, userAgent.validateUserConfigStrictly());
}
}
return new AFPFontCollection(userAgent.getEventBroadcaster(), null);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPShadingMode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPShadingMode.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPShadingMode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPShadingMode.java Tue Jul 3 14:32:03 2012
@@ -20,10 +20,9 @@
package org.apache.fop.render.afp;
import java.io.ObjectStreamException;
-import java.io.Serializable;
/** Enumeration of the AFP shading modes. */
-public enum AFPShadingMode implements Serializable {
+public enum AFPShadingMode {
/** the color mode (the default) */
COLOR("COLOR"),
/** the dithered mode */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java Tue Jul 3 14:32:03 2012
@@ -22,7 +22,6 @@ package org.apache.fop.render.bitmap;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.bitmap.PNGRendererConfig.PNGRendererConfigParser;
import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java Tue Jul 3 14:32:03 2012
@@ -22,7 +22,6 @@ package org.apache.fop.render.bitmap;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.bitmap.TIFFRendererConfig.TIFFRendererConfigParser;
import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java Tue Jul 3 14:32:03 2012
@@ -21,9 +21,6 @@ package org.apache.fop.render.intermedia
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.fop.accessibility.DummyStructureTreeEventHandler;
import org.apache.fop.accessibility.StructureTreeEventHandler;
import org.apache.fop.apps.FOUserAgent;
@@ -33,9 +30,6 @@ import org.apache.fop.apps.FOUserAgent;
*/
public abstract class AbstractIFDocumentHandler implements IFDocumentHandler {
- /** logging instance */
- private static Log log = LogFactory.getLog(AbstractIFDocumentHandler.class);
-
private final IFContext ifContext;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java Tue Jul 3 14:32:03 2012
@@ -37,7 +37,6 @@ import org.apache.fop.apps.MimeConstants
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFPainter;
@@ -46,7 +45,6 @@ import org.apache.fop.render.java2d.Java
import org.apache.fop.render.pcl.PCLRendererConfig.PCLRendererConfigParser;
import org.apache.fop.render.pcl.extensions.PCLElementMapping;
-
/**
* {@link org.apache.fop.render.intermediate.IFDocumentHandler} implementation
* that produces PCL 5.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java Tue Jul 3 14:32:03 2012
@@ -20,12 +20,11 @@
package org.apache.fop.render.pcl;
import java.io.ObjectStreamException;
-import java.io.Serializable;
/**
* Enumeration class for PCL rendering modes.
*/
-public enum PCLRenderingMode implements Serializable {
+public enum PCLRenderingMode {
/** "Quality" rendering (mixed native and bitmap for improved quality) */
QUALITY("quality", 1.0f),
/** "Speed" rendering (maximum speed with native rendering, reduced visual quality) */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEncryptionOption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEncryptionOption.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEncryptionOption.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEncryptionOption.java Tue Jul 3 14:32:03 2012
@@ -19,8 +19,6 @@
package org.apache.fop.render.pdf;
-import org.apache.fop.pdf.PDFAMode;
-import org.apache.fop.pdf.PDFXMode;
import org.apache.fop.render.RendererConfigOption;
public enum PDFEncryptionOption implements RendererConfigOption {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java Tue Jul 3 14:32:03 2012
@@ -36,14 +36,14 @@ public enum PDFRendererOption implements
}
},
/** Rendering Options key for the PDF/A mode, default: {@link PDFAMode#DISABLED} */
- PDF_A_MODE("pdf-a-mode", PDFAMode.DISABLED){
+ PDF_A_MODE("pdf-a-mode", PDFAMode.DISABLED) {
@Override
PDFAMode deserialize(String value) {
return PDFAMode.getValueOf(value);
}
},
/** Rendering Options key for the PDF/X mode, default: {@link PDFXMode#DISABLED} */
- PDF_X_MODE("pdf-x-mode", PDFXMode.DISABLED){
+ PDF_X_MODE("pdf-x-mode", PDFXMode.DISABLED) {
@Override
PDFXMode deserialize(String value) {
return PDFXMode.getValueOf(value);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java Tue Jul 3 14:32:03 2012
@@ -46,7 +46,7 @@ public final class PDFRendererOptionsCon
static {
final EnumMap<PDFRendererOption, Object> props
= new EnumMap<PDFRendererOption, Object>(PDFRendererOption.class);
- for(PDFRendererOption option : PDFRendererOption.values()) {
+ for (PDFRendererOption option : PDFRendererOption.values()) {
props.put(option, option.getDefaultValue());
}
DEFAULT = new PDFRendererOptionsConfig(props, null);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java Tue Jul 3 14:32:03 2012
@@ -19,12 +19,9 @@
package org.apache.fop.render.print;
-import java.util.List;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.fonts.FontCollection;
import org.apache.fop.render.AbstractRendererMaker;
import org.apache.fop.render.PrintRendererConfigurator;
import org.apache.fop.render.Renderer;
@@ -43,13 +40,7 @@ public class PrintRendererMaker extends
@Override
public void configureRenderer(FOUserAgent userAgent, Renderer renderer) throws FOPException {
- // TODO what constructor params?
- new PrintRendererConfigurator(userAgent, null) {
- @Override
- protected List<FontCollection> getDefaultFontCollection() {
- throw new UnsupportedOperationException();
- }
- } .configure(renderer);
+ PrintRendererConfigurator.createDefaultInstance(userAgent).configure(renderer);
}
@Override
@@ -61,5 +52,4 @@ public class PrintRendererMaker extends
public String[] getSupportedMimeTypes() {
return MIMES;
}
-
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java Tue Jul 3 14:32:03 2012
@@ -56,7 +56,6 @@ import org.apache.fop.apps.MimeConstants
import org.apache.fop.apps.io.TempResourceURIGenerator;
import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFPainter;
@@ -67,7 +66,6 @@ import org.apache.fop.render.ps.extensio
import org.apache.fop.render.ps.extensions.PSSetPageDevice;
import org.apache.fop.render.ps.extensions.PSSetupCode;
-
/**
* {@link org.apache.fop.render.intermediate.IFDocumentHandler} implementation
* that produces PostScript.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java Tue Jul 3 14:32:03 2012
@@ -19,12 +19,9 @@
package org.apache.fop.render.xml;
-import java.util.List;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.fonts.FontCollection;
import org.apache.fop.render.AbstractRendererMaker;
import org.apache.fop.render.PrintRendererConfigurator;
import org.apache.fop.render.Renderer;
@@ -43,13 +40,7 @@ public class XMLRendererMaker extends Ab
@Override
public void configureRenderer(FOUserAgent userAgent, Renderer renderer) throws FOPException {
- // TODO what constructor params?
- new PrintRendererConfigurator(userAgent, null) {
- @Override
- protected List<FontCollection> getDefaultFontCollection() {
- throw new UnsupportedOperationException();
- }
- } .configure(renderer);
+ PrintRendererConfigurator.createDefaultInstance(userAgent).configure(renderer);
}
@Override
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java Tue Jul 3 14:32:03 2012
@@ -21,7 +21,6 @@ package org.apache.fop.servlet;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.URI;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorSpaceCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorSpaceCache.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorSpaceCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorSpaceCache.java Tue Jul 3 14:32:03 2012
@@ -98,6 +98,7 @@ public class ColorSpaceCache {
} catch (Exception e) {
// Ignore exception - will be logged a bit further down
// (colorSpace == null case)
+ log.warn("Exception thrown resolving the color space: " + e.getMessage());
}
if (colorSpace != null) {
Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java Tue Jul 3 14:32:03 2012
@@ -48,7 +48,6 @@ import org.apache.fop.render.bitmap.Bitm
import org.apache.fop.render.bitmap.MultiFileRenderingUtil;
import org.apache.fop.render.intermediate.DelegatingFragmentContentHandler;
import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFPainter;
import org.apache.fop.util.GenerationHelperContentHandler;
Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java?rev=1356755&r1=1356754&r2=1356755&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java Tue Jul 3 14:32:03 2012
@@ -26,7 +26,6 @@ import org.xml.sax.helpers.AttributesImp
import org.apache.fop.render.intermediate.IFConstants;
import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFPainter;
import org.apache.fop.util.XMLUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org