From a466ab3fb601e4736a289be01b70b9dfea3b3542 Mon Sep 17 00:00:00 2001 From: Adrian Cumiskey Date: Tue, 21 Oct 2008 09:23:27 +0000 Subject: [PATCH] Cleanup. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@706559 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/render/AbstractGenericSVGHandler.java | 11 +++-------- .../org/apache/fop/render/afp/AFPResourceManager.java | 7 ++++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java index 17b2b9d36..0d6bf9be9 100644 --- a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java +++ b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java @@ -26,23 +26,18 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.io.IOException; -import org.w3c.dom.Document; - import org.apache.batik.bridge.BridgeContext; import org.apache.batik.bridge.GVTBuilder; import org.apache.batik.dom.AbstractDocument; import org.apache.batik.dom.svg.SVGDOMImplementation; import org.apache.batik.gvt.GraphicsNode; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.apache.xmlgraphics.java2d.Graphics2DImagePainter; -import org.apache.xmlgraphics.util.QName; - import org.apache.fop.fo.extensions.ExtensionElementMapping; import org.apache.fop.render.RendererContext.RendererContextWrapper; import org.apache.fop.svg.SVGEventProducer; import org.apache.fop.svg.SVGUserAgent; +import org.apache.xmlgraphics.java2d.Graphics2DImagePainter; +import org.apache.xmlgraphics.util.QName; +import org.w3c.dom.Document; /** * Generic XML handler for SVG. Uses Apache Batik for SVG processing and simply paints to diff --git a/src/java/org/apache/fop/render/afp/AFPResourceManager.java b/src/java/org/apache/fop/render/afp/AFPResourceManager.java index 58f65524d..6acc2419c 100644 --- a/src/java/org/apache/fop/render/afp/AFPResourceManager.java +++ b/src/java/org/apache/fop/render/afp/AFPResourceManager.java @@ -78,9 +78,9 @@ public class AFPResourceManager { } /** - * Returns the AFPDocumentStream + * Returns the AFP DataStream * - * @return the AFPDocumentStream + * @return the AFP DataStream */ public DataStream getDataStream() { return this.dataStream; @@ -136,7 +136,8 @@ public class AFPResourceManager { AFPImageObjectInfo imageObjectInfo = (AFPImageObjectInfo)dataObjectInfo; namedObj = dataObjectFactory.createImage(imageObjectInfo); } else if (dataObjectInfo instanceof AFPGraphicsObjectInfo) { - namedObj = dataObjectFactory.createGraphic((AFPGraphicsObjectInfo)dataObjectInfo); + AFPGraphicsObjectInfo graphicsObjectInfo = (AFPGraphicsObjectInfo)dataObjectInfo; + namedObj = dataObjectFactory.createGraphic(graphicsObjectInfo); } else { // natively embedded object namedObj = dataObjectFactory.createObjectContainer(dataObjectInfo); -- 2.39.5