FOP-3287: Set line end to flat for AFP

Author: simonsteiner1984

fop-core/src/main/java/org/apache/fop/afp/AFPGraphics2D.java

@@ -59,6 +59,7 @@
 import org.apache.xmlgraphics.java2d.TextHandler;
 import org.apache.xmlgraphics.util.UnitConv;
 
+import org.apache.fop.afp.goca.GraphicsSetLineEnd;
 import org.apache.fop.afp.goca.GraphicsSetLineType;
 import org.apache.fop.afp.modca.GraphicsObject;
 import org.apache.fop.afp.modca.ResourceObject;
@@ -316,6 +317,7 @@ protected void applyStroke(Stroke stroke) {
                 }
                 graphicsObj.setLineType(type);
             }
+            graphicsObj.setLineEnd(GraphicsSetLineEnd.FLAT);
         } else {
             LOG.warn("Unsupported Stroke: " + stroke.getClass().getName());
         }

fop-core/src/main/java/org/apache/fop/afp/goca/GraphicsSetLineEnd.java

@@ -0,0 +1,54 @@
+/*
+ * 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.afp.goca;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Sets the line end to use when stroking GOCA shapes (structured fields)
+ */
+public class GraphicsSetLineEnd extends AbstractGraphicsDrawingOrder {
+    public static final byte FLAT = 1;
+    private byte lineEnd;
+
+    public GraphicsSetLineEnd(byte lineEnd) {
+        this.lineEnd = lineEnd;
+    }
+
+    /** {@inheritDoc} */
+    public int getDataLength() {
+        return 2;
+    }
+
+    /** {@inheritDoc} */
+    public void writeToStream(OutputStream os) throws IOException {
+        byte[] data = new byte[] {
+                getOrderCode(), // GSLW order code
+                lineEnd
+        };
+        os.write(data);
+    }
+
+    /** {@inheritDoc} */
+    byte getOrderCode() {
+        return 0x1A;
+    }
+}

fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java

@@ -47,6 +47,7 @@
 import org.apache.fop.afp.goca.GraphicsSetCharacterSet;
 import org.apache.fop.afp.goca.GraphicsSetCurrentPosition;
 import org.apache.fop.afp.goca.GraphicsSetFractionalLineWidth;
+import org.apache.fop.afp.goca.GraphicsSetLineEnd;
 import org.apache.fop.afp.goca.GraphicsSetLineType;
 import org.apache.fop.afp.goca.GraphicsSetLineWidth;
 import org.apache.fop.afp.goca.GraphicsSetPatternSymbol;
@@ -212,6 +213,10 @@ public void setLineType(byte lineType) {
         }
     }
 
+    public void setLineEnd(byte lineEnd) {
+        addObject(new GraphicsSetLineEnd(lineEnd));
+    }
+
     /**
      * Sets whether the following shape is to be filled.
      *

fop-core/src/test/java/org/apache/fop/afp/AFPGraphics2DTestCase.java

@@ -134,7 +134,7 @@ public void testDrawGraphicsFillet() throws IOException {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         go.writeToStream(bos);
         ByteArrayInputStream is = new ByteArrayInputStream(bos.toByteArray());
-        is.skip(17 + 9 + 14 + 6);
+        is.skip(17 + 9 + 14 + 8);
         int graphicsFilletMarker = 0x85;
         Assert.assertEquals(is.read(), graphicsFilletMarker);
         int sizeOfGraphicsFillet = 128;
@@ -153,4 +153,20 @@ public void testDrawGraphicsFilletClipped() throws IOException {
         go.writeToStream(bos);
         Assert.assertEquals(bos.size(), 17 + 17);
     }
+
+    @Test
+    public void testDrawGraphicsLineEnd() throws IOException {
+        GraphicContext gc = new GraphicContext();
+        gc.setClip(new Rectangle(0, 0, 100, 100));
+        graphics2D.setGraphicContext(gc);
+        GraphicsObject go = new GraphicsObject(new Factory(), "test");
+        graphics2D.setGraphicsObject(go);
+        graphics2D.draw(new Area(new Ellipse2D.Double(0, 0, 100, 100)));
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        go.writeToStream(bos);
+        ByteArrayInputStream is = new ByteArrayInputStream(bos.toByteArray());
+        is.skip(40);
+        Assert.assertEquals(is.read(), 0x1A);
+        Assert.assertEquals(is.read(), 1);
+    }
 }