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 vh...@apache.org on 2009/10/13 18:41:18 UTC
svn commit: r824839 [2/3] - in /xmlgraphics/fop/branches/Temp_Accessibility:
./ lib/ lib/build/ src/codegen/unicode/data/
src/documentation/content/xdocs/trunk/ src/java/META-INF/services/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/goca/ ...
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java Tue Oct 13 16:41:13 2009
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
package org.apache.fop.render.bitmap;
import java.io.BufferedOutputStream;
@@ -61,6 +80,12 @@
}
}
+ /**
+ * Creates a new {@link OutputStream} for the given page number.
+ * @param pageNumber the page number (zero-based)
+ * @return the output stream for the page
+ * @throws IOException if there's an I/O error while setting up the output stream
+ */
public OutputStream createOutputStream(int pageNumber) throws IOException {
if (filePrefix == null) {
return null;
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -19,60 +19,14 @@
package org.apache.fop.render.bitmap;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.xmlgraphics.image.writer.ImageWriter;
-import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
-import org.apache.xmlgraphics.image.writer.MultiImageWriter;
-
-import org.apache.fop.apps.FopFactoryConfigurator;
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;
-import org.apache.fop.render.java2d.Java2DPainter;
-import org.apache.fop.render.java2d.Java2DUtil;
/**
- * {@code IFDocumentHandler} implementation that produces PCL 5.
+ * {@link IFDocumentHandler} implementation that produces TIFF files.
*/
-public class TIFFDocumentHandler extends AbstractBinaryWritingIFDocumentHandler
- implements TIFFConstants {
-
- /** logging instance */
- private static Log log = LogFactory.getLog(TIFFDocumentHandler.class);
-
- private ImageWriter imageWriter;
- private MultiImageWriter multiImageWriter;
-
- private int pageCount;
- private Dimension currentPageDimensions;
- private BufferedImage currentImage;
-
- private BitmapRenderingSettings bitmapSettings = new BitmapRenderingSettings();
-
- private double scaleFactor = 1.0;
-
- /**
- * Default constructor.
- */
- public TIFFDocumentHandler() {
- }
-
- /** {@inheritDoc} */
- public boolean supportsPagesOutOfOrder() {
- return false;
- }
+public class TIFFDocumentHandler extends AbstractBitmapDocumentHandler {
/** {@inheritDoc} */
public String getMimeType() {
@@ -80,12 +34,8 @@
}
/** {@inheritDoc} */
- public void setContext(IFContext context) {
- super.setContext(context);
-
- //Set target resolution
- int dpi = Math.round(context.getUserAgent().getTargetResolution());
- getSettings().getWriterParams().setResolution(dpi);
+ public String getDefaultExtension() {
+ return "tif";
}
/** {@inheritDoc} */
@@ -93,174 +43,4 @@
return new TIFFRendererConfigurator(getUserAgent());
}
- /**
- * Returns the settings for bitmap rendering.
- * @return the settings object
- */
- public BitmapRenderingSettings getSettings() {
- return this.bitmapSettings;
- }
-
- /** {@inheritDoc} */
- public void setDefaultFontInfo(FontInfo fontInfo) {
- FontInfo fi = Java2DUtil.buildDefaultJava2DBasedFontInfo(fontInfo, getUserAgent());
- setFontInfo(fi);
- }
-
- //----------------------------------------------------------------------------------------------
-
- /** {@inheritDoc} */
- public void startDocument() throws IFException {
- super.startDocument();
- try {
- // Creates writer
- this.imageWriter = ImageWriterRegistry.getInstance().getWriterFor(getMimeType());
- if (this.imageWriter == null) {
- BitmapRendererEventProducer eventProducer
- = BitmapRendererEventProducer.Provider.get(
- getUserAgent().getEventBroadcaster());
- eventProducer.noImageWriterFound(this, getMimeType());
- }
- if (this.imageWriter.supportsMultiImageWriter()) {
- this.multiImageWriter = this.imageWriter.createMultiImageWriter(outputStream);
- }
- this.pageCount = 0;
- } catch (IOException e) {
- throw new IFException("I/O error in startDocument()", e);
- }
- }
-
- /** {@inheritDoc} */
- public void endDocumentHeader() throws IFException {
- }
-
- /** {@inheritDoc} */
- public void endDocument() throws IFException {
- try {
- if (this.multiImageWriter != null) {
- this.multiImageWriter.close();
- }
- this.multiImageWriter = null;
- this.imageWriter = null;
- } catch (IOException ioe) {
- throw new IFException("I/O error in endDocument()", ioe);
- }
- super.endDocument();
- }
-
- /** {@inheritDoc} */
- public void startPageSequence(String id) throws IFException {
- //nop
- }
-
- /** {@inheritDoc} */
- public void endPageSequence() throws IFException {
- //nop
- }
-
- /** {@inheritDoc} */
- public void startPage(int index, String name, String pageMasterName, Dimension size)
- throws IFException {
- this.pageCount++;
- this.currentPageDimensions = new Dimension(size);
- }
-
- /** {@inheritDoc} */
- public IFPainter startPageContent() throws IFException {
- double scale = scaleFactor
- * (25.4f / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
- / getUserAgent().getTargetPixelUnitToMillimeter();
- int bitmapWidth = (int) ((this.currentPageDimensions.width * scale / 1000f) + 0.5f);
- int bitmapHeight = (int) ((this.currentPageDimensions.height * scale / 1000f) + 0.5f);
- this.currentImage = createBufferedImage(bitmapWidth, bitmapHeight);
- Graphics2D graphics2D = this.currentImage.createGraphics();
- // draw page background
- if (!getSettings().hasTransparentPageBackground()) {
- graphics2D.setBackground(getSettings().getPageBackgroundColor());
- graphics2D.setPaint(getSettings().getPageBackgroundColor());
- graphics2D.fillRect(0, 0, bitmapWidth, bitmapHeight);
- }
-
- graphics2D.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
- RenderingHints.VALUE_FRACTIONALMETRICS_ON);
- if (getSettings().isAntiAliasingEnabled()
- && this.currentImage.getColorModel().getPixelSize() > 1) {
- graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
- graphics2D.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
- RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
- } else {
- graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_OFF);
- graphics2D.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
- RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
- }
- if (getSettings().isQualityRenderingEnabled()) {
- graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING,
- RenderingHints.VALUE_RENDER_QUALITY);
- } else {
- graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING,
- RenderingHints.VALUE_RENDER_SPEED);
- }
- graphics2D.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL,
- RenderingHints.VALUE_STROKE_PURE);
- graphics2D.scale(scale / 1000f, scale / 1000f);
-
- return new Java2DPainter(graphics2D, getContext(), getFontInfo());
- }
-
- /**
- * Creates a new BufferedImage.
- * @param bitmapWidth the desired width in pixels
- * @param bitmapHeight the desired height in pixels
- * @return the new BufferedImage instance
- */
- protected BufferedImage createBufferedImage(int bitmapWidth, int bitmapHeight) {
- return new BufferedImage(bitmapWidth, bitmapHeight, getSettings().getBufferedImageType());
- }
-
- /** {@inheritDoc} */
- public void endPageContent() throws IFException {
- try {
- if (this.multiImageWriter == null) {
- switch (this.pageCount) {
- case 1:
- this.imageWriter.writeImage(
- this.currentImage, this.outputStream,
- getSettings().getWriterParams());
- break;
- case 2:
- BitmapRendererEventProducer eventProducer
- = BitmapRendererEventProducer.Provider.get(
- getUserAgent().getEventBroadcaster());
- eventProducer.stoppingAfterFirstPageNoFilename(this);
- break;
- default:
- //ignore
- }
- } else {
- this.multiImageWriter.writeImage(this.currentImage,
- getSettings().getWriterParams());
- }
- this.currentImage = null;
- } catch (IOException ioe) {
- throw new IFException("I/O error while encoding BufferedImage", ioe);
- }
- }
-
- /** {@inheritDoc} */
- public void endPage() throws IFException {
- this.currentPageDimensions = null;
- }
-
- /** {@inheritDoc} */
- public void handleExtensionObject(Object extension) throws IFException {
- if (false) {
- //TODO Handle extensions
- } else {
- log.debug("Don't know how to handle extension object. Ignoring: "
- + extension + " (" + extension.getClass().getName() + ")");
- }
- }
-
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java Tue Oct 13 16:41:13 2009
@@ -19,38 +19,19 @@
package org.apache.fop.render.bitmap;
-import java.awt.Color;
-import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
-import java.util.List;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.fonts.FontCollection;
-import org.apache.fop.fonts.FontEventAdapter;
-import org.apache.fop.fonts.FontEventListener;
-import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.fonts.FontManager;
-import org.apache.fop.fonts.FontResolver;
-import org.apache.fop.render.DefaultFontResolver;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.intermediate.IFDocumentHandler;
-import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
-import org.apache.fop.render.java2d.Base14FontCollection;
-import org.apache.fop.render.java2d.ConfiguredFontCollection;
-import org.apache.fop.render.java2d.InstalledFontCollection;
-import org.apache.fop.render.java2d.Java2DFontMetrics;
-import org.apache.fop.render.java2d.Java2DRenderer;
-import org.apache.fop.render.java2d.Java2DRendererConfigurator;
-import org.apache.fop.util.ColorUtil;
/**
* TIFF Renderer configurator
*/
-public class TIFFRendererConfigurator extends Java2DRendererConfigurator
- implements IFDocumentHandlerConfigurator {
+public class TIFFRendererConfigurator extends BitmapRendererConfigurator {
/**
* Default constructor
@@ -85,6 +66,12 @@
super.configure(renderer);
}
+ /**
+ * Determines the type value for the BufferedImage to be produced for rendering
+ * the bitmap image.
+ * @param compressionName the compression name
+ * @return a value from the {@link BufferedImage}.TYPE_* constants
+ */
private int getBufferedImageTypeFor(String compressionName) {
if (compressionName.equalsIgnoreCase(TIFFConstants.COMPRESSION_CCITT_T6)) {
return BufferedImage.TYPE_BYTE_BINARY;
@@ -99,6 +86,7 @@
/** {@inheritDoc} */
public void configure(IFDocumentHandler documentHandler) throws FOPException {
+ super.configure(documentHandler);
Configuration cfg = super.getRendererConfig(documentHandler.getMimeType());
if (cfg != null) {
TIFFDocumentHandler tiffHandler = (TIFFDocumentHandler)documentHandler;
@@ -113,75 +101,7 @@
if (log.isInfoEnabled()) {
log.info("TIFF compression set to " + name);
}
-
- boolean transparent = cfg.getChild(
- Java2DRenderer.JAVA2D_TRANSPARENT_PAGE_BACKGROUND).getValueAsBoolean(
- settings.hasTransparentPageBackground());
- if (transparent) {
- settings.setPageBackgroundColor(null);
- } else {
- String background = cfg.getChild("background-color").getValue(null);
- if (background != null) {
- settings.setPageBackgroundColor(
- ColorUtil.parseColorString(this.userAgent, background));
- } else {
- settings.setPageBackgroundColor(Color.WHITE);
- }
- }
-
- boolean antiAliasing = cfg.getChild("anti-aliasing").getValueAsBoolean(
- settings.isAntiAliasingEnabled());
- settings.setAntiAliasing(antiAliasing);
-
- String optimization = cfg.getChild("rendering").getValue(null);
- if ("quality".equalsIgnoreCase(optimization)) {
- settings.setQualityRendering(true);
- } else if ("speed".equalsIgnoreCase(optimization)) {
- settings.setQualityRendering(false);
- }
-
- String color = cfg.getChild("color-mode").getValue(null);
- if (color != null) {
- if ("rgba".equalsIgnoreCase(color)) {
- settings.setBufferedImageType(BufferedImage.TYPE_INT_ARGB);
- } else if ("rgb".equalsIgnoreCase(color)) {
- settings.setBufferedImageType(BufferedImage.TYPE_INT_RGB);
- } else if ("gray".equalsIgnoreCase(color)) {
- settings.setBufferedImageType(BufferedImage.TYPE_BYTE_GRAY);
- } else if ("binary".equalsIgnoreCase(color)) {
- settings.setBufferedImageType(BufferedImage.TYPE_BYTE_BINARY);
- } else {
- throw new FOPException("Invalid value for color-mode: " + color);
- }
- }
}
}
- /** {@inheritDoc} */
- public void setupFontInfo(IFDocumentHandler documentHandler, FontInfo fontInfo)
- throws FOPException {
- FontManager fontManager = userAgent.getFactory().getFontManager();
-
- Graphics2D graphics2D = Java2DFontMetrics.createFontMetricsGraphics2D();
-
- List fontCollections = new java.util.ArrayList();
- fontCollections.add(new Base14FontCollection(graphics2D));
- fontCollections.add(new InstalledFontCollection(graphics2D));
-
- Configuration cfg = super.getRendererConfig(documentHandler.getMimeType());
- if (cfg != null) {
- FontResolver fontResolver = new DefaultFontResolver(userAgent);
- FontEventListener listener = new FontEventAdapter(
- userAgent.getEventBroadcaster());
- List fontList = buildFontList(cfg, fontResolver, listener);
- fontCollections.add(new ConfiguredFontCollection(fontResolver, fontList));
- }
-
- fontManager.setup(fontInfo,
- (FontCollection[])fontCollections.toArray(
- new FontCollection[fontCollections.size()]));
- documentHandler.setFontInfo(fontInfo);
- }
-
-
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -37,7 +37,7 @@
import org.apache.fop.fonts.base14.Base14FontCollection;
/**
- * Abstract base class for binary-writing {@code IFDocumentHandler} implementations.
+ * Abstract base class for binary-writing {@link IFDocumentHandler} implementations.
*/
public abstract class AbstractBinaryWritingIFDocumentHandler extends AbstractIFDocumentHandler {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -25,7 +25,7 @@
import org.apache.fop.apps.FOUserAgent;
/**
- * Abstract base class for {@code IFDocumentHandler} implementations.
+ * Abstract base class for {@link IFDocumentHandler} implementations.
*/
public abstract class AbstractIFDocumentHandler implements IFDocumentHandler {
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java:699793-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java:699793-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java Tue Oct 13 16:41:13 2009
@@ -22,13 +22,13 @@
import org.apache.fop.apps.FOUserAgent;
/**
- * Base class for factory classes which instantiate {@code IFDocumentHandler}s and provide
+ * Base class for factory classes which instantiate {@link IFDocumentHandler}s and provide
* information about them.
*/
public abstract class AbstractIFDocumentHandlerMaker {
/**
- * Instantiates a new {@code IFDocumentHandler}.
+ * Instantiates a new {@link IFDocumentHandler}.
* @param userAgent the user agent
* @return the newly instantiated document handler
*/
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -32,7 +32,7 @@
import org.apache.fop.util.GenerationHelperContentHandler;
/**
- * Abstract base class for XML-writing {@code IFDocumentHandler} implementations.
+ * Abstract base class for XML-writing {@link IFDocumentHandler} implementations.
*/
public abstract class AbstractXMLWritingIFDocumentHandler extends AbstractIFDocumentHandler {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AffineTransformArrayParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AffineTransformArrayParser.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AffineTransformArrayParser.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AffineTransformArrayParser.java Tue Oct 13 16:41:13 2009
@@ -28,7 +28,7 @@
import org.apache.batik.parser.TransformListParser;
/**
- * This class parses a sequence of transformations into an array of {@code AffineTransform}
+ * This class parses a sequence of transformations into an array of {@link AffineTransform}
* instances.
*/
public class AffineTransformArrayParser implements TransformListHandler {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/DelegatingFragmentContentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/DelegatingFragmentContentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/DelegatingFragmentContentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/DelegatingFragmentContentHandler.java Tue Oct 13 16:41:13 2009
@@ -29,8 +29,8 @@
import org.apache.fop.util.DelegatingContentHandler;
/**
- * This class is a {@code DelegatingContentHandler} subclass which swallows the
- * {@code #startDocument()} and {@code #endDocument()} methods. This is useful for handling
+ * This class is a {@link DelegatingContentHandler} subclass which swallows the
+ * {@link #startDocument()} and {@link #endDocument()} methods. This is useful for handling
* XML fragments.
*/
public class DelegatingFragmentContentHandler extends DelegatingContentHandler {
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFContentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFContentHandler.java:680381-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFContentHandler.java:680381-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -153,8 +153,8 @@
/**
* Indicates the start of the document header. This method is called right after the
- * {@code #startDocument()} method. Extensions sent to this painter between
- * {@code #startDocumentHeader()} and {@code #endDocumentHeader()} apply to the document as
+ * {@link #startDocument()} method. Extensions sent to this painter between
+ * {@link #startDocumentHeader()} and {@link #endDocumentHeader()} apply to the document as
* a whole (like document metadata).
* @throws IFException if an error occurs while handling this event
*/
@@ -170,7 +170,7 @@
/**
* Indicates the start of the document trailer. This method is called after the last
* page sequence. Extensions sent to the painter between
- * {@code #startDocumentTrailer()} and {@code #endDocumentTrailer()} apply to the document as
+ * {@link #startDocumentTrailer()} and {@link #endDocumentTrailer()} apply to the document as
* a whole and is used for document-level content that is only known after all pages have
* been rendered (like named destinations or the bookmark tree).
* @throws IFException if an error occurs while handling this event
@@ -179,7 +179,7 @@
/**
* Indicates the end of the document trailer. This method is called right before the
- * {@code #endDocument()} method.
+ * {@link #endDocument()} method.
* @throws IFException if an error occurs while handling this event
*/
void endDocumentTrailer() throws IFException;
@@ -226,7 +226,7 @@
void endPageHeader() throws IFException;
/**
- * Indicates the start of the page content. The method returns an {@code IFPainter} interface
+ * Indicates the start of the page content. The method returns an {@link IFPainter} interface
* which is used to paint the page contents.
* @throws IFException if an error occurs while handling this event
* @return the IFPainter for the page content
@@ -234,8 +234,8 @@
IFPainter startPageContent() throws IFException;
/**
- * Indicates the end of the page content. Calls to the {@code IFPainter} returned by the
- * respective {@code #startPageContent()} method are illegal.
+ * Indicates the end of the page content. Calls to the {@link IFPainter} returned by the
+ * respective {@link #startPageContent()} method are illegal.
* @throws IFException if an error occurs while handling this event
*/
void endPageContent() throws IFException;
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java Tue Oct 13 16:41:13 2009
@@ -23,7 +23,7 @@
import org.apache.fop.fonts.FontInfo;
/**
- * This interface is implemented by classes that configure an {@code IFDocumentHandler} instance.
+ * This interface is implemented by classes that configure an {@link IFDocumentHandler} instance.
*/
public interface IFDocumentHandlerConfigurator {
@@ -35,7 +35,7 @@
void configure(IFDocumentHandler documentHandler) throws FOPException;
/**
- * Sets up the {@code FontInfo} object for the IFDocumentHandler.
+ * Sets up the {@link FontInfo} object for the IFDocumentHandler.
* @param documentHandler the document handler instance
* @param fontInfo the font info object to set up
* @throws FOPException if an error occurs while configuring the object
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFException.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFException.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFException.java Tue Oct 13 16:41:13 2009
@@ -35,7 +35,7 @@
* @param message the detail message (which is saved for later retrieval
* by the {@link #getMessage()} method).
* @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
+ * {@link #getCause()} method). (A <code>null</code> value is
* permitted, and indicates that the cause is nonexistent or
* unknown.)
*/
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java Tue Oct 13 16:41:13 2009
@@ -175,7 +175,7 @@
void fillRect(Rectangle rect, Paint fill) throws IFException;
/**
- * Draws a border rectangle. The border segments are specified through {@code BorderProps}
+ * Draws a border rectangle. The border segments are specified through {@link BorderProps}
* instances.
* @param rect the rectangle's coordinates and extent
* @param before the border segment on the before-side (top)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFPainter.java:680381-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFPainter.java:680381-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFParser.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFParser.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFParser.java Tue Oct 13 16:41:13 2009
@@ -65,7 +65,7 @@
/**
* This is a parser for the intermediate format XML which converts the intermediate file into
- * {@code IFPainter} events.
+ * {@link IFPainter} events.
*/
public class IFParser implements IFConstants {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java Tue Oct 13 16:41:13 2009
@@ -99,7 +99,7 @@
import org.apache.fop.traits.RuleStyle;
/**
- * This renderer implementation is an adapter to the {@code IFPainter} interface. It is used
+ * This renderer implementation is an adapter to the {@link IFPainter} interface. It is used
* to generate content using FOP's intermediate format.
*/
public class IFRenderer extends AbstractPathOrientedRenderer {
@@ -166,8 +166,8 @@
}
/**
- * Sets the {@code IFDocumentHandler} to be used by the {@code IFRenderer}.
- * @param documentHandler the {@code IFDocumentHandler}
+ * Sets the {@link IFDocumentHandler} to be used by the {@link IFRenderer}.
+ * @param documentHandler the {@link IFDocumentHandler}
*/
public void setDocumentHandler(IFDocumentHandler documentHandler) {
this.documentHandler = documentHandler;
@@ -221,7 +221,7 @@
}
/**
- * Creates a default {@code IFDocumentHandler} when none has been set.
+ * Creates a default {@link IFDocumentHandler} when none has been set.
* @return the default IFDocumentHandler
*/
protected IFDocumentHandler createDefaultDocumentHandler() {
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java:680381-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java:680381-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFUtil.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFUtil.java Tue Oct 13 16:41:13 2009
@@ -42,7 +42,7 @@
}
/**
- * Converts an {@code AffineTransform} instance to an SVG style transform method.
+ * Converts an {@link AffineTransform} instance to an SVG style transform method.
* @param transform the transformation matrix
* @param sb the StringBuffer to write the transform method to
* @return the StringBuffer passed to this method
@@ -73,7 +73,7 @@
}
/**
- * Converts an {@code AffineTransform} array to an SVG style transform method sequence.
+ * Converts an {@link AffineTransform} array to an SVG style transform method sequence.
* @param transforms the transformation matrix array
* @param sb the StringBuffer to write the transform method sequence to
* @return the StringBuffer passed to this method
@@ -89,7 +89,7 @@
}
/**
- * Converts an {@code AffineTransform} array to an SVG style transform method sequence.
+ * Converts an {@link AffineTransform} array to an SVG style transform method sequence.
* @param transforms the transformation matrix array
* @return the formatted array
*/
@@ -98,7 +98,7 @@
}
/**
- * Converts an {@code AffineTransform} instance to an SVG style transform method.
+ * Converts an {@link AffineTransform} instance to an SVG style transform method.
* @param transform the transformation matrix
* @return the formatted array
*/
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java:685127-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java:685127-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java Tue Oct 13 16:41:13 2009
@@ -35,8 +35,8 @@
/**
* FontMetricsMapper that delegates most methods to an underlying
- * <tt>FontMetrics</tt> instance. This class was designed to allow
- * the underlying <tt>java.awt.Font</tt> to be loaded from a
+ * {@link FontMetrics} instance. This class was designed to allow
+ * the underlying {@link java.awt.Font} to be loaded from a
* user-configured file not registered in the current graphics environment.
*/
public class CustomFontMetricsMapper extends Typeface implements FontMetricsMapper {
@@ -57,11 +57,11 @@
private float size = 1;
/**
- * Construction of this class results in the immediate construction.
- * of the underlying <tt>java.awt.Font</tt>
- * @param fontMetrics
- * @throws FontFormatException
- * @throws IOException
+ * Construction of this class results in the immediate construction
+ * of the underlying {@link java.awt.Font}.
+ * @param fontMetrics the metrics of the custom font
+ * @throws FontFormatException if a bad font is loaded
+ * @throws IOException if an I/O error occurs
*/
public CustomFontMetricsMapper(final CustomFont fontMetrics)
throws FontFormatException, IOException {
@@ -71,10 +71,11 @@
/**
* Construction of this class results in the immediate construction
- * of the underlying <tt>java.awt.Font</tt>
- * @param fontMetrics
- * @throws FontFormatException
- * @throws IOException
+ * of the underlying {@link java.awt.Font}.
+ * @param fontMetrics the font
+ * @param fontSource the font source to access the font
+ * @throws FontFormatException if a bad font is loaded
+ * @throws IOException if an I/O error occurs
*/
public CustomFontMetricsMapper(final LazyFont fontMetrics, final Source fontSource)
throws FontFormatException, IOException {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java Tue Oct 13 16:41:13 2009
@@ -22,14 +22,14 @@
import org.apache.fop.fonts.FontMetrics;
/**
- * Adds method to retrieve the actual <tt>java.awt.Font</tt>
- * for use by <tt>Java2DRenderer</tt>s.
+ * Adds method to retrieve the actual {@link java.awt.Font}
+ * for use by {@link Java2DRenderer}s.
*/
public interface FontMetricsMapper extends FontMetrics {
/**
- * Gets a Font instance of the Font that this
- * FontMetrics describes in the desired size.
+ * Gets a {@link Font} instance of the font that this
+ * {@link FontMetrics} describes in the desired size.
* @param size font size
* @return font with the desired characteristics.
*/
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java Tue Oct 13 16:41:13 2009
@@ -36,7 +36,7 @@
import org.apache.fop.util.ColorUtil;
/**
- * Java2D-specific implementation of the {@code BorderPainter}.
+ * Java2D-specific implementation of the {@link BorderPainter}.
*/
public class Java2DBorderPainter extends BorderPainter {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerGraphics2D.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerGraphics2D.java Tue Oct 13 16:41:13 2009
@@ -34,7 +34,7 @@
import org.apache.fop.render.RenderingContext;
/**
- * Image handler implementation that paints {@code Graphics2D} image on another {@code Graphics2D}
+ * Image handler implementation that paints {@link Graphics2D} image on another {@link Graphics2D}
* target.
*/
public class Java2DImageHandlerGraphics2D implements ImageHandler {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java Tue Oct 13 16:41:13 2009
@@ -36,7 +36,7 @@
import org.apache.fop.render.RenderingContext;
/**
- * Image handler implementation that paints {@code RenderedImage} instances on a {@code Graphics2D}
+ * Image handler implementation that paints {@link RenderedImage} instances on a {@link Graphics2D}
* object.
*/
public class Java2DImageHandlerRenderedImage implements ImageHandler {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DPainter.java Tue Oct 13 16:41:13 2009
@@ -43,13 +43,14 @@
import org.apache.fop.render.intermediate.AbstractIFPainter;
import org.apache.fop.render.intermediate.IFContext;
import org.apache.fop.render.intermediate.IFException;
+import org.apache.fop.render.intermediate.IFPainter;
import org.apache.fop.render.intermediate.IFState;
import org.apache.fop.traits.BorderProps;
import org.apache.fop.traits.RuleStyle;
import org.apache.fop.util.CharUtilities;
/**
- * {@code IFPainter} implementation that paints on a Graphics2D instance.
+ * {@link IFPainter} implementation that paints on a Graphics2D instance.
*/
public class Java2DPainter extends AbstractIFPainter {
@@ -105,7 +106,7 @@
}
/**
- * Returns the associated {@code FontInfo} object.
+ * Returns the associated {@link FontInfo} object.
* @return the font info
*/
protected FontInfo getFontInfo() {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DUtil.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DUtil.java Tue Oct 13 16:41:13 2009
@@ -33,7 +33,7 @@
public class Java2DUtil {
/**
- * Builds a default {@code FontInfo} object for use with output formats using the Java2D
+ * Builds a default {@link FontInfo} object for use with output formats using the Java2D
* font setup.
* @param fontInfo the font info object to populate
* @param userAgent the user agent
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -37,6 +37,7 @@
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;
@@ -45,7 +46,7 @@
import org.apache.fop.render.pcl.extensions.PCLElementMapping;
/**
- * {@code IFDocumentHandler} implementation that produces PCL 5.
+ * {@link IFDocumentHandler} implementation that produces PCL 5.
*/
public class PCLDocumentHandler extends AbstractBinaryWritingIFDocumentHandler
implements PCLConstants {
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java:699793-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java:699793-824832
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java:699793-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java:699793-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLImageHandlerRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLImageHandlerRenderedImage.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLImageHandlerRenderedImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLImageHandlerRenderedImage.java Tue Oct 13 16:41:13 2009
@@ -33,7 +33,7 @@
import org.apache.fop.render.RenderingContext;
/**
- * Image handler implementation that paints {@code RenderedImage} instances in PCL.
+ * Image handler implementation that paints {@link RenderedImage} instances in PCL.
*/
public class PCLImageHandlerRenderedImage implements ImageHandler {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLPainter.java Tue Oct 13 16:41:13 2009
@@ -52,6 +52,7 @@
import org.apache.fop.render.intermediate.AbstractIFPainter;
import org.apache.fop.render.intermediate.IFContext;
import org.apache.fop.render.intermediate.IFException;
+import org.apache.fop.render.intermediate.IFPainter;
import org.apache.fop.render.intermediate.IFState;
import org.apache.fop.render.java2d.FontMetricsMapper;
import org.apache.fop.render.java2d.Java2DPainter;
@@ -60,7 +61,7 @@
import org.apache.fop.util.CharUtilities;
/**
- * {@code IFPainter} implementation that produces PCL 5.
+ * {@link IFPainter} implementation that produces PCL 5.
*/
public class PCLPainter extends AbstractIFPainter implements PCLConstants {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java Tue Oct 13 16:41:13 2009
@@ -95,7 +95,7 @@
public abstract Point2D transformedPoint(int x, int y);
/**
- * Returns the current {@code GraphicContext} instance.
+ * Returns the current {@link GraphicContext} instance.
* @return the graphic context
*/
public abstract GraphicContext getGraphicContext();
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java Tue Oct 13 16:41:13 2009
@@ -84,7 +84,7 @@
/**
* Configures the renderer to trade speed for quality if desired. One example here is the way
* that borders are rendered.
- * @param mode one of the {@code PCLRenderingMode}.* constants
+ * @param mode one of the {@link PCLRenderingMode}.* constants
*/
public void setRenderingMode(PCLRenderingMode mode) {
this.renderingMode = mode;
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java Tue Oct 13 16:41:13 2009
@@ -32,7 +32,7 @@
import org.apache.fop.util.ColorUtil;
/**
- * PDF-specific implementation of the {@code BorderPainter}.
+ * PDF-specific implementation of the {@link BorderPainter}.
*/
public class PDFBorderPainter extends BorderPainter {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java Tue Oct 13 16:41:13 2009
@@ -107,7 +107,7 @@
}
/**
- * Returns the {@code PDFStream} associated with this instance.
+ * Returns the {@link PDFStream} associated with this instance.
* @return the PDF stream
*/
public PDFStream getStream() {
@@ -115,7 +115,7 @@
}
/**
- * Returns the {@code PDFState} associated with this instance.
+ * Returns the {@link PDFState} associated with this instance.
* @return the PDF state
*/
public PDFPaintingState getState() {
@@ -123,7 +123,7 @@
}
/**
- * Returns the {@code PDFTextUtil} associated with this instance.
+ * Returns the {@link PDFTextUtil} associated with this instance.
* @return the text utility
*/
public PDFTextUtil getTextUtil() {
@@ -190,7 +190,7 @@
}
/**
- * Restored the graphics state valid before the previous {@code #saveGraphicsState()}.
+ * Restored the graphics state valid before the previous {@link #saveGraphicsState()}.
* @param popState true if the state should also be popped, false if only the PDF command
* should be issued
*/
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -47,6 +47,7 @@
import org.apache.fop.render.extensions.prepress.PageScale;
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.IFDocumentNavigationHandler;
import org.apache.fop.render.intermediate.IFException;
@@ -54,7 +55,7 @@
import org.apache.fop.util.XMLUtil;
/**
- * {@code IFDocumentHandler} implementation that produces PDF.
+ * {@link IFDocumentHandler} implementation that produces PDF.
*/
public class PDFDocumentHandler extends AbstractBinaryWritingIFDocumentHandler {
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java:699793-816269
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java:699793-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java Tue Oct 13 16:41:13 2009
@@ -44,25 +44,25 @@
/**
* This class enables to transcode an input to a PostScript document.
*
- * <p>Two transcoding hints (<tt>KEY_WIDTH</tt> and
- * <tt>KEY_HEIGHT</tt>) can be used to respectively specify the image
+ * <p>Two transcoding hints (<code>KEY_WIDTH</code> and
+ * <code>KEY_HEIGHT</code>) can be used to respectively specify the image
* width and the image height. If only one of these keys is specified,
* the transcoder preserves the aspect ratio of the original image.
*
- * <p>The <tt>KEY_BACKGROUND_COLOR</tt> defines the background color
+ * <p>The <code>KEY_BACKGROUND_COLOR</code> defines the background color
* to use for opaque image formats, or the background color that may
* be used for image formats that support alpha channel.
*
- * <p>The <tt>KEY_AOI</tt> represents the area of interest to paint
+ * <p>The <code>KEY_AOI</code> represents the area of interest to paint
* in device space.
*
* <p>Three additional transcoding hints that act on the SVG
* processor can be specified:
*
- * <p><tt>KEY_LANGUAGE</tt> to set the default language to use (may be
+ * <p><code>KEY_LANGUAGE</code> to set the default language to use (may be
* used by a <switch> SVG element for example),
- * <tt>KEY_USER_STYLESHEET_URI</tt> to fix the URI of a user
- * stylesheet, and <tt>KEY_PIXEL_TO_MM</tt> to specify the pixel to
+ * <code>KEY_USER_STYLESHEET_URI</code> to fix the URI of a user
+ * stylesheet, and <code>KEY_PIXEL_TO_MM</code> to specify the pixel to
* millimeter conversion factor.
*
* @author <a href="mailto:keiron@aftexsw.com">Keiron Liddle</a>
@@ -76,7 +76,7 @@
private FontInfo fontInfo;
/**
- * Constructs a new <tt>AbstractPSTranscoder</tt>.
+ * Constructs a new {@link AbstractPSTranscoder}.
*/
public AbstractPSTranscoder() {
super();
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/EPSTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/EPSTranscoder.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/EPSTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/EPSTranscoder.java Tue Oct 13 16:41:13 2009
@@ -25,25 +25,25 @@
/**
* This class enables to transcode an input to a EPS document.
*
- * <p>Two transcoding hints (<tt>KEY_WIDTH</tt> and
- * <tt>KEY_HEIGHT</tt>) can be used to respectively specify the image
+ * <p>Two transcoding hints (<code>KEY_WIDTH</code> and
+ * <code>KEY_HEIGHT</code>) can be used to respectively specify the image
* width and the image height. If only one of these keys is specified,
* the transcoder preserves the aspect ratio of the original image.
*
- * <p>The <tt>KEY_BACKGROUND_COLOR</tt> defines the background color
+ * <p>The <code>KEY_BACKGROUND_COLOR</code> defines the background color
* to use for opaque image formats, or the background color that may
* be used for image formats that support alpha channel.
*
- * <p>The <tt>KEY_AOI</tt> represents the area of interest to paint
+ * <p>The <code>KEY_AOI</code> represents the area of interest to paint
* in device space.
*
* <p>Three additional transcoding hints that act on the SVG
* processor can be specified:
*
- * <p><tt>KEY_LANGUAGE</tt> to set the default language to use (may be
+ * <p><code>KEY_LANGUAGE</code> to set the default language to use (may be
* used by a <switch> SVG element for example),
- * <tt>KEY_USER_STYLESHEET_URI</tt> to fix the URI of a user
- * stylesheet, and <tt>KEY_PIXEL_TO_MM</tt> to specify the pixel to
+ * <code>KEY_USER_STYLESHEET_URI</code> to fix the URI of a user
+ * stylesheet, and <code>KEY_PIXEL_TO_MM</code> to specify the pixel to
* millimeter conversion factor.
*
* @author <a href="mailto:keiron@aftexsw.com">Keiron Liddle</a>
@@ -52,7 +52,7 @@
public class EPSTranscoder extends AbstractPSTranscoder {
/**
- * Constructs a new <tt>EPSPSTranscoder</tt>.
+ * Constructs a new {@link EPSTranscoder}.
*/
public EPSTranscoder() {
super();
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSBorderPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSBorderPainter.java Tue Oct 13 16:41:13 2009
@@ -34,7 +34,7 @@
import org.apache.fop.util.ColorUtil;
/**
- * PostScript-specific implementation of the {@code BorderPainter}.
+ * PostScript-specific implementation of the {@link BorderPainter}.
*/
public class PSBorderPainter extends BorderPainter {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -52,6 +52,7 @@
import org.apache.fop.apps.MimeConstants;
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;
@@ -61,7 +62,7 @@
import org.apache.fop.render.ps.extensions.PSSetupCode;
/**
- * {@code IFDocumentHandler} implementation that produces PostScript.
+ * {@link IFDocumentHandler} implementation that produces PostScript.
*/
public class PSDocumentHandler extends AbstractBinaryWritingIFDocumentHandler {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSRenderingUtil.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSRenderingUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSRenderingUtil.java Tue Oct 13 16:41:13 2009
@@ -206,7 +206,7 @@
/**
* Indicates whether the "safe setpagedevice" mode is active.
- * See {@code #setSafeSetPageDevice(boolean)} for more information.
+ * See {@link #setSafeSetPageDevice(boolean)} for more information.
* @return true if active
*/
public boolean isSafeSetPageDevice() {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTextPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTextPainter.java Tue Oct 13 16:41:13 2009
@@ -49,7 +49,7 @@
import org.apache.fop.util.CharUtilities;
/**
- * Renders the attributed character iterator of a <tt>TextNode</tt>.
+ * Renders the attributed character iterator of a {@link TextNode}.
* This class draws the text directly using PostScript text operators so
* the text is not drawn using shapes which makes the PS files larger.
* <p>
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTranscoder.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTranscoder.java Tue Oct 13 16:41:13 2009
@@ -25,25 +25,25 @@
/**
* This class enables to transcode an input to a PostScript document.
*
- * <p>Two transcoding hints (<tt>KEY_WIDTH</tt> and
- * <tt>KEY_HEIGHT</tt>) can be used to respectively specify the image
+ * <p>Two transcoding hints (<code>KEY_WIDTH</code> and
+ * <code>KEY_HEIGHT</code>) can be used to respectively specify the image
* width and the image height. If only one of these keys is specified,
* the transcoder preserves the aspect ratio of the original image.
*
- * <p>The <tt>KEY_BACKGROUND_COLOR</tt> defines the background color
+ * <p>The <code>KEY_BACKGROUND_COLOR</code> defines the background color
* to use for opaque image formats, or the background color that may
* be used for image formats that support alpha channel.
*
- * <p>The <tt>KEY_AOI</tt> represents the area of interest to paint
+ * <p>The <code>KEY_AOI</code> represents the area of interest to paint
* in device space.
*
* <p>Three additional transcoding hints that act on the SVG
* processor can be specified:
*
- * <p><tt>KEY_LANGUAGE</tt> to set the default language to use (may be
+ * <p><code>KEY_LANGUAGE</code> to set the default language to use (may be
* used by a <switch> SVG element for example),
- * <tt>KEY_USER_STYLESHEET_URI</tt> to fix the URI of a user
- * stylesheet, and <tt>KEY_PIXEL_TO_MM</tt> to specify the pixel to
+ * <code>KEY_USER_STYLESHEET_URI</code> to fix the URI of a user
+ * stylesheet, and <code>KEY_PIXEL_TO_MM</code> to specify the pixel to
* millimeter conversion factor.
*
* @author <a href="mailto:keiron@aftexsw.com">Keiron Liddle</a>
@@ -52,7 +52,7 @@
public class PSTranscoder extends AbstractPSTranscoder {
/**
- * Constructs a new <tt>PSTranscoder</tt>.
+ * Constructs a new {@link PSTranscoder}.
*/
public PSTranscoder() {
super();
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
('svn:executable' removed)
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java Tue Oct 13 16:41:13 2009
@@ -49,9 +49,8 @@
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontTriplet;
-
/**
- * Renders the attributed character iterator of a <tt>TextNode</tt>.
+ * Renders the attributed character iterator of a {@link TextNode}.
* This class draws the text directly into the Graphics2D so that
* the text is not drawn using shapes.
* If the text is simple enough to draw then it sets the font and calls
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java Tue Oct 13 16:41:13 2009
@@ -180,7 +180,7 @@
}
/**
- * Creates a <tt>DocumentFactory</tt> that is used to create an SVG DOM
+ * Creates a {@link DocumentFactory} that is used to create an SVG DOM
* tree. The specified DOM Implementation is ignored and the Batik
* SVG DOM Implementation is automatically used.
*
@@ -326,7 +326,7 @@
protected class FOPTranscoderUserAgent extends SVGAbstractTranscoderUserAgent {
/**
- * Displays the specified error message using the <tt>ErrorHandler</tt>.
+ * Displays the specified error message using the {@link ErrorHandler}.
* @param message the message to display
*/
public void displayError(String message) {
@@ -338,7 +338,7 @@
}
/**
- * Displays the specified error using the <tt>ErrorHandler</tt>.
+ * Displays the specified error using the {@link ErrorHandler}.
* @param e the exception to display
*/
public void displayError(Exception e) {
@@ -350,7 +350,7 @@
}
/**
- * Displays the specified message using the <tt>ErrorHandler</tt>.
+ * Displays the specified message using the {@link ErrorHandler}.
* @param message the message to display
*/
public void displayMessage(String message) {
@@ -359,7 +359,7 @@
/**
* Returns the pixel to millimeter conversion factor specified in the
- * <tt>TranscodingHints</tt> or 0.3528 if any.
+ * {@link TranscodingHints} or 0.3528 if any.
* @return the pixel unit to millimeter factor
*/
public float getPixelUnitToMillimeter() {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFAElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFAElementBridge.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFAElementBridge.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFAElementBridge.java Tue Oct 13 16:41:13 2009
@@ -21,14 +21,14 @@
import java.awt.geom.AffineTransform;
+import org.w3c.dom.Element;
+import org.w3c.dom.svg.SVGAElement;
+
import org.apache.batik.bridge.AbstractGraphicsNodeBridge;
import org.apache.batik.bridge.BridgeContext;
-
+import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
-import org.w3c.dom.Element;
-import org.w3c.dom.svg.SVGAElement;
-
/**
* Bridge class for the <a> element.
*
@@ -65,7 +65,7 @@
}
/**
- * Creates a <tt>CompositeGraphicsNode</tt>.
+ * Creates a {@link CompositeGraphicsNode}.
* @return a new PDFANode
*/
protected GraphicsNode instantiateGraphicsNode() {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFANode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFANode.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFANode.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFANode.java Tue Oct 13 16:41:13 2009
@@ -19,15 +19,14 @@
package org.apache.fop.svg;
-import org.apache.batik.gvt.CompositeGraphicsNode;
-
import java.awt.Graphics2D;
import java.awt.Shape;
-import java.awt.geom.Rectangle2D;
import java.awt.geom.AffineTransform;
-
+import java.awt.geom.Rectangle2D;
import java.util.StringTokenizer;
+import org.apache.batik.gvt.CompositeGraphicsNode;
+
/**
* A graphics node that represents an image described as a graphics node.
*
@@ -38,7 +37,7 @@
private AffineTransform transform;
/**
- * Constructs a new empty <tt>PDFANode</tt>.
+ * Constructs a new empty {@link PDFANode}.
*/
public PDFANode() {
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java Tue Oct 13 16:41:13 2009
@@ -44,9 +44,9 @@
import org.apache.fop.pdf.PDFStream;
/**
- * This class is a wrapper for the <tt>PDFGraphics2D</tt> that
- * is used to create a full document around the pdf rendering from
- * <tt>PDFGraphics2D</tt>.
+ * This class is a wrapper for the {@link PDFGraphics2D} that
+ * is used to create a full document around the PDF rendering from
+ * {@link PDFGraphics2D}.
*
* @see org.apache.fop.svg.PDFGraphics2D
*/
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java Tue Oct 13 16:41:13 2009
@@ -19,12 +19,12 @@
package org.apache.fop.svg;
-import java.awt.Rectangle;
import java.awt.GraphicsDevice;
+import java.awt.Rectangle;
import java.awt.Transparency;
-import java.awt.image.ColorModel;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
/**
@@ -92,7 +92,7 @@
}
/**
- * Return a good color model given <tt>transparency</tt>
+ * Return a good color model given <code>transparency</code>
*
* @param transparency the alpha value for the colour model
* @return the colour model for the configuration
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTextPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTextPainter.java Tue Oct 13 16:41:13 2009
@@ -40,7 +40,7 @@
import org.apache.fop.util.CharUtilities;
/**
- * Renders the attributed character iterator of a <tt>TextNode</tt>.
+ * Renders the attributed character iterator of a {@link TextNode}.
* This class draws the text directly into the PDFGraphics2D so that
* the text is not drawn using shapes which makes the PDF files larger.
* If the text is simple enough to draw then it sets the font and calls
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTranscoder.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTranscoder.java Tue Oct 13 16:41:13 2009
@@ -43,28 +43,28 @@
/**
* This class enables to transcode an input to a pdf document.
*
- * <p>Two transcoding hints (<tt>KEY_WIDTH</tt> and
- * <tt>KEY_HEIGHT</tt>) can be used to respectively specify the image
+ * <p>Two transcoding hints (<code>KEY_WIDTH</code> and
+ * <code>KEY_HEIGHT</code>) can be used to respectively specify the image
* width and the image height. If only one of these keys is specified,
* the transcoder preserves the aspect ratio of the original image.
*
- * <p>The <tt>KEY_BACKGROUND_COLOR</tt> defines the background color
+ * <p>The <code>KEY_BACKGROUND_COLOR</code> defines the background color
* to use for opaque image formats, or the background color that may
* be used for image formats that support alpha channel.
*
- * <p>The <tt>KEY_AOI</tt> represents the area of interest to paint
+ * <p>The <code>KEY_AOI</code> represents the area of interest to paint
* in device space.
*
* <p>Three additional transcoding hints that act on the SVG
* processor can be specified:
*
- * <p><tt>KEY_LANGUAGE</tt> to set the default language to use (may be
+ * <p><code>KEY_LANGUAGE</code> to set the default language to use (may be
* used by a <switch> SVG element for example),
- * <tt>KEY_USER_STYLESHEET_URI</tt> to fix the URI of a user
- * stylesheet, and <tt>KEY_PIXEL_TO_MM</tt> to specify the pixel to
+ * <code>KEY_USER_STYLESHEET_URI</code> to fix the URI of a user
+ * stylesheet, and <code>KEY_PIXEL_TO_MM</code> to specify the pixel to
* millimeter conversion factor.
*
- * <p><tt>KEY_AUTO_FONTS</tt> to disable the auto-detection of fonts installed in the system.
+ * <p><code>KEY_AUTO_FONTS</code> to disable the auto-detection of fonts installed in the system.
* The PDF Transcoder cannot use AWT's font subsystem and that's why the fonts have to be
* configured differently. By default, font auto-detection is enabled to match the behaviour
* of the other transcoders, but this may be associated with a price in the form of a small
@@ -80,7 +80,7 @@
protected PDFDocumentGraphics2D graphics = null;
/**
- * Constructs a new <tt>PDFTranscoder</tt>.
+ * Constructs a new {@link PDFTranscoder}.
*/
public PDFTranscoder() {
super();
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/traits/TraitEnum.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/traits/TraitEnum.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/traits/TraitEnum.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/traits/TraitEnum.java Tue Oct 13 16:41:13 2009
@@ -30,7 +30,7 @@
/**
* Constructor to add a new named item.
* @param name Name of the item.
- * @param enumValue the {@code Constants}.EN_* value
+ * @param enumValue the {@link Constants}.EN_* value
*/
protected TraitEnum(String name, int enumValue) {
this.name = name;
@@ -46,7 +46,7 @@
}
/**
- * Returns the enumeration value (one of {@code Constants}.EN_*).
+ * Returns the enumeration value (one of {@link Constants}.EN_*).
* @return the enumeration value
*/
public int getEnumValue() {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/DecimalFormatCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/DecimalFormatCache.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/DecimalFormatCache.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/DecimalFormatCache.java Tue Oct 13 16:41:13 2009
@@ -24,9 +24,9 @@
import java.util.Locale;
/**
- * This class provides a cache for {@code DecimalFormat} instance. {@code DecimalFormat} itself
+ * This class provides a cache for {@link DecimalFormat} instance. {@link DecimalFormat} itself
* is not thread-safe but since FOP needs to format a lot of numbers the same way, it shall
- * be cached in a {@code ThreadLocal}.
+ * be cached in a {@link ThreadLocal}.
*/
public class DecimalFormatCache {
@@ -59,7 +59,7 @@
}
/**
- * Returns a cached {@code DecimalFormat} instance for the given number of decimal digits.
+ * Returns a cached {@link DecimalFormat} instance for the given number of decimal digits.
* @param dec the number of decimal digits.
* @return the DecimalFormat instance
*/
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/XMLUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/XMLUtil.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/XMLUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/XMLUtil.java Tue Oct 13 16:41:13 2009
@@ -149,7 +149,7 @@
}
/**
- * Adds an attribute to a given {@code AttributesImpl} instance.
+ * Adds an attribute to a given {@link AttributesImpl} instance.
* @param atts the attributes collection
* @param attribute the attribute to add
* @param value the attribute's CDATA value
@@ -161,7 +161,7 @@
}
/**
- * Adds an attribute to a given {@code AttributesImpl} instance. The attribute will be
+ * Adds an attribute to a given {@link AttributesImpl} instance. The attribute will be
* added in the default namespace.
* @param atts the attributes collection
* @param localName the local name of the attribute
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:699793-816269
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:699793-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -45,15 +45,17 @@
import org.apache.commons.io.IOUtils;
+import org.apache.fop.render.bitmap.BitmapRendererEventProducer;
import org.apache.fop.render.bitmap.MultiFileRenderingUtil;
import org.apache.fop.render.intermediate.DelegatingFragmentContentHandler;
+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;
import org.apache.fop.util.XMLUtil;
/**
- * {@code IFDocumentHandler} implementation that writes SVG 1.1.
+ * {@link IFDocumentHandler} implementation that writes SVG 1.1.
*/
public class SVGDocumentHandler extends AbstractSVGDocumentHandler {
@@ -209,9 +211,10 @@
} else {
out = this.multiFileUtil.createOutputStream(index);
if (out == null) {
- //TODO Convert to event
- throw new IFException(
- "No filename information available. Stopping after first page.", null);
+ BitmapRendererEventProducer eventProducer
+ = BitmapRendererEventProducer.Provider.get(
+ getUserAgent().getEventBroadcaster());
+ eventProducer.stoppingAfterFirstPageNoFilename(this);
}
}
} catch (IOException ioe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org