Removed AbstractGraphics2DImagePainter and Graphics2DImagePainterGOCA (painting preparator mechanism).

Adjusted AFPGraphics2D to TextHandler changes in XG commons.
Factored an AbstractFOPTextPainter which is extended by AFPTextPainter.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@718598 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 50 insertions, 67 deletions

diff --git a/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java b/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
index e8fe1f4f1..fa3f00cdb 100644
--- a/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
+++ b/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
@@ -19,13 +19,11 @@
 
 package org.apache.fop.render.afp;
 
-import java.awt.geom.AffineTransform;
 import java.io.IOException;
 
 import org.apache.fop.afp.AFPDataObjectInfo;
 import org.apache.fop.afp.AFPGraphics2D;
 import org.apache.fop.afp.AFPGraphicsObjectInfo;
-import org.apache.fop.afp.AFPObjectAreaInfo;
 import org.apache.fop.afp.AFPPaintingState;
 import org.apache.fop.afp.AFPResourceInfo;
 import org.apache.fop.afp.AFPResourceLevel;
@@ -51,7 +49,8 @@ public class AFPImageHandlerGraphics2D extends AFPImageHandler {
     public AFPDataObjectInfo generateDataObjectInfo(
             AFPRendererImageInfo rendererImageInfo) throws IOException {
 
-        AFPRendererContext rendererContext = (AFPRendererContext)rendererImageInfo.getRendererContext();
+        AFPRendererContext rendererContext
+            = (AFPRendererContext)rendererImageInfo.getRendererContext();
         AFPInfo afpInfo = rendererContext.getInfo();
         ImageGraphics2D imageG2D = (ImageGraphics2D)rendererImageInfo.getImage();
         Graphics2DImagePainter painter = imageG2D.getGraphics2DImagePainter();
@@ -67,11 +66,11 @@ public class AFPImageHandlerGraphics2D extends AFPImageHandler {
             return null;
         } else {
             AFPGraphicsObjectInfo graphicsObjectInfo
-            = (AFPGraphicsObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
+                = (AFPGraphicsObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
 
             AFPResourceInfo resourceInfo = graphicsObjectInfo.getResourceInfo();
             //level not explicitly set/changed so default to inline for GOCA graphic objects
-            // (due to a bug in the IBM AFP Workbench Viewer (2.04.01.07) - hard copy works just fine)
+            // (due to a bug in the IBM AFP Workbench Viewer (2.04.01.07), hard copy works just fine)
             if (!resourceInfo.levelChanged()) {
                 resourceInfo.setLevel(new AFPResourceLevel(AFPResourceLevel.INLINE));
             }
@@ -86,22 +85,9 @@ public class AFPImageHandlerGraphics2D extends AFPImageHandler {
 
             graphicsObjectInfo.setGraphics2D(g2d);
 
-            // translate to current location
-            AFPPaintingState paintingState = afpInfo.getPaintingState();
-            AffineTransform at = paintingState.getData().getTransform();
-            g2d.translate(at.getTranslateX(), at.getTranslateY());
-
             // set painter
             graphicsObjectInfo.setPainter(painter);
 
-            // invert y-axis for GOCA
-            final int sx = 1;
-            final int sy = -1;
-            AFPObjectAreaInfo objectAreaInfo = graphicsObjectInfo.getObjectAreaInfo();
-            int height = objectAreaInfo.getHeight();
-            g2d.translate(0, height);
-            g2d.scale(sx, sy);
-
             return graphicsObjectInfo;
         }
     }
diff --git a/src/java/org/apache/fop/render/afp/AFPRenderer.java b/src/java/org/apache/fop/render/afp/AFPRenderer.java
index ede556ecb..b85dd96f9 100644
--- a/src/java/org/apache/fop/render/afp/AFPRenderer.java
+++ b/src/java/org/apache/fop/render/afp/AFPRenderer.java
@@ -333,37 +333,6 @@ public class AFPRenderer extends AbstractPathOrientedRenderer {
     }
 
     /** {@inheritDoc} */
-    public void clip() {
-        // TODO
-        log.debug("NYI clip()");
-    }
-
-    /** {@inheritDoc} */
-    public void clipRect(float x, float y, float width, float height) {
-        // TODO
-        log.debug("NYI clipRect(x=" + x + ",y=" + y
-                    + ",width=" + width + ", height=" + height + ")");
-    }
-
-    /** {@inheritDoc} */
-    public void moveTo(float x, float y) {
-        // TODO
-        log.debug("NYI moveTo(x=" + x + ",y=" + y + ")");
-    }
-
-    /** {@inheritDoc} */
-    public void lineTo(float x, float y) {
-        // TODO
-        log.debug("NYI lineTo(x=" + x + ",y=" + y + ")");
-    }
-
-    /** {@inheritDoc} */
-    public void closePath() {
-        // TODO
-        log.debug("NYI closePath()");
-    }
-
-    /** {@inheritDoc} */
     public void drawBorderLine(float x1, float y1, float x2, float y2,
             boolean horz, boolean startOrBefore, int style, Color col) {
         BorderPaintInfo borderPaintInfo = new BorderPaintInfo(x1, y1, x2, y2, horz, style, col);
@@ -535,18 +504,6 @@ public class AFPRenderer extends AbstractPathOrientedRenderer {
         paintingState.pop();
     }
 
-    /** Indicates the beginning of a text object. */
-    public void beginTextObject() {
-        //TODO PDF specific maybe?
-        log.debug("NYI beginTextObject()");
-    }
-
-    /** Indicates the end of a text object. */
-    public void endTextObject() {
-        //TODO PDF specific maybe?
-        log.debug("NYI endTextObject()");
-    }
-
     /** {@inheritDoc} */
     public void renderImage(Image image, Rectangle2D pos) {
         drawImage(image.getURL(), pos, image.getForeignAttributes());
@@ -809,4 +766,47 @@ public class AFPRenderer extends AbstractPathOrientedRenderer {
         concatenateTransformationMatrix(at);
     }
 
+    /** {@inheritDoc} */
+    public void clip() {
+        // TODO
+//        log.debug("NYI clip()");
+    }
+
+    /** {@inheritDoc} */
+    public void clipRect(float x, float y, float width, float height) {
+        // TODO
+//        log.debug("NYI clipRect(x=" + x + ",y=" + y
+//                    + ",width=" + width + ", height=" + height + ")");
+    }
+
+    /** {@inheritDoc} */
+    public void moveTo(float x, float y) {
+        // TODO
+//        log.debug("NYI moveTo(x=" + x + ",y=" + y + ")");
+    }
+
+    /** {@inheritDoc} */
+    public void lineTo(float x, float y) {
+        // TODO
+//        log.debug("NYI lineTo(x=" + x + ",y=" + y + ")");
+    }
+
+    /** {@inheritDoc} */
+    public void closePath() {
+        // TODO
+//        log.debug("NYI closePath()");
+    }
+
+    /** Indicates the beginning of a text object. */
+    public void beginTextObject() {
+        //TODO PDF specific maybe?
+//        log.debug("NYI beginTextObject()");
+    }
+
+    /** Indicates the end of a text object. */
+    public void endTextObject() {
+        //TODO PDF specific maybe?
+//        log.debug("NYI endTextObject()");
+    }
+
 }
diff --git a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
index 2800686d9..bf74b4053 100644
--- a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
+++ b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
@@ -34,10 +34,10 @@ import org.apache.fop.afp.AFPPaintingState;
 import org.apache.fop.afp.AFPResourceInfo;
 import org.apache.fop.afp.AFPResourceManager;
 import org.apache.fop.afp.AFPUnitConverter;
-import org.apache.fop.afp.Graphics2DImagePainterGOCA;
 import org.apache.fop.afp.svg.AFPBridgeContext;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fonts.FontInfo;
+import org.apache.fop.image.loader.batik.Graphics2DImagePainterImpl;
 import org.apache.fop.render.AbstractGenericSVGHandler;
 import org.apache.fop.render.Renderer;
 import org.apache.fop.render.RendererContext;
@@ -67,9 +67,6 @@ public class AFPSVGHandler extends AbstractGenericSVGHandler {
         }
     }
 
-    private static final int X = 0;
-    private static final int Y = 1;
-
     /**
      * Render the SVG document.
      *
@@ -101,7 +98,7 @@ public class AFPSVGHandler extends AbstractGenericSVGHandler {
         }
 
         // Create a new AFPGraphics2D
-        final boolean textAsShapes = false;
+        final boolean textAsShapes = afpInfo.strokeText();
         AFPGraphics2D g2d = afpInfo.createGraphics2D(textAsShapes);
 
         AFPPaintingState paintingState = g2d.getPaintingState();
@@ -220,7 +217,7 @@ public class AFPSVGHandler extends AbstractGenericSVGHandler {
             painter = super.createGraphics2DImagePainter(root, ctx, imageSize);
         } else {
             // paint as GOCA Graphics
-            painter = new Graphics2DImagePainterGOCA(root, ctx, imageSize);
+            painter = new Graphics2DImagePainterImpl(root, ctx, imageSize);
         }
         return painter;
     }