duplicate the area.RegionReference region codes in fo/pagination/Region, and use...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196863 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 79a077a2c1a95a46eb3f19d76dc041673367ab5a..3913cc7825dd15cb1fee6773c0d6837186738798 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Region.java
+++ b/src/java/org/apache/fop/fo/pagination/Region.java
@@ -82,6 +82,18 @@ public abstract class Region extends FObj {
     /** Key for body regions */
     public static final String BODY =   "body";
 
+    /* The following codes correspond to those found in area/RegionReference */
+    /** Integer Code for before regions */
+    public static final int BEFORE_CODE = 0;
+    /** Integer Code for start regions */
+    public static final int START_CODE = 1;
+    /** Integer Code for body regions */
+    public static final int BODY_CODE = 2;
+    /** Integer Code for end regions */
+    public static final int END_CODE = 3;
+    /** Integer Code for after regions */
+    public static final int AFTER_CODE = 4;
+
     private SimplePageMaster layoutMaster;
     private String regionName;
 
@@ -135,13 +147,6 @@ public abstract class Region extends FObj {
 
     public abstract Rectangle getViewportRectangle(FODimension pageRefRect);
 
-    /**
-     * Return the enumerated value designating this type of region in the
-     * Area tree.
-     * @return the region area class
-     */
-    public abstract int getRegionAreaClass();
-
     /**
      * Returns the default region name (xsl-region-before, xsl-region-start,
      * etc.)
@@ -156,6 +161,11 @@ public abstract class Region extends FObj {
      */
     public abstract String getRegionClass();
 
+    /**
+     * Returns the region class code.
+     * @return the region class code
+     */
+    public abstract int getRegionClassCode();
 
     /**
      * Returns the name of this region.

diff --git a/src/java/org/apache/fop/fo/pagination/RegionAfter.java b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
index bdaebcd6088d45c79460d1d7a3d73716b47265b5..ce1d94da172e4fd2827968f697b2934ceb0fa735 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
@@ -58,7 +58,6 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.fo.properties.WritingMode;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.area.RegionReference;
 
 /**
  * The fo:region-after element.
@@ -97,17 +96,17 @@ public class RegionAfter extends RegionBA {
     }
 
     /**
-     * @see org.apache.fop.fo.pagination.Region#getRegionAreaClass()
+     * @see org.apache.fop.fo.pagination.Region#getRegionClass()
      */
-    public int getRegionAreaClass() {
-        return RegionReference.AFTER;
+    public String getRegionClass() {
+        return Region.AFTER;
     }
 
     /**
-     * @see org.apache.fop.fo.pagination.Region#getRegionClass()
+     * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
      */
-    public String getRegionClass() {
-        return Region.AFTER;
+    public int getRegionClassCode() {
+        return Region.AFTER_CODE;
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBefore.java b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
index a6dc419bf8811a1d44d7ae0f981f665b7e19f7d1..c55d83bb9bc9001d74650a63507fcb52af082f0c 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
@@ -55,7 +55,6 @@ import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.properties.WritingMode;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.area.RegionReference;
 
 // Java
 import java.awt.Rectangle;
@@ -87,10 +86,10 @@ public class RegionBefore extends RegionBA {
     }
 
     /**
-     * @see org.apache.fop.fo.pagination.Region#getRegionAreaClass()
+     * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
      */
-    public int getRegionAreaClass() {
-        return RegionReference.BEFORE;
+    public int getRegionClassCode() {
+        return Region.BEFORE_CODE;
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index e717a3722aceda3ddd639225f474bf95bb9b5475..965f180afc411d21cc0ff9d19270c9d35fccfb5e 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -63,8 +63,6 @@ import org.apache.fop.fo.Property;
 import org.apache.fop.fo.properties.WritingMode;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.area.RegionReference;
-import org.apache.fop.area.BodyRegion;
 import org.apache.fop.fo.properties.CommonMarginBlock;
 
 /**
@@ -139,10 +137,10 @@ public class RegionBody extends Region {
     }
 
     /**
-     * @see org.apache.fop.fo.pagination.Region#getRegionAreaClass()
+     * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
      */
-    public int getRegionAreaClass() {
-        return RegionReference.BODY;
+    public int getRegionClassCode() {
+        return Region.BODY_CODE;
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
index ce7a2ad34d1fcc163830f30e349ce5aae2a8ad0d..a76ce40dbadea457ed602e5d702f5d6dde60b302 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
@@ -58,7 +58,6 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.fo.properties.WritingMode;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.area.RegionReference;
 
 /**
  * The fo:region-end element.
@@ -105,10 +104,10 @@ public class RegionEnd extends RegionSE {
     }
 
     /**
-     * @see org.apache.fop.fo.pagination.Region#getRegionAreaClass()
+     * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
      */
-    public int getRegionAreaClass() {
-        return RegionReference.END;
+    public int getRegionClassCode() {
+        return Region.END_CODE;
     }
 
     /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionStart.java b/src/java/org/apache/fop/fo/pagination/RegionStart.java
index 476073862cdcf76727956f407b26b66c003ce2de..8f69905bc4570d6c67980e5cd35c9273bfa21125 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionStart.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionStart.java
@@ -58,7 +58,6 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.fo.properties.WritingMode;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.area.RegionReference;
 
 /**
  * The fo:region-start element.
@@ -104,10 +103,10 @@ public class RegionStart extends RegionSE {
     }
 
     /**
-     * @see org.apache.fop.fo.pagination.Region#getRegionAreaClass()
+     * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
      */
-    public int getRegionAreaClass() {
-        return RegionReference.START;
+    public int getRegionClassCode() {
+        return Region.START_CODE;
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index a1825b9658593cd5335d233cfcda78463dd929e4..b7cc1cd52a3c2826ec87ad528afb5f9207cd057a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -786,13 +786,13 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
             regenum.hasNext();) {
            Region r = (Region)regenum.next();
            RegionViewport rvp = makeRegionViewport(r, reldims, pageCTM);
-           if (r.getRegionAreaClass() == RegionReference.BODY) {
+           if (r.getRegionClassCode() == Region.BODY_CODE) {
                rvp.setRegion(makeRegionBodyReferenceArea(r, rvp.getViewArea()));
            } else {
                rvp.setRegion(makeRegionReferenceArea(r, rvp.getViewArea()));
            }
-           page.setRegion(r.getRegionAreaClass(), rvp);
-           if (r.getRegionAreaClass() == RegionReference.BODY) {
+           page.setRegion(r.getRegionClassCode(), rvp);
+           if (r.getRegionClassCode() == RegionReference.BODY) {
                bHasBody = true;
            }
        }
@@ -871,7 +871,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
      */
     public RegionReference makeRegionReferenceArea(Region r,
             Rectangle2D absRegVPRect) {
-        RegionReference rr = new RegionReference(r.getRegionAreaClass());
+        RegionReference rr = new RegionReference(r.getRegionClassCode());
         setRegionPosition(r, rr, absRegVPRect);
         return rr;
     }