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, 3 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index 04738468a..57eff5ccd 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -276,13 +276,12 @@ public class PageSequence extends FObj {
 
         // get the 'format' properties
         this.pageNumberGenerator =
-            new PageNumberGenerator(this.propertyList.get(PR_FORMAT).getString(),
+            new PageNumberGenerator(getPropString(PR_FORMAT),
                                     this.propertyList.get(PR_GROUPING_SEPARATOR).getCharacter(),
                                     this.propertyList.get(PR_GROUPING_SIZE).getNumber().intValue(),
-                                    this.propertyList.get(PR_LETTER_VALUE).getEnum());
+                                    getPropEnum(PR_LETTER_VALUE));
 
-        this.forcePageCount =
-            this.propertyList.get(PR_FORCE_PAGE_COUNT).getEnum();
+        this.forcePageCount = getPropEnum(PR_FORCE_PAGE_COUNT);
 
         // this.propertyList.get("country");
         // this.propertyList.get("language");