You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ar...@locus.apache.org on 2000/10/10 04:08:13 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageSequenceMaster.java
arved 00/10/09 19:08:13
Modified: src/org/apache/fop/fo/pagination Tag: fop-0_14_0_regions
PageSequenceMaster.java
Log:
region-name/multiple flow support
Revision Changes Path
No revision
No revision
1.1.4.1 +23 -6 xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- PageSequenceMaster.java 2000/07/11 02:48:59 1.1
+++ PageSequenceMaster.java 2000/10/10 02:08:13 1.1.4.1
@@ -1,4 +1,4 @@
-/*-- $Id: PageSequenceMaster.java,v 1.1 2000/07/11 02:48:59 arved Exp $ --
+/*-- $Id: PageSequenceMaster.java,v 1.1.4.1 2000/10/10 02:08:13 arved Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -77,7 +77,11 @@
LayoutMasterSet layoutMasterSet;
Vector subSequenceSpecifiers;
SubSequenceSpecifier currentPmr;
-
+
+ // SimplePageMasters are not exposed outside this class. Hence, this
+ // variable tracks the current master-name for the last SPM.
+ String currentPageMasterName;
+
// The terminology may be confusing. A 'page-sequence-master' consists
// of a sequence of what the XSL spec refers to as
// 'sub-sequence-specifiers'. These are, in fact, simple or complex
@@ -94,7 +98,7 @@
if (parent.getName().equals("fo:layout-master-set")) {
this.layoutMasterSet = (LayoutMasterSet) parent;
String pm = this.properties.get("master-name").getString();
- if (pm == null) {
+ if (pm.equals("")) {
System.err.println("WARNING: page-sequence-master does not have "
+ "a page-master-name and so is being ignored");
} else {
@@ -109,12 +113,13 @@
protected void addSubsequenceSpecifier( SubSequenceSpecifier pageMasterReference )
{
- subSequenceSpecifiers.add( pageMasterReference );
+ subSequenceSpecifiers.addElement( pageMasterReference );
}
protected SubSequenceSpecifier getNextSubsequenceSpecifier()
{
- currentPmr = (SubSequenceSpecifier)subSequenceSpecifiers.remove( 0 );
+ currentPmr = (SubSequenceSpecifier)subSequenceSpecifiers.elementAt( 0 );
+ subSequenceSpecifiers.removeElementAt(0);
return currentPmr;
}
@@ -135,6 +140,18 @@
currentPmr.getNextPageMaster( currentPageNumber, thisIsFirstPage );
}
- return this.layoutMasterSet.getSimplePageMaster( nextPageMaster ).getPageMaster();
+ SimplePageMaster spm = this.layoutMasterSet.getSimplePageMaster( nextPageMaster );
+ currentPageMasterName = spm.getMasterName(); // store for outside access
+ return spm.getPageMaster();
}
+
+ /**
+ * Return the 'master-name' for the last SimplePageMaster
+ * processed in this class
+ * @returns String master name for last SPM
+ */
+ public String getNextPageMasterName()
+ {
+ return currentPageMasterName;
+ }
}