gmazza 2004/03/09 13:50:43
Modified: src/java/org/apache/fop/fo/pagination
PageSequenceMaster.java
Log:
Fixed bug, masterName variable wasn't being set.
Revision Changes Path
1.7 +4 -4
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PageSequenceMaster.java 27 Feb 2004 17:45:13 -0000 1.6
+++ PageSequenceMaster.java 9 Mar 2004 21:50:43 -0000 1.7
@@ -68,12 +68,12 @@
if (parent.getName().equals("fo:layout-master-set")) {
this.layoutMasterSet = (LayoutMasterSet)parent;
- String pm = this.propertyList.get(Constants.PR_MASTER_NAME).getString();
- if (pm == null) {
+ masterName =
this.propertyList.get(Constants.PR_MASTER_NAME).getString();
+ if (masterName == null) {
getLogger().warn("page-sequence-master does not have "
+ "a master-name and so is being ignored");
} else {
- this.layoutMasterSet.addPageSequenceMaster(pm, this);
+ this.layoutMasterSet.addPageSequenceMaster(masterName, this);
}
} else {
throw new FOPException("fo:page-sequence-master must be child "
@@ -147,7 +147,7 @@
}
getLogger().warn("subsequences exhausted in page-sequence-master '"
+ masterName
- + "', use previous subsequence");
+ + "', using previous subsequence");
currentSubSequence.reset();
canRecover = false;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
