Second phase of performance improvement.

- Removed addProperties() method and misc old property fields.

PR: 31699


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

1 files changed, 1 insertions, 36 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
index 33e2b5caa..8d9b4d0e8 100644
--- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
@@ -19,7 +19,6 @@
 package org.apache.fop.fo.pagination;
 
 // XML
-import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
@@ -46,8 +45,6 @@ public class ConditionalPageMasterReference extends FObj {
     
     private RepeatablePageMasterAlternatives repeatablePageMasterAlternatives;
 
-    private String masterName;
-
     /**
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      */
@@ -82,38 +79,6 @@ public class ConditionalPageMasterReference extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addProperties
-     */
-    protected void addProperties(Attributes attlist) throws SAXParseException {
-        super.addProperties(attlist);
-        if (getProperty(PR_MASTER_REFERENCE) != null) {
-            setMasterName(getProperty(PR_MASTER_REFERENCE).getString());
-        }
-
-        validateParent(parent);
-
-        this.pagePosition = getPropEnum(PR_PAGE_POSITION);
-        this.oddOrEven = getPropEnum(PR_ODD_OR_EVEN);
-        this.blankOrNotBlank = getPropEnum(PR_BLANK_OR_NOT_BLANK);
-    }
-
-    /**
-     * Sets the master name.
-     * @param masterName name for the master
-     */
-    protected void setMasterName(String masterName) {
-        this.masterName = masterName;
-    }
-
-    /**
-     * Returns the "master-name" attribute of this page master reference
-     * @return the master name
-     */
-    public String getMasterName() {
-        return masterName;
-    }
-
-    /**
      * Check if the conditions for this reference are met.
      * checks the page number and emptyness to determine if this
      * matches.
@@ -179,7 +144,7 @@ public class ConditionalPageMasterReference extends FObj {
             this.repeatablePageMasterAlternatives =
                 (RepeatablePageMasterAlternatives)parent;
 
-            if (getMasterName() == null) {
+            if (getMasterReference() == null) {
                 getLogger().warn("single-page-master-reference"
                                        + "does not have a master-name and so is being ignored");
             } else {