Added ripple constructor:

ContentRectangle>PaddingRectangle>BorderRectangle>SpacesRectangle
with private frame field and get method

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

diff --git a/src/java/org/apache/fop/area/BorderRectangle.java b/src/java/org/apache/fop/area/BorderRectangle.java
index e8fbfaea7661d09e11a239bb50e4b7b065b6e828..7a045ab4d28b1744dec1c4c95e936fec5469d5ae 100644 (file)
--- a/src/java/org/apache/fop/area/BorderRectangle.java
+++ b/src/java/org/apache/fop/area/BorderRectangle.java
@@ -28,7 +28,14 @@ import java.awt.geom.Rectangle2D;
  */
 public class BorderRectangle extends AreaFrame {
 
-       /**
+    public BorderRectangle() {
+        contents = new PaddingRectangle();
+        contentOffset = new Point2D.Double();
+        spaces = new SpacesRectangle();
+        spaces.setContents(this);
+    }
+
+    /**
         * @param x
         * @param y
         * @param w
@@ -37,8 +44,10 @@ public class BorderRectangle extends AreaFrame {
         * @param contentOffset
         */
        public BorderRectangle(double x, double y, double w, double h,
-                       Rectangle2D contents, Point2D contentOffset) {
+                       PaddingRectangle contents, Point2D contentOffset) {
                super(x, y, w, h, contents, contentOffset);
+        spaces = new SpacesRectangle();
+        spaces.setContents(this);
        }
 
        /**
@@ -46,9 +55,16 @@ public class BorderRectangle extends AreaFrame {
         * @param contents
         * @param contentOffset
         */
-       public BorderRectangle(Rectangle2D rect, Rectangle2D contents,
+       public BorderRectangle(Rectangle2D rect, PaddingRectangle contents,
                        Point2D contentOffset) {
                super(rect, contents, contentOffset);
+        spaces = new SpacesRectangle();
+        spaces.setContents(this);
        }
 
+    private SpacesRectangle spaces = null;
+
+    public SpacesRectangle getSpaces() {
+        return spaces;
+    }
 }

diff --git a/src/java/org/apache/fop/area/ContentRectangle.java b/src/java/org/apache/fop/area/ContentRectangle.java
index c42e06a26196f2a872035137e9e9e157fc4a5ac9..e1d1c4d99fd3b8faf0a4955fd2b72ad679687a40 100644 (file)
--- a/src/java/org/apache/fop/area/ContentRectangle.java
+++ b/src/java/org/apache/fop/area/ContentRectangle.java
@@ -35,6 +35,8 @@ public class ContentRectangle extends Double {
         */
        public ContentRectangle() {
                super();
+        padding = new PaddingRectangle();
+        padding.setContents(this);
        }
 
        /**
@@ -47,22 +49,18 @@ public class ContentRectangle extends Double {
         */
        public ContentRectangle(double x, double y, double w, double h) {
                super(x, y, w, h);
+        padding = new PaddingRectangle();
+        padding.setContents(this);
        }
 
        private PaddingRectangle padding = null;
-       private BorderRectangle borders = null;
-       private SpacesRectangle spaces = null;
 
-    public void setPadding(PaddingRectangle padding) {
-        this.padding = padding;
+    public PaddingRectangle getPadding() {
+        return padding;
     }
 
-    public void setBorders(BorderRectangle borders) {
-        this.borders = borders;
+    public void setRect(double x, double y, double w, double h) {
+        super.setRect(x, y, w, h);
+        padding.setContents(this);
     }
-
-    public void setSpaces(SpacesRectangle spaces) {
-        this.spaces = spaces;
-    }
-
 }

diff --git a/src/java/org/apache/fop/area/PaddingRectangle.java b/src/java/org/apache/fop/area/PaddingRectangle.java
index fd0de4e7bf5df94c1080613cd5e24b228af50d1f..2b8d285f7b905546e988ae79ba2a824176b92ade 100644 (file)
--- a/src/java/org/apache/fop/area/PaddingRectangle.java
+++ b/src/java/org/apache/fop/area/PaddingRectangle.java
@@ -28,7 +28,14 @@ import java.awt.geom.Rectangle2D;
  */
 public class PaddingRectangle extends AreaFrame {
 
-       /**
+    public PaddingRectangle() {
+        contents = new ContentRectangle();
+        contentOffset = new Point2D.Double();
+        borders = new BorderRectangle();
+        borders.setContents(this);
+    }
+
+    /**
         * @param x
         * @param y
         * @param w
@@ -37,8 +44,10 @@ public class PaddingRectangle extends AreaFrame {
         * @param contentOffset
         */
        public PaddingRectangle(double x, double y, double w, double h,
-                       Rectangle2D contents, Point2D contentOffset) {
+                       ContentRectangle contents, Point2D contentOffset) {
                super(x, y, w, h, contents, contentOffset);
+        borders = new BorderRectangle();
+        borders.setContents(this);
        }
 
        /**
@@ -46,9 +55,16 @@ public class PaddingRectangle extends AreaFrame {
         * @param contents
         * @param contentOffset
         */
-       public PaddingRectangle(Rectangle2D rect, Rectangle2D contents,
+       public PaddingRectangle(Rectangle2D rect, ContentRectangle contents,
                        Point2D contentOffset) {
                super(rect, contents, contentOffset);
+        borders = new BorderRectangle();
+        borders.setContents(this);
        }
 
+    private BorderRectangle borders = null;
+
+    public BorderRectangle getBorders() {
+        return borders;
+    }
 }

diff --git a/src/java/org/apache/fop/area/SpacesRectangle.java b/src/java/org/apache/fop/area/SpacesRectangle.java
index 0148fbb0e8c37bd3d8cc8c3d648f2b69a53f3f30..699de6afb66fccf85566ff579a51f44b9b0e2c65 100644 (file)
--- a/src/java/org/apache/fop/area/SpacesRectangle.java
+++ b/src/java/org/apache/fop/area/SpacesRectangle.java
@@ -28,7 +28,13 @@ import java.awt.geom.Rectangle2D;
  */
 public class SpacesRectangle extends AreaFrame {
 
-       /**
+    public SpacesRectangle() {
+        contents = new BorderRectangle();
+        contentOffset = new Point2D.Double();
+
+    }
+
+    /**
         * @param x
         * @param y
         * @param w
@@ -37,7 +43,7 @@ public class SpacesRectangle extends AreaFrame {
         * @param contentOffset
         */
        public SpacesRectangle(double x, double y, double w, double h,
-                       Rectangle2D contents, Point2D contentOffset) {
+                       BorderRectangle contents, Point2D contentOffset) {
                super(x, y, w, h, contents, contentOffset);
        }
 
@@ -46,7 +52,7 @@ public class SpacesRectangle extends AreaFrame {
         * @param contents
         * @param contentOffset
         */
-       public SpacesRectangle(Rectangle2D rect, Rectangle2D contents,
+       public SpacesRectangle(Rectangle2D rect, BorderRectangle contents,
                        Point2D contentOffset) {
                super(rect, contents, contentOffset);
        }