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

9 files changed, 12 insertions, 14 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java
index c392aa7b6..974c71cf8 100644
--- 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 4629115a3..55dadce6e 100644
--- 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 3e6e0d867..0e670d59c 100644
--- 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 26f1ba75a..222e0fbac 100644
--- 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 c39dd3d39..17fbf9f20 100644
--- 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 3c3b8daad..25eb93843 100644
--- 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 5a0a50a3b..98b8b71f1 100644
--- 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 e44697367..66523e657 100644
--- 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 6dc3e113f..cc9c222b5 100644
--- 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) {