PR:

Obtained from:
Submitted by:
Reviewed by:
Simplified the region constructors.

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

diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java
index c392aa7b6026091f31004bc66182c6c915a84090..974c71cf8cfbb600dde2d7f49bbb3012eb68c934 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Region.java
+++ b/src/java/org/apache/fop/fo/pagination/Region.java
@@ -36,7 +36,6 @@ import org.apache.fop.fo.FObj;
 public abstract class Region extends FObj {
 
     private SimplePageMaster layoutMaster;
-    private int regionId = -1;
     private String regionName;
 
     /** Holds the overflow attribute */
@@ -49,9 +48,8 @@ public abstract class Region extends FObj {
     /**
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
-    protected Region(FONode parent, int id) {
+    protected Region(FONode parent) {
         super(parent);
-        regionId = id;
     }
 
     /**
@@ -156,7 +154,7 @@ public abstract class Region extends FObj {
 
     /**
      * Returns a sibling region for this region.
-     * @param regionClass the class of the requested region
+     * @param regionId the Constants ID of the FO representing the region
      * @return the requested region
      */
     protected Region getSiblingRegion(int regionId) {

diff --git a/src/java/org/apache/fop/fo/pagination/RegionAfter.java b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
index 4629115a3788de0e2d4a86abd805e2ff8f31de2b..55dadce6e1fb0a52b3257817868ee1de31d97116 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
@@ -34,7 +34,7 @@ public class RegionAfter extends RegionBA {
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
     public RegionAfter(FONode parent) {
-        super(parent, FO_REGION_AFTER);
+        super(parent);
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java
index 3e6e0d86799564bd7da11533a5b2a4e7283eb5b8..0e670d59c3beba8a8948d9d6aad490b4efc8211f 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBA.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java
@@ -38,8 +38,8 @@ public abstract class RegionBA extends Region {
     /**
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
-    protected RegionBA(FONode parent, int regionId) {
-        super(parent, regionId);
+    protected RegionBA(FONode parent) {
+        super(parent);
     }
 
     protected void addProperties(Attributes attlist) throws SAXParseException {

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBefore.java b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
index 26f1ba75a6ef13ddfe8d2837502f1f587ca4dcdf..222e0fbace017416be521c77ef4bf21366d7a499 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
@@ -34,7 +34,7 @@ public class RegionBefore extends RegionBA {
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
     public RegionBefore(FONode parent) {
-        super(parent, FO_REGION_BEFORE);
+        super(parent);
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index c39dd3d3931552e69e3683160b13f0df957b874e..17fbf9f201d1e37b8254a1360cf38ac577b83c07 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -45,7 +45,7 @@ public class RegionBody extends Region {
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
     public RegionBody(FONode parent) {
-        super(parent, FO_REGION_BODY);
+        super(parent);
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
index 3c3b8daad6bc949b688bcccda211894ce1dead45..25eb9384343495f29b591e7662d5b16f805a5bc5 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
@@ -35,7 +35,7 @@ public class RegionEnd extends RegionSE {
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
     public RegionEnd(FONode parent) {
-        super(parent, FO_REGION_END);
+        super(parent);
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionSE.java b/src/java/org/apache/fop/fo/pagination/RegionSE.java
index 5a0a50a3b22b8b62762545aa1b38f3c2b294837b..98b8b71f16c04c7041bbf18153737ab0b050d251 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionSE.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionSE.java
@@ -36,8 +36,8 @@ public abstract class RegionSE extends Region {
     /**
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
-    protected RegionSE(FONode parent, int regionId) {
-        super(parent, regionId);
+    protected RegionSE(FONode parent) {
+        super(parent);
     }
 
     protected void addProperties(Attributes attlist) throws SAXParseException {

diff --git a/src/java/org/apache/fop/fo/pagination/RegionStart.java b/src/java/org/apache/fop/fo/pagination/RegionStart.java
index e4469736732e9bfabbe1e730155bba34de75a638..66523e657b50c0a6e908c23ddff3dfe1901f33f4 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionStart.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionStart.java
@@ -34,7 +34,7 @@ public class RegionStart extends RegionSE {
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
     public RegionStart(FONode parent) {
-        super(parent, FO_REGION_START);
+        super(parent);
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
index 6dc3e113f505a531dd34d6e3a2212f50cea868ed..cc9c222b5325991ba6ce9d78d210b5a7b298b3af 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
@@ -182,7 +182,7 @@ public class SimplePageMaster extends FObj {
 
     /**
      * Returns the region for a given region class.
-     * @param regionClass region class to lookup
+     * @param regionId Constants ID of the FO representing the region
      * @return the region, null if it doesn't exist
      */
     public Region getRegion(int regionId) {