Author: acumiskey
Date: Wed Mar 25 12:08:04 2009
New Revision: 758234
URL: http://svn.apache.org/viewvc?rev=758234&view=rev
Log:
Reverted changes from revision 757852.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=758234&r1=758233&r2=758234&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
Wed Mar 25 12:08:04 2009
@@ -93,52 +93,21 @@
}
}
- /**
- * 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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
