1. For maintenance and accuracy, centralized the setupID() functionality

from the various FO's to the FObj base class.

2. Created a lookup bitset in PropertySets to help accomplish the above.

3. Generally moved initialization code from the setup() methods to the
addProperties() methods in the various FO subclasses.


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

1 files changed, 2 insertions, 6 deletions

diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index dfee543bd..dd69e26d7 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -67,22 +67,18 @@ public class PageNumber extends FObj {
      */
     protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
-        setup();
-        getFOInputHandler().startPageNumber(this);
-    }
 
-    private void setup() {
         // Common Font Properties
         this.fontState = propMgr.getFontState(getFOInputHandler().getFontInfo());
 
-        setupID();
-
         ColorType c = this.propertyList.get(PR_COLOR).getColorType();
         this.red = c.getRed();
         this.green = c.getGreen();
         this.blue = c.getBlue();
 
         this.wrapOption = this.propertyList.get(PR_WRAP_OPTION).getEnum();
+
+        getFOInputHandler().startPageNumber(this);
     }
 
     /**