Removed rounded corner-related backdoor (System property) config

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

diff --git a/src/java/org/apache/fop/afp/AFPResourceManager.java b/src/java/org/apache/fop/afp/AFPResourceManager.java
index e9c8eda673b2c7123efc56f5d5ea3f0c5a395b96..59dab55c3fe9dd8c0a2ff06d690aa09c21ff573c 100644 (file)
--- a/src/java/org/apache/fop/afp/AFPResourceManager.java
+++ b/src/java/org/apache/fop/afp/AFPResourceManager.java
@@ -428,7 +428,6 @@ public class AFPResourceManager {
 
         AbstractCachedObject cachedObject = (AbstractCachedObject) includeObjectCache.get(resourceInfo);
         if (cachedObject == null) {
-
             ResourceGroup resourceGroup = streamer.getResourceGroup(resourceLevel);
 
             //resourceObject delegates write commands to copyNamedResource()

diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
index 8b90d23bdfc96ac004e3f3ac11bb72f66bce0b63..c2bb56dcfac5326d0bf43a4805b7fbadc9f834eb 100644 (file)
--- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
@@ -48,7 +48,6 @@ import org.apache.fop.area.inline.InlineViewport;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.extensions.ExtensionElementMapping;
 import org.apache.fop.fonts.FontMetrics;
-import org.apache.fop.render.intermediate.BorderPainter;
 import org.apache.fop.traits.BorderProps;
 import org.apache.fop.util.UnitConv;
 
@@ -259,13 +258,7 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
 
             saveGraphicsState();
 
-            //TODO remove this choice
-            if (BorderPainter.isRoundedCornersSupported()) {
-                clipBackground(sx, sy,  paddRectWidth, paddRectHeight,
-                        bpsTop, bpsBottom, bpsLeft,  bpsRight);
-            } else {
-                clipRect(sx, sy,  paddRectWidth, paddRectHeight);
-            }
+            clipBackground(sx, sy,  paddRectWidth, paddRectHeight, bpsTop, bpsBottom, bpsLeft, bpsRight);
 
             if (back.getColor() != null) {
                 updateColor(back.getColor(), true);

diff --git a/src/java/org/apache/fop/render/afp/AFPPainter.java b/src/java/org/apache/fop/render/afp/AFPPainter.java
index 1d7c41c1248a2015e2b575c0120226fddccb5cdd..cf97494fa1b75db313740bd3f1882f57e937a1bb 100644 (file)
--- a/src/java/org/apache/fop/render/afp/AFPPainter.java
+++ b/src/java/org/apache/fop/render/afp/AFPPainter.java
@@ -536,11 +536,6 @@ public class AFPPainter extends AbstractIFPainter<AFPDocumentHandler> {
             }
         }
 
-        public static final String CORNER_MODE_PROPERTY = "fop.round-corners.afp";
-        public static final String MODE_SEPERATE = "seperate";
-        public static final String MODE_ALL_IN_ONE = "all-in-one";
-        public static final String MODE_DEFAULT = "all-in-one";
-
         private AFPBorderPainter delegate;
         private final AFPPainter painter;
         private final AFPDocumentHandler documentHandler;
@@ -555,50 +550,17 @@ public class AFPPainter extends AbstractIFPainter<AFPDocumentHandler> {
         public void drawBorders(final Rectangle borderRect,
                 final BorderProps bpsBefore, final BorderProps bpsAfter,
                 final BorderProps bpsStart, final BorderProps bpsEnd, Color innerBackgroundColor)
-                throws IFException {
-
-            if (isRoundedCornersSupported()) {
-                if (MODE_SEPERATE.equals(System.getProperty(CORNER_MODE_PROPERTY))) {
-                    try {
-                        drawRectangularBorders(borderRect, bpsBefore, bpsAfter, bpsStart, bpsEnd);
-                    } catch (IOException ioe) {
-                        throw new IFException("Error drawing border", ioe);
-                    }
-                    drawSeperateRoundedCorners(borderRect, bpsBefore, bpsAfter, bpsStart, bpsEnd,
-                            innerBackgroundColor);
-                } else {
-                    drawRoundedCorners(borderRect, bpsBefore, bpsAfter, bpsStart, bpsEnd,
-                            innerBackgroundColor);
-                }
-            } else {
-                try {
-                    drawRectangularBorders(borderRect, bpsBefore, bpsAfter, bpsStart, bpsEnd);
-                } catch (IOException ioe) {
-                    throw new IFException("Error drawing border", ioe);
-                }
-            }
-        }
-
-        private boolean isModeSeperate() {
-            return (MODE_SEPERATE.equals(System.getProperty(CORNER_MODE_PROPERTY, MODE_DEFAULT)));
-        }
-
-        private boolean isModeAllInOne() {
-            return (MODE_ALL_IN_ONE.equals(System.getProperty(CORNER_MODE_PROPERTY, MODE_DEFAULT)));
+                        throws IFException {
+            drawRoundedCorners(borderRect, bpsBefore, bpsAfter, bpsStart, bpsEnd, innerBackgroundColor);
         }
 
         private boolean isBackgroundRequired(BorderProps bpsBefore, BorderProps bpsAfter,
                 BorderProps bpsStart, BorderProps bpsEnd) {
-
-            boolean rtn = !(isRoundedCornersSupported() && isModeAllInOne()
-                    && hasRoundedCorners(bpsBefore,  bpsAfter,
-                     bpsStart,  bpsEnd));
-            return rtn;
+            return !hasRoundedCorners(bpsBefore,  bpsAfter, bpsStart,  bpsEnd);
         }
 
         private boolean hasRoundedCorners( final BorderProps bpsBefore, final BorderProps bpsAfter,
                 final BorderProps bpsStart, final BorderProps bpsEnd) {
-
             return ((bpsStart == null ? false : bpsStart.getRadiusStart() > 0)
                         && (bpsBefore == null ? false : bpsBefore.getRadiusStart() > 0))
                 || ((bpsBefore == null ? false : bpsBefore.getRadiusEnd() > 0)
@@ -609,63 +571,6 @@ public class AFPPainter extends AbstractIFPainter<AFPDocumentHandler> {
                         && (bpsStart == null ? false : bpsStart.getRadiusEnd() > 0));
         }
 
-        private void drawSeperateRoundedCorners(final Rectangle borderRect,
-                final BorderProps bpsBefore, final BorderProps bpsAfter,
-                final BorderProps bpsStart, final BorderProps bpsEnd,
-                final Color innerBackgroundColor)
-                    throws IFException {
-
-            double esf = cornerScaleFactor(borderRect.width, borderRect.height,
-                    bpsBefore,  bpsAfter,
-                    bpsStart,  bpsEnd);
-
-            if (bpsBefore != null && bpsStart != null) {
-                int beforeRadiusStart = (int)(esf *  bpsBefore.getRadiusStart());
-                int startRadiusStart = (int)(esf *  bpsStart.getRadiusStart());
-
-                Rectangle area = new Rectangle(borderRect.x, borderRect.y,
-                        startRadiusStart,  beforeRadiusStart);
-
-                drawCorner(TOP_LEFT, area, bpsBefore, bpsStart,
-                        beforeRadiusStart, startRadiusStart, innerBackgroundColor);
-            }
-
-            if (bpsEnd != null && bpsBefore != null) {
-                int endRadiusStart = (int)(esf *  bpsEnd.getRadiusStart());
-                int beforeRadiusEnd = (int)(esf *  bpsBefore.getRadiusEnd());
-                Rectangle area = new Rectangle(borderRect.x + borderRect.width - endRadiusStart,
-                        borderRect.y, endRadiusStart,  beforeRadiusEnd);
-
-                drawCorner(TOP_RIGHT, area, bpsBefore, bpsEnd,
-                        beforeRadiusEnd, endRadiusStart, innerBackgroundColor);
-            }
-
-
-            if (bpsEnd != null && bpsAfter != null) {
-                int endRadiusEnd = (int)(esf *  bpsEnd.getRadiusEnd());
-                int afterRadiusEnd = (int)(esf *  bpsAfter.getRadiusEnd());
-
-                Rectangle area = new Rectangle(borderRect.x + borderRect.width - endRadiusEnd,
-                        borderRect.y + borderRect.height - afterRadiusEnd,
-                        endRadiusEnd,   afterRadiusEnd);
-
-                drawCorner(BOTTOM_RIGHT, area, bpsAfter, bpsEnd,
-                        afterRadiusEnd, endRadiusEnd, innerBackgroundColor);
-
-            }
-
-            if (bpsStart != null && bpsAfter != null) {
-                int startRadiusEnd = (int)(esf *  bpsStart.getRadiusEnd());
-                int afterRadiusStart = (int)(esf *  bpsAfter.getRadiusStart());
-                Rectangle area = new Rectangle(borderRect.x ,
-                        borderRect.y + borderRect.height - afterRadiusStart,
-                        startRadiusEnd, afterRadiusStart);
-
-                drawCorner(BOTTOM_LEFT, area, bpsAfter, bpsStart,
-                        afterRadiusStart, startRadiusEnd, innerBackgroundColor);
-            }
-        }
-
         private void drawRoundedCorners(final Rectangle borderRect,
                 final BorderProps bpsBefore, final BorderProps bpsAfter,
                 final BorderProps bpsStart, final BorderProps bpsEnd,
@@ -828,162 +733,6 @@ public class AFPPainter extends AbstractIFPainter<AFPDocumentHandler> {
             return clip;
         }
 
-        /* TODO collect  parameters in a useful structure */
-        private void paintCorner(final Graphics2D g2d, final int beforeWidth,
-                final int startWidth, final  int beforeRadius,
-                final int startRadius, final Color innerBackgroundColor,
-                final Color beforeColor, final Color startColor) {
-
-            //Draw the before-srart corner
-            Ellipse2D.Double inner = new  Ellipse2D.Double();
-            inner.x = startWidth;
-            inner.y = beforeWidth;
-            inner.width =  2 * (startRadius - startWidth);
-            inner.height =  2 * (beforeRadius - beforeWidth);
-
-            Ellipse2D.Double outer = new  Ellipse2D.Double();
-            outer.x = 0;
-            outer.y = 0;
-            outer.width =   2 * (startRadius);
-            outer.height =  2 * (beforeRadius);
-
-            Area border = new Area(outer);
-            border.subtract(new Area(inner));
-
-            GeneralPath afterCut = new GeneralPath();
-            GeneralPath beforeCut = new GeneralPath();
-            afterCut.moveTo(0, 0);
-            beforeCut.moveTo(0, 0);
-            float borderWidthRatio = ((float)beforeWidth) / startWidth;
-            if (beforeWidth * startRadius > startWidth * beforeRadius) {
-                afterCut.lineTo(startRadius, borderWidthRatio * startRadius);
-                beforeCut.lineTo(1f / borderWidthRatio * beforeRadius, beforeRadius);
-
-                afterCut.lineTo(startRadius, 0);
-                beforeCut.lineTo(0, beforeRadius);
-            } else {
-                afterCut.lineTo(startRadius, (borderWidthRatio * startRadius));
-                beforeCut.lineTo(1f / borderWidthRatio * beforeRadius, beforeRadius);
-
-                afterCut.lineTo(startRadius, 0);
-                beforeCut.lineTo(0, beforeRadius);
-
-            }
-
-            //start
-            g2d.setColor(startColor);
-            g2d.fill(border);
-
-            //before
-            border = new Area(outer);
-            border.subtract(new Area(inner));
-            border.subtract(new Area(beforeCut));
-
-            //start
-            g2d.setColor(beforeColor);
-            g2d.fill(border);
-
-            //paint background
-            if (innerBackgroundColor == null) {
-                g2d.setColor(Color.white);
-              //  log.warn("No background color set");
-
-            } else {
-                g2d.setColor(innerBackgroundColor);
-            }
-
-            g2d.fill(inner);
-        }
-
-
-        private void drawCorner(final int corner, final Rectangle area,
-                final BorderProps before, final BorderProps start,
-                final int beforeRadius, final int startRadius, final Color innerBackground)
-                throws IFException {
-
-            if (beforeRadius > 0 && startRadius > 0) {
-                String cornerKey = makeCornerKey(corner, before, start,
-                        beforeRadius, startRadius, innerBackground);
-
-                Graphics2DImagePainter painter = null;
-
-                String name = documentHandler.getCachedRoundedCorner(cornerKey);
-
-                //  If the corner is not in the cache we construct a Graphics2DImagePainter
-                //  that paints the corner
-                if (name == null) {
-                    //Cache the name
-                    name = documentHandler.cacheRoundedCorner(cornerKey);
-
-                    // create the Graphics2DImagePainter
-                    painter = new Graphics2DImagePainter() {
-                        public void paint(Graphics2D g2d, Rectangle2D area) {
-
-                            int beforeWidth = before.width;
-                            int startWidth = start.width;
-
-                            Color beforeColor = before.color;
-                            Color startColor = start.color;
-
-                            //No transformation
-                            AffineTransform t;
-                            switch(corner) {
-                            case TOP_LEFT:
-                                //No transform required
-                                break;
-                            case TOP_RIGHT:
-                                t = new AffineTransform(-1, 0, 0, 1, startRadius, 0);
-                                g2d.transform(t);
-                                break;
-                            case BOTTOM_RIGHT:
-                                t = new AffineTransform(-1, 0, 0, -1, startRadius, beforeRadius);
-                                g2d.transform(t);
-                                break;
-                            case BOTTOM_LEFT:
-                                t = new AffineTransform(1, 0, 0, -1, 0, beforeRadius);
-                                g2d.transform(t);
-                                break;
-                            default: break;
-                            }
-
-                            paintCorner(g2d, beforeWidth, startWidth,
-                                    beforeRadius, startRadius, innerBackground,
-                                    beforeColor,  startColor);
-                        }
-
-                        public Dimension getImageSize() {
-                            return area.getSize();
-                        }
-                    };
-                }
-                paintCornersAsBitmap(painter, area, name);
-            }
-        }
-
-
-        private String makeCornerKey(int corner, BorderProps beforeProps, BorderProps startProps,
-                int beforeRadius, int startRadius, Color innerBackgroundColor) {
-
-           return hash(new StringBuffer()
-                   .append(corner)
-                   .append(":")
-                   .append(beforeRadius)
-                   .append(":")
-                   .append(startRadius)
-                   .append(":")
-                   .append(beforeProps.width)
-                   .append(":")
-                   .append(startProps.width)
-                   .append(":")
-                   .append(beforeProps.color)
-                   .append(":")
-                   .append(startProps.color)
-                   .append(":")
-                   .append(innerBackgroundColor)
-                   .toString());
-        }
-
-
         private String makeKey(Rectangle area, BorderProps beforeProps,
                 BorderProps endProps, BorderProps afterProps, BorderProps startProps,
                  Color innerBackgroundColor) {

diff --git a/src/java/org/apache/fop/render/intermediate/BorderPainter.java b/src/java/org/apache/fop/render/intermediate/BorderPainter.java
index 776cd3c3212411682fa24a6274e61526d35b8187..4104f924c5933a34d718c2b62d52669bbc4e8611 100644 (file)
--- a/src/java/org/apache/fop/render/intermediate/BorderPainter.java
+++ b/src/java/org/apache/fop/render/intermediate/BorderPainter.java
@@ -57,17 +57,8 @@ public abstract class BorderPainter {
             BorderProps bpsTop, BorderProps bpsBottom,
             BorderProps bpsLeft, BorderProps bpsRight, Color innerBackgroundColor)
                 throws IFException {
-
         try {
-            if (isRoundedCornersSupported()) {
-                drawRoundedBorders(borderRect, bpsTop, bpsBottom,
-                        bpsLeft, bpsRight);
-
-            } else {
-                drawRectangularBorders(borderRect, bpsTop, bpsBottom,
-                        bpsLeft, bpsRight);
-            }
-
+            drawRoundedBorders(borderRect, bpsTop, bpsBottom, bpsLeft, bpsRight);
         } catch (IOException ioe) {
             throw new IFException("IO error drawing borders", ioe);
         }
@@ -533,44 +524,12 @@ public abstract class BorderPainter {
 
     private double[] getCornerBorderJoinMetrics(double ellipseCenterX, double ellipseCenterY,
             double borderWidthRatio) {
-
-        //TODO decide on implementation
-        boolean invert = System.getProperty("fop.round-corners.border-invert") != null;
-        if (invert) {
-            borderWidthRatio = 1d / borderWidthRatio;
-        }
-        String cornerJoinStyle = System.getProperty("fop.round-corners.corner-join-style");
-        if ("css".equals(cornerJoinStyle)) {
-            return getCSSCornerBorderJoinMetrics(ellipseCenterX, ellipseCenterY, borderWidthRatio);
-        } else {
-            if (invert) { throw new RuntimeException("non css AND bw inverted!"); }
-            return getDefaultCornerBorderJoinMetrics(
-                    ellipseCenterX, ellipseCenterY, borderWidthRatio);
-        }
-
-    }
-
-    private double[] getCSSCornerBorderJoinMetrics(double ellipseCenterX, double ellipseCenterY,
-            double borderWidthRatio) {
-
-        double angle = Math.atan(borderWidthRatio);
-        double x = ellipseCenterX * Math.cos(Math.atan(ellipseCenterX
-                / ellipseCenterY * borderWidthRatio));
-        double y = ellipseCenterY * Math.sqrt(1d - x * x / ellipseCenterX / ellipseCenterX);
-
-        return new double[]{ellipseCenterX - x, ellipseCenterY - y, angle};
-    }
-    private double[] getDefaultCornerBorderJoinMetrics(double ellipseCenterX, double ellipseCenterY,
-            double borderWidthRatio) {
-
         double x = ellipseCenterY * ellipseCenterX * (
                 ellipseCenterY + ellipseCenterX * borderWidthRatio
                 - Math.sqrt(2d * ellipseCenterX * ellipseCenterY * borderWidthRatio)
-        )
-        / (ellipseCenterY * ellipseCenterY
+        ) / (ellipseCenterY * ellipseCenterY
                 + ellipseCenterX * ellipseCenterX * borderWidthRatio * borderWidthRatio);
         double y = borderWidthRatio * x;
-
         return new double[]{x, y, Math.atan((ellipseCenterY - y) / (ellipseCenterX - x))};
     }
 
@@ -913,12 +872,4 @@ public abstract class BorderPainter {
      */
     protected abstract void restoreGraphicsState() throws IOException;
 
-    /**
-     * TODO remove the System.props when rounded corners code is stable
-     * @return true iff in rounded corners mode
-     */
-    public static boolean isRoundedCornersSupported() {
-        return "true".equalsIgnoreCase(System.getProperty(ROUNDED_CORNERS, "true"));
-    }
-
 }