pbwest 2004/05/10 04:50:02
Modified: src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOPageSeqNode.java
Log:
pageSequence field now stored as FoPageSequence,
not as FONode
Revision Changes Path
No revision
No revision
1.1.2.3 +13 -9 xml-fop/src/java/org/apache/fop/fo/Attic/FOPageSeqNode.java
Index: FOPageSeqNode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOPageSeqNode.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FOPageSeqNode.java 8 May 2004 13:07:17 -0000 1.1.2.2
+++ FOPageSeqNode.java 10 May 2004 11:50:02 -0000 1.1.2.3
@@ -24,6 +24,7 @@
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.flow.FoMarker;
+import org.apache.fop.fo.flow.FoPageSequence;
import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
@@ -34,7 +35,7 @@
public class FOPageSeqNode extends FONode {
/** The <code>FoPageSequence</code> ancestor of this node. */
- protected final FONode pageSequence;
+ protected final FoPageSequence pageSequence;
/**
* Comment for <code>childContext</code>
*/
@@ -78,8 +79,12 @@
stateFlags,
sparsePropsMap,
sparseIndices);
-
- this.pageSequence = pageSequence;
+ if (pageSequence.type != FObjectNames.PAGE_SEQUENCE) {
+ throw new RuntimeException(
+ "FOPageSeqNode constructor expects FoPageSequence; got " +
+ nodeType());
+ }
+ this.pageSequence = (FoPageSequence)pageSequence;
}
@@ -113,19 +118,18 @@
int[] sparsePropsMap,
int[] sparseIndices)
throws TreeException, FOPException, PropertyException {
- super(
+ this(
foTree,
type,
pageSequence,
+ pageSequence,
event,
stateFlags,
sparsePropsMap,
sparseIndices);
-
- this.pageSequence = pageSequence;
}
- public FONode getPageSequence() {
+ public FoPageSequence getPageSequence() {
return pageSequence;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
