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 2010/08/25 17:43:57 UTC
svn commit: r989178 - in /xmlgraphics/fop/trunk: ./
src/documentation/content/xdocs/trunk/ src/java/META-INF/services/
src/java/org/apache/fop/cli/ src/java/org/apache/fop/pdf/
src/java/org/apache/fop/render/ src/java/org/apache/fop/render/afp/
src/jav...
Author: vhennebert
Date: Wed Aug 25 15:43:55 2010
New Revision: 989178
URL: http://svn.apache.org/viewvc?rev=989178&view=rev
Log:
Removed old Renderer implementations for AFP, PCL, PDF, PS.
Removed:
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.afp.AFPImageHandler
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.pdf.PDFImageHandler
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2DAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerXML.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererMaker.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/TrueTypeAnsiTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/fonttest.xsl
Modified:
xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.Renderer
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGHandler.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml Wed Aug 25 15:43:55 2010
@@ -151,6 +151,7 @@
default-page-settings element to specify the two values.</td>
<td>"height" 11 inches, "width" 8.26 inches</td>
</tr>
+ <!-- Disabled: no simultaneous Renderer and IF implementations at the moment
<tr>
<td>prefer-renderer</td>
<td>boolean (true, false)</td>
@@ -163,6 +164,7 @@
</td>
<td>false</td>
</tr>
+ -->
<tr>
<td>use-cache</td>
<td>boolean (true, false)</td>
Modified: xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.Renderer
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.Renderer?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.Renderer (original)
+++ xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.Renderer Wed Aug 25 15:43:55 2010
@@ -1,10 +1,6 @@
-org.apache.fop.render.pdf.PDFRendererMaker
-org.apache.fop.render.ps.PSRendererMaker
org.apache.fop.render.txt.TXTRendererMaker
org.apache.fop.render.bitmap.PNGRendererMaker
org.apache.fop.render.bitmap.TIFFRendererMaker
org.apache.fop.render.xml.XMLRendererMaker
org.apache.fop.render.awt.AWTRendererMaker
org.apache.fop.render.print.PrintRendererMaker
-org.apache.fop.render.afp.AFPRendererMaker
-org.apache.fop.render.pcl.PCLRendererMaker
\ No newline at end of file
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=989178&r1=989177&r2=989178&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 Wed Aug 25 15:43:55 2010
@@ -51,7 +51,7 @@ import org.apache.fop.render.awt.AWTRend
import org.apache.fop.render.intermediate.IFContext;
import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFSerializer;
-import org.apache.fop.render.pdf.PDFRenderer;
+import org.apache.fop.render.pdf.PDFConfigurationConstants;
import org.apache.fop.render.print.PagesMode;
import org.apache.fop.render.print.PrintRenderer;
import org.apache.fop.render.xml.XMLRenderer;
@@ -805,14 +805,14 @@ public class CommandLineOptions {
private PDFEncryptionParams getPDFEncryptionParams() throws FOPException {
PDFEncryptionParams params = (PDFEncryptionParams)renderingOptions.get(
- PDFRenderer.ENCRYPTION_PARAMS);
+ PDFConfigurationConstants.ENCRYPTION_PARAMS);
if (params == null) {
if (!PDFEncryptionManager.checkAvailableAlgorithms()) {
throw new FOPException("PDF encryption requested but it is not available."
+ " Please make sure MD5 and RC4 algorithms are available.");
}
params = new PDFEncryptionParams();
- renderingOptions.put(PDFRenderer.ENCRYPTION_PARAMS, params);
+ renderingOptions.put(PDFConfigurationConstants.ENCRYPTION_PARAMS, params);
}
return params;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java Wed Aug 25 15:43:55 2010
@@ -65,6 +65,9 @@ import org.apache.fop.fonts.type1.PFBPar
*/
public class PDFFactory {
+ /** Resolution of the User Space coordinate system (72dpi). */
+ public static final int DEFAULT_PDF_RESOLUTION = 72;
+
private PDFDocument document;
private Log log = LogFactory.getLog(PDFFactory.class);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandler.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandler.java Wed Aug 25 15:43:55 2010
@@ -19,10 +19,7 @@
package org.apache.fop.render.afp;
-import java.awt.Point;
import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
import java.util.Map;
import org.apache.fop.afp.AFPDataObjectInfo;
@@ -44,44 +41,6 @@ public abstract class AFPImageHandler im
= new AFPForeignAttributeReader();
/**
- * Generates an intermediate AFPDataObjectInfo that is later used to construct
- * the appropriate data object in the AFP DataStream.
- *
- * @param rendererImageInfo the renderer image info
- * @return a data object info object
- * @throws IOException thrown if an I/O exception of some sort has occurred.
- */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
- AFPDataObjectInfo dataObjectInfo = createDataObjectInfo();
-
- // set resource information
- setResourceInformation(dataObjectInfo,
- rendererImageInfo.getURI(),
- rendererImageInfo.getForeignAttributes());
-
-
- Point origin = rendererImageInfo.getOrigin();
- Rectangle2D position = rendererImageInfo.getPosition();
- int srcX = Math.round(origin.x + (float)position.getX());
- int srcY = Math.round(origin.y + (float)position.getY());
- Rectangle targetRect = new Rectangle(
- srcX,
- srcY,
- (int)Math.round(position.getWidth()),
- (int)Math.round(position.getHeight()));
-
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
- AFPPaintingState paintingState = afpInfo.getPaintingState();
-
- dataObjectInfo.setObjectAreaInfo(createObjectAreaInfo(paintingState, targetRect));
-
- return dataObjectInfo;
- }
-
- /**
* Sets resource information on the data object info.
* @param dataObjectInfo the data object info instance
* @param uri the image's URI (or null if no URI is available)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java Wed Aug 25 15:43:55 2010
@@ -49,47 +49,6 @@ public class AFPImageHandlerGraphics2D e
ImageFlavor.GRAPHICS2D
};
- /** {@inheritDoc} */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
-
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
- ImageGraphics2D imageG2D = (ImageGraphics2D)rendererImageInfo.getImage();
- Graphics2DImagePainter painter = imageG2D.getGraphics2DImagePainter();
-
- if (afpInfo.paintAsBitmap()) {
- int x = afpInfo.getX();
- int y = afpInfo.getY();
- int width = afpInfo.getWidth();
- int height = afpInfo.getHeight();
- AFPPaintingState paintingState = afpInfo.getPaintingState();
- AFPGraphics2DAdapter g2dAdapter = new AFPGraphics2DAdapter(paintingState);
- g2dAdapter.paintImage(painter, rendererContext, x, y, width, height);
- return null;
- } else {
- AFPGraphicsObjectInfo graphicsObjectInfo
- = (AFPGraphicsObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
-
- setDefaultResourceLevel(graphicsObjectInfo, afpInfo.getResourceManager());
-
- // set mime type (unsupported by MOD:CA registry)
- graphicsObjectInfo.setMimeType(MimeConstants.MIME_AFP_GOCA);
-
- // set g2d
- boolean textAsShapes = false;
- AFPGraphics2D g2d = afpInfo.createGraphics2D(textAsShapes);
-
- graphicsObjectInfo.setGraphics2D(g2d);
-
- // set painter
- graphicsObjectInfo.setPainter(painter);
-
- return graphicsObjectInfo;
- }
- }
-
private void setDefaultResourceLevel(AFPGraphicsObjectInfo graphicsObjectInfo,
AFPResourceManager resourceManager) {
AFPResourceInfo resourceInfo = graphicsObjectInfo.getResourceInfo();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java Wed Aug 25 15:43:55 2010
@@ -66,26 +66,6 @@ public class AFPImageHandlerRenderedImag
ImageFlavor.RENDERED_IMAGE
};
- /** {@inheritDoc} */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
- AFPImageObjectInfo imageObjectInfo
- = (AFPImageObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
-
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
-
- setDefaultResourceLevel(imageObjectInfo, afpInfo.getResourceManager());
-
- AFPPaintingState paintingState = afpInfo.getPaintingState();
- ImageRendered imageRendered = (ImageRendered) rendererImageInfo.img;
- Dimension targetSize = new Dimension(afpInfo.getWidth(), afpInfo.getHeight());
-
- updateDataObjectInfo(imageObjectInfo, paintingState, imageRendered, targetSize);
- return imageObjectInfo;
- }
-
private AFPDataObjectInfo updateDataObjectInfo // CSOK: MethodLength
(AFPImageObjectInfo imageObjectInfo,
AFPPaintingState paintingState, ImageRendered imageRendered, Dimension targetSize)
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=989178&r1=989177&r2=989178&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 Wed Aug 25 15:43:55 2010
@@ -348,27 +348,12 @@ public class AFPRendererConfigurator ext
private static final String IMAGES_MODE_COLOR = "color";
/**
- * Configure the AFP renderer.
+ * Throws an UnsupportedOperationException.
*
- * @param renderer AFP renderer
- * @throws FOPException fop exception
- * @see org.apache.fop.render.PrintRendererConfigurator#configure(Renderer)
+ * @param renderer not used
*/
- public void configure(Renderer renderer) throws FOPException {
- Configuration cfg = super.getRendererConfig(renderer);
- if (cfg != null) {
- AFPRenderer afpRenderer = (AFPRenderer)renderer;
-
- try {
- List/*<AFPFontInfo>*/ fontList = buildFontListFromConfiguration(cfg);
- afpRenderer.setFontList(fontList);
- } catch (ConfigurationException e) {
- LogUtil.handleException(log, e,
- userAgent.getFactory().validateUserConfigStrictly());
- }
-
- configure(afpRenderer, cfg);
- }
+ public void configure(Renderer renderer) {
+ throw new UnsupportedOperationException();
}
private void configure(AFPCustomizable customizable, Configuration cfg) throws FOPException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java Wed Aug 25 15:43:55 2010
@@ -214,7 +214,7 @@ public class AFPSVGHandler extends Abstr
/** {@inheritDoc} */
public boolean supportsRenderer(Renderer renderer) {
- return (renderer instanceof AFPRenderer);
+ return false;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java Wed Aug 25 15:43:55 2010
@@ -44,21 +44,6 @@ import org.apache.fop.render.RenderingCo
public abstract class AbstractAFPImageHandlerRawStream extends AFPImageHandler
implements ImageHandler {
- /** {@inheritDoc} */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
- AFPDataObjectInfo dataObjectInfo = super.generateDataObjectInfo(rendererImageInfo);
- ImageRawStream rawStream = (ImageRawStream) rendererImageInfo.getImage();
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
-
- updateDataObjectInfo(dataObjectInfo, rawStream, afpInfo.getResourceManager());
-
- setAdditionalParameters(dataObjectInfo, rawStream);
- return dataObjectInfo;
- }
-
/**
* Sets additional parameters on the image object info being built. By default, this
* method does nothing but it can be overridden to provide additional functionality.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java Wed Aug 25 15:43:55 2010
@@ -57,20 +57,12 @@ public class PCLRendererConfigurator ext
}
/**
- * Configure the PCL renderer.
+ * Throws an UnsupportedOperationException.
*
- * @param renderer PCL renderer
- * @throws FOPException fop exception
+ * @param renderer not used
*/
- public void configure(Renderer renderer) throws FOPException {
- Configuration cfg = super.getRendererConfig(renderer);
- if (cfg != null) {
- PCLRenderer pclRenderer = (PCLRenderer)renderer;
-
- PCLRenderingUtil pclUtil = pclRenderer.getPCLUtil();
- configure(cfg, pclUtil);
- }
- super.configure(renderer);
+ public void configure(Renderer renderer) {
+ throw new UnsupportedOperationException();
}
private void configure(Configuration cfg, PCLRenderingUtil pclUtil) throws FOPException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java Wed Aug 25 15:43:55 2010
@@ -28,13 +28,12 @@ import org.apache.fop.render.RendererCon
* PCL XML handler for SVG. Uses Apache Batik for SVG processing.
* This handler handles XML for foreign objects when rendering to HP GL/2.
* It renders SVG to HP GL/2 using the PCLGraphics2D.
- * @see PCLGraphics2DAdapter
*/
public class PCLSVGHandler extends AbstractGenericSVGHandler {
/** {@inheritDoc} */
public boolean supportsRenderer(Renderer renderer) {
- return (renderer instanceof PCLRenderer);
+ return false;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java Wed Aug 25 15:43:55 2010
@@ -21,7 +21,6 @@ package org.apache.fop.render.pdf;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Point;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
@@ -31,9 +30,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageGraphics2D;
-import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.AbstractImageHandlerGraphics2D;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.pdf.PDFLogicalStructureHandler.MarkedContentInfo;
import org.apache.fop.svg.PDFGraphics2D;
@@ -41,37 +38,13 @@ import org.apache.fop.svg.PDFGraphics2D;
/**
* PDFImageHandler implementation which handles Graphics2D images.
*/
-public class PDFImageHandlerGraphics2D extends AbstractImageHandlerGraphics2D
- implements PDFImageHandler {
+public class PDFImageHandlerGraphics2D extends AbstractImageHandlerGraphics2D {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.GRAPHICS2D,
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- /*
- ImageGraphics2D imageG2D = (ImageGraphics2D)image;
- renderer.getGraphics2DAdapter().paintImage(imageG2D.getGraphics2DImagePainter(),
- context, origin.x + pos.x, origin.y + pos.y, pos.width, pos.height);
- */
- PDFRenderingContext pdfContext = new PDFRenderingContext(
- context.getUserAgent(),
- renderer.getGenerator(),
- renderer.currentPage,
- renderer.getFontInfo());
- Rectangle effPos = new Rectangle(origin.x + pos.x, origin.y + pos.y, pos.width, pos.height);
- if (context.getUserAgent().isAccessibilityEnabled()) {
- pdfContext.setMarkedContentInfo(renderer.addCurrentImageToStructureTree());
- }
- handleImage(pdfContext, image, effPos);
- return null;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java Wed Aug 25 15:43:55 2010
@@ -19,7 +19,6 @@
package org.apache.fop.render.pdf;
-import java.awt.Point;
import java.awt.Rectangle;
import java.io.IOException;
@@ -27,48 +26,22 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax;
-import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFImage;
-import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.ImageHandler;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
/**
* Image handler implementation which handles CCITT encoded images (CCITT fax group 3/4)
* for PDF output.
*/
-public class PDFImageHandlerRawCCITTFax implements PDFImageHandler, ImageHandler {
+public class PDFImageHandlerRawCCITTFax implements ImageHandler {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.RAW_CCITTFAX,
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- ImageRawCCITTFax ccitt = (ImageRawCCITTFax)image;
- PDFDocument pdfDoc = (PDFDocument)context.getProperty(
- PDFRendererContextConstants.PDF_DOCUMENT);
- PDFResourceContext resContext = (PDFResourceContext)context.getProperty(
- PDFRendererContextConstants.PDF_CONTEXT);
-
- PDFImage pdfimage = new ImageRawCCITTFaxAdapter(ccitt, image.getInfo().getOriginalURI());
- PDFXObject xobj = pdfDoc.addImage(resContext, pdfimage);
-
- float x = (float)pos.getX() / 1000f;
- float y = (float)pos.getY() / 1000f;
- float w = (float)pos.getWidth() / 1000f;
- float h = (float)pos.getHeight() / 1000f;
- renderer.placeImage(x, y, w, h, xobj);
-
- return xobj;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java Wed Aug 25 15:43:55 2010
@@ -19,7 +19,6 @@
package org.apache.fop.render.pdf;
-import java.awt.Point;
import java.awt.Rectangle;
import java.io.IOException;
@@ -27,48 +26,22 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG;
-import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFImage;
-import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.ImageHandler;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.pdf.PDFLogicalStructureHandler.MarkedContentInfo;
/**
* Image handler implementation which handles raw JPEG images for PDF output.
*/
-public class PDFImageHandlerRawJPEG implements PDFImageHandler, ImageHandler {
+public class PDFImageHandlerRawJPEG implements ImageHandler {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.RAW_JPEG,
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- ImageRawJPEG jpeg = (ImageRawJPEG)image;
- PDFDocument pdfDoc = (PDFDocument)context.getProperty(
- PDFRendererContextConstants.PDF_DOCUMENT);
- PDFResourceContext resContext = (PDFResourceContext)context.getProperty(
- PDFRendererContextConstants.PDF_CONTEXT);
-
- PDFImage pdfimage = new ImageRawJPEGAdapter(jpeg, image.getInfo().getOriginalURI());
- PDFXObject xobj = pdfDoc.addImage(resContext, pdfimage);
-
- float x = (float)pos.getX() / 1000f;
- float y = (float)pos.getY() / 1000f;
- float w = (float)pos.getWidth() / 1000f;
- float h = (float)pos.getHeight() / 1000f;
- renderer.placeImage(x, y, w, h, xobj);
-
- return xobj;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java Wed Aug 25 15:43:55 2010
@@ -19,7 +19,6 @@
package org.apache.fop.render.pdf;
-import java.awt.Point;
import java.awt.Rectangle;
import java.io.IOException;
@@ -27,19 +26,16 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
-import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFImage;
-import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.ImageHandler;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.pdf.PDFLogicalStructureHandler.MarkedContentInfo;
/**
* Image handler implementation which handles RenderedImage instances for PDF output.
*/
-public class PDFImageHandlerRenderedImage implements PDFImageHandler, ImageHandler {
+public class PDFImageHandlerRenderedImage implements ImageHandler {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.BUFFERED_IMAGE,
@@ -47,29 +43,6 @@ public class PDFImageHandlerRenderedImag
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- ImageRendered imageRend = (ImageRendered)image;
- PDFDocument pdfDoc = (PDFDocument)context.getProperty(
- PDFRendererContextConstants.PDF_DOCUMENT);
- PDFResourceContext resContext = (PDFResourceContext)context.getProperty(
- PDFRendererContextConstants.PDF_CONTEXT);
-
- PDFImage pdfimage = new ImageRenderedAdapter(imageRend, image.getInfo().getOriginalURI());
- PDFXObject xobj = pdfDoc.addImage(resContext, pdfimage);
-
- float x = (float)pos.getX() / 1000f;
- float y = (float)pos.getY() / 1000f;
- float w = (float)pos.getWidth() / 1000f;
- float h = (float)pos.getHeight() / 1000f;
- renderer.placeImage(x, y, w, h, xobj);
-
- return xobj;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java Wed Aug 25 15:43:55 2010
@@ -51,22 +51,12 @@ public class PDFRendererConfigurator ext
}
/**
- * Configure the PDF renderer.
- * Get the configuration to be used for pdf stream filters,
- * fonts etc.
+ * Throws an UnsupportedOperationException.
*
- * @param renderer pdf renderer
- * @throws FOPException fop exception
+ * @param renderer not used
*/
- public void configure(Renderer renderer) throws FOPException {
- Configuration cfg = super.getRendererConfig(renderer);
- if (cfg != null) {
- PDFRenderer pdfRenderer = (PDFRenderer)renderer;
- super.configure(renderer);
-
- PDFRenderingUtil pdfUtil = pdfRenderer.getPDFUtil();
- configure(cfg, pdfUtil);
- }
+ public void configure(Renderer renderer) {
+ throw new UnsupportedOperationException();
}
private void configure(Configuration cfg, PDFRenderingUtil pdfUtil) throws FOPException {
@@ -80,20 +70,20 @@ public class PDFRendererConfigurator ext
LogUtil.handleException(log, e, false);
}
- String s = cfg.getChild(PDFRenderer.PDF_A_MODE, true).getValue(null);
+ String s = cfg.getChild(PDFConfigurationConstants.PDF_A_MODE, true).getValue(null);
if (s != null) {
pdfUtil.setAMode(PDFAMode.valueOf(s));
}
- s = cfg.getChild(PDFRenderer.PDF_X_MODE, true).getValue(null);
+ s = cfg.getChild(PDFConfigurationConstants.PDF_X_MODE, true).getValue(null);
if (s != null) {
pdfUtil.setXMode(PDFXMode.valueOf(s));
}
Configuration encryptionParamsConfig
- = cfg.getChild(PDFRenderer.ENCRYPTION_PARAMS, false);
+ = cfg.getChild(PDFConfigurationConstants.ENCRYPTION_PARAMS, false);
if (encryptionParamsConfig != null) {
PDFEncryptionParams encryptionParams = new PDFEncryptionParams();
Configuration ownerPasswordConfig = encryptionParamsConfig.getChild(
- PDFRenderer.OWNER_PASSWORD, false);
+ PDFConfigurationConstants.OWNER_PASSWORD, false);
if (ownerPasswordConfig != null) {
String ownerPassword = ownerPasswordConfig.getValue(null);
if (ownerPassword != null) {
@@ -101,7 +91,7 @@ public class PDFRendererConfigurator ext
}
}
Configuration userPasswordConfig = encryptionParamsConfig.getChild(
- PDFRenderer.USER_PASSWORD, false);
+ PDFConfigurationConstants.USER_PASSWORD, false);
if (userPasswordConfig != null) {
String userPassword = userPasswordConfig.getValue(null);
if (userPassword != null) {
@@ -109,33 +99,33 @@ public class PDFRendererConfigurator ext
}
}
Configuration noPrintConfig = encryptionParamsConfig.getChild(
- PDFRenderer.NO_PRINT, false);
+ PDFConfigurationConstants.NO_PRINT, false);
if (noPrintConfig != null) {
encryptionParams.setAllowPrint(false);
}
Configuration noCopyContentConfig = encryptionParamsConfig.getChild(
- PDFRenderer.NO_COPY_CONTENT, false);
+ PDFConfigurationConstants.NO_COPY_CONTENT, false);
if (noCopyContentConfig != null) {
encryptionParams.setAllowCopyContent(false);
}
Configuration noEditContentConfig = encryptionParamsConfig.getChild(
- PDFRenderer.NO_EDIT_CONTENT, false);
+ PDFConfigurationConstants.NO_EDIT_CONTENT, false);
if (noEditContentConfig != null) {
encryptionParams.setAllowEditContent(false);
}
Configuration noAnnotationsConfig = encryptionParamsConfig.getChild(
- PDFRenderer.NO_ANNOTATIONS, false);
+ PDFConfigurationConstants.NO_ANNOTATIONS, false);
if (noAnnotationsConfig != null) {
encryptionParams.setAllowEditAnnotations(false);
}
pdfUtil.setEncryptionParams(encryptionParams);
}
- s = cfg.getChild(PDFRenderer.KEY_OUTPUT_PROFILE, true).getValue(null);
+ s = cfg.getChild(PDFConfigurationConstants.KEY_OUTPUT_PROFILE, true).getValue(null);
if (s != null) {
pdfUtil.setOutputProfileURI(s);
}
Configuration disableColorSpaceConfig = cfg.getChild(
- PDFRenderer.KEY_DISABLE_SRGB_COLORSPACE, false);
+ PDFConfigurationConstants.KEY_DISABLE_SRGB_COLORSPACE, false);
if (disableColorSpaceConfig != null) {
pdfUtil.setDisableSRGBColorSpace(
disableColorSpaceConfig.getValueAsBoolean(false));
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java Wed Aug 25 15:43:55 2010
@@ -19,26 +19,14 @@
package org.apache.fop.render.pdf;
-import java.awt.Color;
-import java.awt.geom.AffineTransform;
-import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
-import org.w3c.dom.Document;
-
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.util.SVGConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.image.loader.batik.BatikUtil;
import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFPage;
import org.apache.fop.pdf.PDFResourceContext;
@@ -47,11 +35,6 @@ import org.apache.fop.render.ImageHandle
import org.apache.fop.render.Renderer;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RendererContextConstants;
-import org.apache.fop.svg.PDFAElementBridge;
-import org.apache.fop.svg.PDFBridgeContext;
-import org.apache.fop.svg.PDFGraphics2D;
-import org.apache.fop.svg.SVGEventProducer;
-import org.apache.fop.svg.SVGUserAgent;
/**
* PDF XML handler for SVG (uses Apache Batik).
@@ -126,148 +109,8 @@ public class PDFSVGHandler extends Abstr
public boolean paintAsBitmap; // CSOK: VisibilityModifier
}
- /**
- * {@inheritDoc}
- */
- protected void renderSVGDocument(RendererContext context,
- Document doc) {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- PDFInfo pdfInfo = getPDFInfo(context);
- if (pdfInfo.paintAsBitmap) {
- try {
- super.renderSVGDocument(context, doc);
- } catch (IOException ioe) {
- SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
- context.getUserAgent().getEventBroadcaster());
- eventProducer.svgRenderingError(this, ioe, getDocumentURI(doc));
- }
- return;
- }
- int xOffset = pdfInfo.currentXPosition;
- int yOffset = pdfInfo.currentYPosition;
-
- FOUserAgent userAgent = context.getUserAgent();
- final float deviceResolution = userAgent.getTargetResolution();
- if (log.isDebugEnabled()) {
- log.debug("Generating SVG at " + deviceResolution + "dpi.");
- }
-
- final float uaResolution = userAgent.getSourceResolution();
- SVGUserAgent ua = new SVGUserAgent(userAgent, new AffineTransform());
-
- //Scale for higher resolution on-the-fly images from Batik
- double s = uaResolution / deviceResolution;
- AffineTransform resolutionScaling = new AffineTransform();
- resolutionScaling.scale(s, s);
-
- //Controls whether text painted by Batik is generated using text or path operations
- boolean strokeText = false;
- Configuration cfg = pdfInfo.cfg;
- if (cfg != null) {
- strokeText = cfg.getChild("stroke-text", true).getValueAsBoolean(strokeText);
- }
-
- BridgeContext ctx = new PDFBridgeContext(ua,
- (strokeText ? null : pdfInfo.fi),
- userAgent.getFactory().getImageManager(),
- userAgent.getImageSessionContext(),
- new AffineTransform());
-
- //Cloning SVG DOM as Batik attaches non-thread-safe facilities (like the CSS engine)
- //to it.
- Document clonedDoc = BatikUtil.cloneSVGDocument(doc);
-
- GraphicsNode root;
- try {
- GVTBuilder builder = new GVTBuilder();
- root = builder.build(ctx, clonedDoc);
- } catch (Exception e) {
- SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
- context.getUserAgent().getEventBroadcaster());
- eventProducer.svgNotBuilt(this, e, getDocumentURI(doc));
- return;
- }
- // get the 'width' and 'height' attributes of the SVG document
- float w = (float)ctx.getDocumentSize().getWidth() * 1000f;
- float h = (float)ctx.getDocumentSize().getHeight() * 1000f;
-
- float sx = pdfInfo.width / w;
- float sy = pdfInfo.height / h;
-
- //Scaling and translation for the bounding box of the image
- AffineTransform scaling = new AffineTransform(
- sx, 0, 0, sy, xOffset / 1000f, yOffset / 1000f);
-
- //Transformation matrix that establishes the local coordinate system for the SVG graphic
- //in relation to the current coordinate system
- AffineTransform imageTransform = new AffineTransform();
- imageTransform.concatenate(scaling);
- imageTransform.concatenate(resolutionScaling);
-
- /*
- * Clip to the svg area.
- * Note: To have the svg overlay (under) a text area then use
- * an fo:block-container
- */
- PDFContentGenerator generator = renderer.getGenerator();
- generator.comment("SVG setup");
- generator.saveGraphicsState();
- generator.setColor(Color.black, false);
- generator.setColor(Color.black, true);
-
- if (!scaling.isIdentity()) {
- generator.comment("viewbox");
- generator.add(CTMHelper.toPDFString(scaling, false) + " cm\n");
- }
-
- //SVGSVGElement svg = ((SVGDocument)doc).getRootElement();
-
- if (pdfInfo.pdfContext == null) {
- pdfInfo.pdfContext = pdfInfo.pdfPage;
- }
- PDFGraphics2D graphics = new PDFGraphics2D(true, pdfInfo.fi,
- pdfInfo.pdfDoc,
- pdfInfo.pdfContext, pdfInfo.pdfPage.referencePDF(),
- pdfInfo.currentFontName, pdfInfo.currentFontSize);
- graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
-
- if (!resolutionScaling.isIdentity()) {
- generator.comment("resolution scaling for " + uaResolution
- + " -> " + deviceResolution + "\n");
- generator.add(
- CTMHelper.toPDFString(resolutionScaling, false) + " cm\n");
- graphics.scale(1 / s, 1 / s);
- }
-
- generator.comment("SVG start");
-
- //Save state and update coordinate system for the SVG image
- generator.getState().save();
- generator.getState().concatenate(imageTransform);
-
- //Now that we have the complete transformation matrix for the image, we can update the
- //transformation matrix for the AElementBridge.
- PDFAElementBridge aBridge = (PDFAElementBridge)ctx.getBridge(
- SVGDOMImplementation.SVG_NAMESPACE_URI, SVGConstants.SVG_A_TAG);
- aBridge.getCurrentTransform().setTransform(generator.getState().getTransform());
-
- graphics.setPaintingState(generator.getState());
- graphics.setOutputStream(pdfInfo.outputStream);
- try {
- root.paint(graphics);
- generator.add(graphics.getString());
- } catch (Exception e) {
- SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
- context.getUserAgent().getEventBroadcaster());
- eventProducer.svgRenderingError(this, e, getDocumentURI(doc));
- }
- generator.getState().restore();
- generator.restoreGraphicsState();
- generator.comment("SVG end");
- }
-
/** {@inheritDoc} */
public boolean supportsRenderer(Renderer renderer) {
- return (renderer instanceof PDFRenderer);
+ return false;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java Wed Aug 25 15:43:55 2010
@@ -30,12 +30,12 @@ import org.apache.xmlgraphics.java2d.Gra
import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
import org.apache.xmlgraphics.ps.PSGenerator;
+import org.apache.fop.pdf.PDFFactory;
import org.apache.fop.render.AbstractGraphics2DAdapter;
import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RendererContextConstants;
import org.apache.fop.render.RendererContext.RendererContextWrapper;
-import org.apache.fop.render.pdf.PDFRenderer;
/**
* Graphics2DAdapter implementation for PostScript.
@@ -46,15 +46,7 @@ public class PSGraphics2DAdapter extends
private boolean clip = true;
/**
- * Main constructor
- * @param renderer the Renderer instance to which this instance belongs
- */
- public PSGraphics2DAdapter(PSRenderer renderer) {
- this(renderer.gen, true);
- }
-
- /**
- * Constructor for use without a PSRenderer instance.
+ * Creates a new instance.
* @param gen the PostScript generator
* @param clip true if the image should be clipped
*/
@@ -114,7 +106,7 @@ public class PSGraphics2DAdapter extends
RendererContextWrapper ctx = RendererContext.wrapRendererContext(context);
BufferedImage bi = paintToBufferedImage(painter, ctx, resolution, false, false);
- float scale = PDFRenderer.NORMAL_PDF_RESOLUTION
+ float scale = PDFFactory.DEFAULT_PDF_RESOLUTION
/ context.getUserAgent().getTargetResolution();
graphics.drawImage(bi, new AffineTransform(scale, 0, 0, scale, 0, 0), null);
} else {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java Wed Aug 25 15:43:55 2010
@@ -45,18 +45,12 @@ public class PSRendererConfigurator exte
}
/**
- * Configure the PS renderer.
- * @param renderer postscript renderer
- * @throws FOPException fop exception
+ * Throws an UnsupportedOperationException.
+ *
+ * @param renderer not used
*/
- public void configure(Renderer renderer) throws FOPException {
- Configuration cfg = super.getRendererConfig(renderer);
- if (cfg != null) {
- super.configure(renderer);
-
- PSRenderer psRenderer = (PSRenderer)renderer;
- configure(psRenderer.getPSUtil(), cfg);
- }
+ public void configure(Renderer renderer) {
+ throw new UnsupportedOperationException();
}
private void configure(PSRenderingUtil psUtil, Configuration cfg) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGHandler.java Wed Aug 25 15:43:55 2010
@@ -333,7 +333,7 @@ public class PSSVGHandler extends Abstra
/** {@inheritDoc} */
public boolean supportsRenderer(Renderer renderer) {
- return (renderer instanceof PSRenderer);
+ return false;
}
}
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Aug 25 15:43:55 2010
@@ -58,6 +58,10 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="VH" type="remove">
+ Removed old Renderer implementations for those output formats that have a version based on
+ the new DocumentHandler architecture available (AFP, PCL, PDF, PS).
+ </action>
<action context="Fonts" dev="AC" type="fix">
Reinstated support for being able to specify a font cache filepath in the fop user configuration.
</action>
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java Wed Aug 25 15:43:55 2010
@@ -23,7 +23,6 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.fop.fonts.DejaVuLGCSerifTest;
-import org.apache.fop.fonts.TrueTypeAnsiTestCase;
import org.apache.fop.image.loader.batik.ImageLoaderTestCase;
import org.apache.fop.image.loader.batik.ImagePreloaderTestCase;
import org.apache.fop.intermediate.IFMimickingTestCase;
@@ -54,7 +53,6 @@ public class StandardTestSuite {
suite.addTest(new TestSuite(PDFEncodingTestCase.class));
suite.addTest(new TestSuite(PDFCMapTestCase.class));
suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
- suite.addTest(new TestSuite(TrueTypeAnsiTestCase.class));
suite.addTest(new TestSuite(DejaVuLGCSerifTest.class));
suite.addTest(RichTextFormatTestSuite.suite());
suite.addTest(new TestSuite(ImageLoaderTestCase.class));
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java Wed Aug 25 15:43:55 2010
@@ -33,7 +33,6 @@ import org.apache.fop.render.intermediat
import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFRenderer;
import org.apache.fop.render.pdf.PDFDocumentHandler;
-import org.apache.fop.render.pdf.PDFRenderer;
import org.apache.fop.render.rtf.RTFHandler;
/**
@@ -73,29 +72,15 @@ public class RendererFactoryTest extends
RendererFactory factory = fopFactory.getRendererFactory();
FOUserAgent ua;
Renderer renderer;
- Renderer overrideRenderer;
ua = fopFactory.newFOUserAgent();
renderer = factory.createRenderer(ua, MimeConstants.MIME_PDF);
assertTrue(renderer instanceof IFRenderer);
- factory.setRendererPreferred(true); //Test legacy setting
- ua = fopFactory.newFOUserAgent();
- renderer = factory.createRenderer(ua, MimeConstants.MIME_PDF);
- assertTrue(renderer instanceof PDFRenderer);
-
ua = fopFactory.newFOUserAgent();
renderer = factory.createRenderer(ua, MimeConstants.MIME_FOP_IF);
assertTrue(renderer instanceof IFRenderer);
- factory.setRendererPreferred(false);
- ua = fopFactory.newFOUserAgent();
- overrideRenderer = new PDFRenderer();
- overrideRenderer.setUserAgent(ua);
- ua.setRendererOverride(overrideRenderer);
- renderer = factory.createRenderer(ua, null);
- assertTrue(renderer == overrideRenderer);
-
ua = fopFactory.newFOUserAgent();
IFDocumentHandler overrideHandler;
overrideHandler = new PDFDocumentHandler();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java Wed Aug 25 15:43:55 2010
@@ -43,52 +43,22 @@ import org.apache.fop.render.intermediat
public class ImageHandlingTestCase extends AbstractPostScriptTestCase {
/**
- * Tests JPEG handling with the {@link PSRenderer}.
+ * Tests JPEG handling.
* @throws Exception if an error occurs
*/
- public void testJPEGImageWithRendererLevel3() throws Exception {
- innerTestJPEGImageWithRenderer(3);
+ public void testJPEGImageLevel3() throws Exception {
+ innerTestJPEGImage(3);
}
/**
- * Tests JPEG handling with the {@link PSRenderer}.
+ * Tests JPEG handling.
* @throws Exception if an error occurs
*/
- public void testJPEGImageWithRendererLevel2() throws Exception {
- innerTestJPEGImageWithRenderer(2);
+ public void testJPEGImageLevel2() throws Exception {
+ innerTestJPEGImage(2);
}
- /**
- * Tests JPEG handling with the {@link PSDocumentHandler}.
- * @throws Exception if an error occurs
- */
- public void testJPEGImageWithIFLevel3() throws Exception {
- innerTestJPEGImageWithIF(3);
- }
-
- /**
- * Tests JPEG handling with the {@link PSDocumentHandler}.
- * @throws Exception if an error occurs
- */
- public void testJPEGImageWithIFLevel2() throws Exception {
- innerTestJPEGImageWithIF(2);
- }
-
- private void innerTestJPEGImageWithRenderer(int level) throws Exception {
- FOUserAgent ua = fopFactory.newFOUserAgent();
- PSRenderer renderer = new PSRenderer();
- renderer.setUserAgent(ua);
- PSRenderingUtil psUtil = renderer.getPSUtil();
- psUtil.setLanguageLevel(level);
- psUtil.setOptimizeResources(true);
- ua.setRendererOverride(renderer);
-
- // Prepare output file
- File outputFile = renderFile(ua, "ps-jpeg-image.fo", "-rend-l" + psUtil.getLanguageLevel());
- verifyPostScriptFile(outputFile, psUtil.getLanguageLevel());
- }
-
- private void innerTestJPEGImageWithIF(int level) throws Exception {
+ private void innerTestJPEGImage(int level) throws Exception {
FOUserAgent ua = fopFactory.newFOUserAgent();
PSDocumentHandler handler = new PSDocumentHandler();
handler.setContext(new IFContext(ua));
@@ -159,10 +129,6 @@ public class ImageHandlingTestCase exten
}
}
- private void assertMatches(String text, String regex) {
- assertTrue("Text didn't match '" + regex + "'", text.matches(regex));
- }
-
private void assertContains(String text, String searchString) {
assertTrue("Text doesn't contain '" + searchString + "'", text.indexOf(searchString) >= 0);
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java?rev=989178&r1=989177&r2=989178&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java Wed Aug 25 15:43:55 2010
@@ -54,28 +54,10 @@ import org.apache.fop.render.intermediat
public class ResourceOptimizationTestCase extends AbstractPostScriptTestCase {
/**
- * Tests resource optimization with the {@link PSRenderer}.
+ * Tests resource optimization.
* @throws Exception if an error occurs
*/
- public void testResourceOptimizationWithRenderer() throws Exception {
- FOUserAgent ua = fopFactory.newFOUserAgent();
- PSRenderer renderer = new PSRenderer();
- renderer.setUserAgent(ua);
- // This is the important part: we're enabling resource optimization
- renderer.getPSUtil().setOptimizeResources(true);
- ua.setRendererOverride(renderer);
-
- // Prepare output file
- File outputFile = renderFile(ua, "ps-resources.fo",
- "-rend-l" + renderer.getPSUtil().getLanguageLevel());
- verifyPostScriptFile(outputFile);
- }
-
- /**
- * Tests resource optimization with the {@link PSDocumentHandler}.
- * @throws Exception if an error occurs
- */
- public void testResourceOptimizationWithIF() throws Exception {
+ public void testResourceOptimization() throws Exception {
FOUserAgent ua = fopFactory.newFOUserAgent();
PSDocumentHandler handler = new PSDocumentHandler();
handler.setContext(new IFContext(ua));
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org