Reverted changes from revision 757852.

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

1 files changed, 9 insertions, 40 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index 3d90e92dc..26812166d 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -93,52 +93,21 @@ public class PageSequence extends AbstractPageSequence {
         }
     }
 
-    /**
-     * Returns the simple page master related to this page sequence
-     * @return the simple page master related to this page sequence
-     */
-    public SimplePageMaster getSimplePageMaster() {
-        return getRoot().getLayoutMasterSet().getSimplePageMaster(masterReference);
-    }
-
-    /**
-     * Returns true if this page sequence has a simple page master
-     * @return true if this page sequence has a simple page master
-     */
-    public boolean hasSimplePageMaster() {
-        return getSimplePageMaster() != null;
-    }
-
-    /**
-     * Returns the page sequence master related to this page sequence
-     * @return the page sequence master related to this page sequence
-     */
-    public PageSequenceMaster getPageSequenceMaster() {
-        return getRoot().getLayoutMasterSet().getPageSequenceMaster(masterReference);
-    }
-
-    /**
-     * Returns true if this page sequence has a page sequence master
-     * @return true if this page sequence has a page sequence master
-     */
-    public boolean hasPageSequenceMaster() {
-        return getPageSequenceMaster() != null;
-    }
-
     /** {@inheritDoc} */
     protected void startOfNode() throws FOPException {
         super.startOfNode();
         flowMap = new java.util.HashMap/*<String, Flow>*/();
 
-        if (hasSimplePageMaster()) {
-            this.simplePageMaster = getSimplePageMaster();
-        } else if (hasPageSequenceMaster()) {
-            this.pageSequenceMaster = getPageSequenceMaster();
-        } else {
-            getFOValidationEventProducer().masterNotFound(this, getName(),
-                    masterReference, getLocator());
+        this.simplePageMaster
+            = getRoot().getLayoutMasterSet().getSimplePageMaster(masterReference);
+        if (simplePageMaster == null) {
+            this.pageSequenceMaster
+                = getRoot().getLayoutMasterSet().getPageSequenceMaster(masterReference);
+            if (pageSequenceMaster == null) {
+                getFOValidationEventProducer().masterNotFound(this, getName(),
+                        masterReference, getLocator());
+            }
         }
-        
         getFOEventHandler().startPageSequence(this);
     }