1.) Some flattening of the Region classes done, with the goal of moving

some of its layout logic to PageLayoutManager.

2.)  New helper function getPropEnum() added.


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

1 files changed, 17 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
index 25eb93843..3636dfc7a 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
@@ -21,6 +21,10 @@ package org.apache.fop.fo.pagination;
 // Java
 import java.awt.Rectangle;
 
+// XML
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
+
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.datatypes.FODimension;
@@ -30,6 +34,7 @@ import org.apache.fop.datatypes.FODimension;
  */
 public class RegionEnd extends RegionSE {
 
+    private int extent = 0;
 
     /**
      * @see org.apache.fop.fo.FONode#FONode(FONode)
@@ -39,17 +44,25 @@ public class RegionEnd extends RegionSE {
     }
 
     /**
+     * @see org.apache.fop.fo.FObj#addProperties
+     */
+    protected void addProperties(Attributes attlist) throws SAXParseException {
+        super.addProperties(attlist);
+        extent = getPropLength(PR_EXTENT);
+    }
+
+    /**
      * @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension)
      */
     public Rectangle getViewportRectangle (FODimension reldims) {
         // Depends on extent, precedence and writing mode
         Rectangle vpRect;
         if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
-            vpRect = new Rectangle(reldims.ipd - getExtent(), 0,
-                    getExtent(), reldims.bpd);
+            vpRect = new Rectangle(reldims.ipd - extent, 0,
+                    extent, reldims.bpd);
         } else {
-            vpRect = new Rectangle(reldims.ipd - getExtent(), 0,
-                    reldims.bpd, getExtent());
+            vpRect = new Rectangle(reldims.ipd - extent, 0,
+                    reldims.bpd, extent);
         }
         adjustIPD(vpRect, this.wm);
         return vpRect;