Converted contents from Rectangle2D to AreaGeometry.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197757 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/area/AreaFrame.java b/src/java/org/apache/fop/area/AreaFrame.java
index 708f3076fcf306c44b57097979623f094af734d6..1fe3afacc5ee432d52a56c9a09d464de8a7f9787 100644 (file)
--- a/src/java/org/apache/fop/area/AreaFrame.java
+++ b/src/java/org/apache/fop/area/AreaFrame.java
@@ -36,7 +36,7 @@ import org.apache.fop.fo.properties.WritingMode;
 public class AreaFrame extends AreaGeometry {
 
     /** The framed rectangle */
-    protected Rectangle2D contents = null;
+    protected AreaGeometry contents = null;
     /** The offset from <code>this</code> origin to the origin of the framed
      * rectangle */
     protected Point2D contentOffset = null;
@@ -120,7 +120,7 @@ public class AreaFrame extends AreaGeometry {
      * the new framed contents.  The offset is not affected.
      * @param contents the new framed contents
      */
-    public void setContents(Rectangle2D contents) {
+    public void setContents(AreaGeometry contents) {
         setRect(getX(), getY(),
                 getWidth() + (contents.getWidth() - this.contents.getWidth()),
                 getHeight() + (contents.getWidth() - this.contents.getWidth()));