From: Peter Bernard West Date: Tue, 6 Jul 2004 14:19:26 +0000 (+0000) Subject: Converted contents from Rectangle2D to AreaGeometry. X-Git-Tag: Defoe_export~60 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46756db9a014f344c38051db42c4ebbc910bfb29;p=xmlgraphics-fop.git 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 708f3076f..1fe3afacc 100644 --- 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 this 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()));