From a9b8f995e4d8162c6da08b016205c71c0980bcbb Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Wed, 5 Apr 2006 19:31:53 +0000 Subject: Switching to the Commons variants for the Graphics2D base/helper classes. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@391742 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java | 5 +---- src/java/org/apache/fop/render/pdf/PDFSVGHandler.java | 2 +- src/java/org/apache/fop/svg/PDFGraphics2D.java | 5 +++-- src/java/org/apache/fop/svg/PDFTranscoder.java | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java b/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java index 8a72fc4b9..0eb9bc562 100644 --- a/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java +++ b/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java @@ -24,13 +24,10 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.io.IOException; -import org.apache.batik.bridge.ViewBox; import org.apache.fop.render.Graphics2DAdapter; import org.apache.fop.render.Graphics2DImagePainter; import org.apache.fop.render.RendererContext; import org.apache.fop.svg.PDFGraphics2D; -import org.w3c.dom.svg.SVGDocument; -import org.w3c.dom.svg.SVGSVGElement; /** * Graphics2DAdapter implementation for PDF. @@ -86,7 +83,7 @@ public class PDFGraphics2DAdapter implements Graphics2DAdapter { pdfInfo.pdfContext, pdfInfo.pdfPage.referencePDF(), renderer.currentFontName, renderer.currentFontSize); - graphics.setGraphicContext(new org.apache.batik.ext.awt.g2d.GraphicContext()); + graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext()); AffineTransform transform = new AffineTransform(); transform.translate(fx, fy); diff --git a/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java b/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java index af93477d5..3aff8d945 100644 --- a/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java +++ b/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java @@ -228,7 +228,7 @@ public class PDFSVGHandler implements XMLHandler, PDFRendererContextConstants { pdfInfo.pdfDoc, pdfInfo.pdfContext, pdfInfo.pdfPage.referencePDF(), pdfInfo.currentFontName, pdfInfo.currentFontSize); - graphics.setGraphicContext(new org.apache.batik.ext.awt.g2d.GraphicContext()); + graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext()); pdfInfo.pdfState.push(); AffineTransform transform = new AffineTransform(); // scale to viewbox diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java index 31f0567a2..16c3573cb 100644 --- a/src/java/org/apache/fop/svg/PDFGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java @@ -42,8 +42,9 @@ import org.apache.fop.image.JpegImage; import org.apache.fop.fonts.CIDFont; import org.apache.fop.render.pdf.FopPDFImage; -import org.apache.batik.ext.awt.g2d.AbstractGraphics2D; -import org.apache.batik.ext.awt.g2d.GraphicContext; +import org.apache.xmlgraphics.java2d.AbstractGraphics2D; +import org.apache.xmlgraphics.java2d.GraphicContext; + import org.apache.batik.ext.awt.RadialGradientPaint; import org.apache.batik.ext.awt.LinearGradientPaint; import org.apache.batik.ext.awt.MultipleGradientPaint; diff --git a/src/java/org/apache/fop/svg/PDFTranscoder.java b/src/java/org/apache/fop/svg/PDFTranscoder.java index b9e2e1215..080926de5 100644 --- a/src/java/org/apache/fop/svg/PDFTranscoder.java +++ b/src/java/org/apache/fop/svg/PDFTranscoder.java @@ -161,7 +161,7 @@ public class PDFTranscoder extends AbstractFOPTranscoder ((Color)hints.get(ImageTranscoder.KEY_BACKGROUND_COLOR)); } graphics.setGraphicContext - (new org.apache.batik.ext.awt.g2d.GraphicContext()); + (new org.apache.xmlgraphics.java2d.GraphicContext()); graphics.preparePainting(); graphics.transform(curTxf); -- cgit v1.2.3