From e3cfc8245dd2a6cc72a5dc56cd12531a9903efdb Mon Sep 17 00:00:00 2001 From: Peter Bernard West Date: Sun, 30 May 2004 16:46:40 +0000 Subject: [PATCH] Changed FONode to FoPageSequence in signature. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197677 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/flow/FoBasicLink.java | 2 +- src/java/org/apache/fop/fo/flow/FoBidiOverride.java | 2 +- src/java/org/apache/fop/fo/flow/FoBlock.java | 6 +++++- src/java/org/apache/fop/fo/flow/FoBlockContainer.java | 2 +- src/java/org/apache/fop/fo/flow/FoCharacter.java | 3 +-- src/java/org/apache/fop/fo/flow/FoExternalGraphic.java | 3 +-- src/java/org/apache/fop/fo/flow/FoFloat.java | 2 +- src/java/org/apache/fop/fo/flow/FoFlow.java | 2 +- src/java/org/apache/fop/fo/flow/FoFootnote.java | 2 +- src/java/org/apache/fop/fo/flow/FoFootnoteBody.java | 2 +- src/java/org/apache/fop/fo/flow/FoInitialPropertySet.java | 3 +-- src/java/org/apache/fop/fo/flow/FoInline.java | 2 +- src/java/org/apache/fop/fo/flow/FoInlineContainer.java | 2 +- .../org/apache/fop/fo/flow/FoInstreamForeignObject.java | 3 +-- src/java/org/apache/fop/fo/flow/FoLeader.java | 2 +- src/java/org/apache/fop/fo/flow/FoListBlock.java | 3 +-- src/java/org/apache/fop/fo/flow/FoListItem.java | 3 +-- src/java/org/apache/fop/fo/flow/FoListItemBody.java | 2 +- src/java/org/apache/fop/fo/flow/FoListItemLabel.java | 3 ++- src/java/org/apache/fop/fo/flow/FoMarker.java | 2 +- src/java/org/apache/fop/fo/flow/FoMultiCase.java | 2 +- src/java/org/apache/fop/fo/flow/FoMultiProperties.java | 3 +-- src/java/org/apache/fop/fo/flow/FoMultiPropertySet.java | 3 +-- src/java/org/apache/fop/fo/flow/FoMultiSwitch.java | 3 +-- src/java/org/apache/fop/fo/flow/FoMultiToggle.java | 2 +- src/java/org/apache/fop/fo/flow/FoPageNumber.java | 3 +-- src/java/org/apache/fop/fo/flow/FoPageNumberCitation.java | 3 +-- src/java/org/apache/fop/fo/flow/FoRetrieveMarker.java | 2 +- src/java/org/apache/fop/fo/flow/FoStaticContent.java | 2 +- src/java/org/apache/fop/fo/flow/FoTable.java | 3 +-- src/java/org/apache/fop/fo/flow/FoTableAndCaption.java | 3 +-- src/java/org/apache/fop/fo/flow/FoTableBody.java | 3 +-- src/java/org/apache/fop/fo/flow/FoTableCaption.java | 2 +- src/java/org/apache/fop/fo/flow/FoTableCell.java | 2 +- src/java/org/apache/fop/fo/flow/FoTableColumn.java | 3 +-- src/java/org/apache/fop/fo/flow/FoTableFooter.java | 3 +-- src/java/org/apache/fop/fo/flow/FoTableHeader.java | 3 +-- src/java/org/apache/fop/fo/flow/FoTableRow.java | 3 +-- src/java/org/apache/fop/fo/flow/FoTitle.java | 2 +- src/java/org/apache/fop/fo/flow/FoWrapper.java | 2 +- 40 files changed, 45 insertions(+), 58 deletions(-) diff --git a/src/java/org/apache/fop/fo/flow/FoBasicLink.java b/src/java/org/apache/fop/fo/flow/FoBasicLink.java index bd6cc732b..28c73bd68 100644 --- a/src/java/org/apache/fop/fo/flow/FoBasicLink.java +++ b/src/java/org/apache/fop/fo/flow/FoBasicLink.java @@ -120,7 +120,7 @@ public class FoBasicLink extends FOPageSeqNode { * attribute set information. */ public FoBasicLink( - FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoBidiOverride.java b/src/java/org/apache/fop/fo/flow/FoBidiOverride.java index 54399b840..8e2703607 100644 --- a/src/java/org/apache/fop/fo/flow/FoBidiOverride.java +++ b/src/java/org/apache/fop/fo/flow/FoBidiOverride.java @@ -107,7 +107,7 @@ public class FoBidiOverride extends FOPageSeqNode { * attribute set information. */ public FoBidiOverride - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoBlock.java b/src/java/org/apache/fop/fo/flow/FoBlock.java index 1d3e9ce4e..d46250382 100644 --- a/src/java/org/apache/fop/fo/flow/FoBlock.java +++ b/src/java/org/apache/fop/fo/flow/FoBlock.java @@ -132,7 +132,7 @@ public class FoBlock extends FOPageSeqNode { * attribute set information. */ public FoBlock - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { @@ -152,6 +152,10 @@ public class FoBlock extends FOPageSeqNode { // Generate the flow object FObjects.makePageSeqFOChild( foTree, pageSequence, this, ev, stateFlags); + // Area generation happening here + // Note that while the child is being processed, callbacks + // involving requests for and allocation of page space will + // be occurring if (ev.getType() != XmlEvent.CHARACTERS) { ev = xmlevents.getEndElement( XmlEventReader.DISCARD_EV, ev); diff --git a/src/java/org/apache/fop/fo/flow/FoBlockContainer.java b/src/java/org/apache/fop/fo/flow/FoBlockContainer.java index a3073492b..0992eb7d8 100644 --- a/src/java/org/apache/fop/fo/flow/FoBlockContainer.java +++ b/src/java/org/apache/fop/fo/flow/FoBlockContainer.java @@ -120,7 +120,7 @@ public class FoBlockContainer extends FOPageSeqNode { * attribute set information. */ public FoBlockContainer - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoCharacter.java b/src/java/org/apache/fop/fo/flow/FoCharacter.java index ad218c726..62292ef61 100644 --- a/src/java/org/apache/fop/fo/flow/FoCharacter.java +++ b/src/java/org/apache/fop/fo/flow/FoCharacter.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -119,7 +118,7 @@ public class FoCharacter extends FOPageSeqNode { * attribute set information. */ public FoCharacter - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoExternalGraphic.java b/src/java/org/apache/fop/fo/flow/FoExternalGraphic.java index e5f255b81..aeca46c1e 100644 --- a/src/java/org/apache/fop/fo/flow/FoExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/FoExternalGraphic.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -118,7 +117,7 @@ public class FoExternalGraphic extends FOPageSeqNode { * attribute set information. */ public FoExternalGraphic - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoFloat.java b/src/java/org/apache/fop/fo/flow/FoFloat.java index 38d423df6..3ca77e12b 100644 --- a/src/java/org/apache/fop/fo/flow/FoFloat.java +++ b/src/java/org/apache/fop/fo/flow/FoFloat.java @@ -97,7 +97,7 @@ public class FoFloat extends FOPageSeqNode { * attribute set information. */ public FoFloat - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoFlow.java b/src/java/org/apache/fop/fo/flow/FoFlow.java index cb46b3637..6a98aa33d 100644 --- a/src/java/org/apache/fop/fo/flow/FoFlow.java +++ b/src/java/org/apache/fop/fo/flow/FoFlow.java @@ -88,7 +88,7 @@ public class FoFlow extends FOPageSeqNode { * @param event the XmlEvent that triggered the creation of * this node */ - public FoFlow(FOTree foTree, FONode parent, FoXmlEvent event) + public FoFlow(FOTree foTree, FoPageSequence parent, FoXmlEvent event) throws TreeException, FOPException { super(foTree, FObjectNames.FLOW, parent, event, diff --git a/src/java/org/apache/fop/fo/flow/FoFootnote.java b/src/java/org/apache/fop/fo/flow/FoFootnote.java index f06a16a7e..c007d1802 100644 --- a/src/java/org/apache/fop/fo/flow/FoFootnote.java +++ b/src/java/org/apache/fop/fo/flow/FoFootnote.java @@ -107,7 +107,7 @@ public class FoFootnote extends FOPageSeqNode { * attribute set information. */ public FoFootnote - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java b/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java index bb17f6817..a2dd925c7 100644 --- a/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java +++ b/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java @@ -98,7 +98,7 @@ public class FoFootnoteBody extends FOPageSeqNode { * attribute set information. */ public FoFootnoteBody - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoInitialPropertySet.java b/src/java/org/apache/fop/fo/flow/FoInitialPropertySet.java index dbe2d2ccc..bb6f484b9 100644 --- a/src/java/org/apache/fop/fo/flow/FoInitialPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/FoInitialPropertySet.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -104,7 +103,7 @@ public class FoInitialPropertySet extends FOPageSeqNode { * attribute set information. */ public FoInitialPropertySet - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoInline.java b/src/java/org/apache/fop/fo/flow/FoInline.java index 4d386bf33..526421c41 100644 --- a/src/java/org/apache/fop/fo/flow/FoInline.java +++ b/src/java/org/apache/fop/fo/flow/FoInline.java @@ -121,7 +121,7 @@ public class FoInline extends FOPageSeqNode { * attribute set information. */ public FoInline - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoInlineContainer.java b/src/java/org/apache/fop/fo/flow/FoInlineContainer.java index 9d7861132..5b1c3664a 100644 --- a/src/java/org/apache/fop/fo/flow/FoInlineContainer.java +++ b/src/java/org/apache/fop/fo/flow/FoInlineContainer.java @@ -120,7 +120,7 @@ public class FoInlineContainer extends FOPageSeqNode { * attribute set information. */ public FoInlineContainer - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoInstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/FoInstreamForeignObject.java index cc57f6673..162f4b1e6 100644 --- a/src/java/org/apache/fop/fo/flow/FoInstreamForeignObject.java +++ b/src/java/org/apache/fop/fo/flow/FoInstreamForeignObject.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -118,7 +117,7 @@ public class FoInstreamForeignObject extends FOPageSeqNode { * attribute set information. */ public FoInstreamForeignObject - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoLeader.java b/src/java/org/apache/fop/fo/flow/FoLeader.java index adc96af2e..36853fb0c 100644 --- a/src/java/org/apache/fop/fo/flow/FoLeader.java +++ b/src/java/org/apache/fop/fo/flow/FoLeader.java @@ -123,7 +123,7 @@ public class FoLeader extends FOPageSeqNode { * attribute set information. */ public FoLeader - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoListBlock.java b/src/java/org/apache/fop/fo/flow/FoListBlock.java index 7dc728752..3557a3bbe 100644 --- a/src/java/org/apache/fop/fo/flow/FoListBlock.java +++ b/src/java/org/apache/fop/fo/flow/FoListBlock.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -117,7 +116,7 @@ public class FoListBlock extends FOPageSeqNode { * attribute set information. */ public FoListBlock - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoListItem.java b/src/java/org/apache/fop/fo/flow/FoListItem.java index 1572239ef..9a05296fc 100644 --- a/src/java/org/apache/fop/fo/flow/FoListItem.java +++ b/src/java/org/apache/fop/fo/flow/FoListItem.java @@ -26,7 +26,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -110,7 +109,7 @@ public class FoListItem extends FOPageSeqNode { * attribute set information. */ public FoListItem - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoListItemBody.java b/src/java/org/apache/fop/fo/flow/FoListItemBody.java index d4161936f..3e3a9d11a 100644 --- a/src/java/org/apache/fop/fo/flow/FoListItemBody.java +++ b/src/java/org/apache/fop/fo/flow/FoListItemBody.java @@ -100,7 +100,7 @@ public class FoListItemBody extends FOPageSeqNode { * attribute set information. */ public FoListItemBody - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoListItemLabel.java b/src/java/org/apache/fop/fo/flow/FoListItemLabel.java index d700e9ae3..c087271fd 100644 --- a/src/java/org/apache/fop/fo/flow/FoListItemLabel.java +++ b/src/java/org/apache/fop/fo/flow/FoListItemLabel.java @@ -100,7 +100,8 @@ public class FoListItemLabel extends FOPageSeqNode { * attribute set information. */ public FoListItemLabel - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, + FoXmlEvent event, int stateFlags) throws TreeException, FOPException { super(foTree, FObjectNames.LIST_ITEM_LABEL, pageSequence, parent, event, diff --git a/src/java/org/apache/fop/fo/flow/FoMarker.java b/src/java/org/apache/fop/fo/flow/FoMarker.java index 07a1c6329..d8ac44f4a 100644 --- a/src/java/org/apache/fop/fo/flow/FoMarker.java +++ b/src/java/org/apache/fop/fo/flow/FoMarker.java @@ -97,7 +97,7 @@ public class FoMarker extends FOPageSeqNode { * attribute set information. */ public FoMarker - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoMultiCase.java b/src/java/org/apache/fop/fo/flow/FoMultiCase.java index 8fb08fe9e..6605eb627 100644 --- a/src/java/org/apache/fop/fo/flow/FoMultiCase.java +++ b/src/java/org/apache/fop/fo/flow/FoMultiCase.java @@ -103,7 +103,7 @@ public class FoMultiCase extends FOPageSeqNode { * attribute set information. */ public FoMultiCase - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoMultiProperties.java b/src/java/org/apache/fop/fo/flow/FoMultiProperties.java index c7e20d9b3..7dfad8ecf 100644 --- a/src/java/org/apache/fop/fo/flow/FoMultiProperties.java +++ b/src/java/org/apache/fop/fo/flow/FoMultiProperties.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -101,7 +100,7 @@ public class FoMultiProperties extends FOPageSeqNode { * attribute set information. */ public FoMultiProperties - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoMultiPropertySet.java b/src/java/org/apache/fop/fo/flow/FoMultiPropertySet.java index 316d52f48..f3ec235f7 100644 --- a/src/java/org/apache/fop/fo/flow/FoMultiPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/FoMultiPropertySet.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -90,7 +89,7 @@ public class FoMultiPropertySet extends FOPageSeqNode { * attribute set information. */ public FoMultiPropertySet - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java b/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java index dd957d520..5183c70da 100644 --- a/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java +++ b/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -102,7 +101,7 @@ public class FoMultiSwitch extends FOPageSeqNode { * attribute set information. */ public FoMultiSwitch - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoMultiToggle.java b/src/java/org/apache/fop/fo/flow/FoMultiToggle.java index 9a34e610f..be13efb07 100644 --- a/src/java/org/apache/fop/fo/flow/FoMultiToggle.java +++ b/src/java/org/apache/fop/fo/flow/FoMultiToggle.java @@ -100,7 +100,7 @@ public class FoMultiToggle extends FOPageSeqNode { * attribute set information. */ public FoMultiToggle - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoPageNumber.java b/src/java/org/apache/fop/fo/flow/FoPageNumber.java index 43f638b83..d81458646 100644 --- a/src/java/org/apache/fop/fo/flow/FoPageNumber.java +++ b/src/java/org/apache/fop/fo/flow/FoPageNumber.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -115,7 +114,7 @@ public class FoPageNumber extends FOPageSeqNode { * attribute set information. */ public FoPageNumber - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoPageNumberCitation.java b/src/java/org/apache/fop/fo/flow/FoPageNumberCitation.java index 9230f49b0..6d5bd3cce 100644 --- a/src/java/org/apache/fop/fo/flow/FoPageNumberCitation.java +++ b/src/java/org/apache/fop/fo/flow/FoPageNumberCitation.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -116,7 +115,7 @@ public class FoPageNumberCitation extends FOPageSeqNode { * attribute set information. */ public FoPageNumberCitation - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoRetrieveMarker.java b/src/java/org/apache/fop/fo/flow/FoRetrieveMarker.java index 2d3928370..f1da6e04b 100644 --- a/src/java/org/apache/fop/fo/flow/FoRetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/FoRetrieveMarker.java @@ -91,7 +91,7 @@ public class FoRetrieveMarker extends FOPageSeqNode { * attribute set information. */ public FoRetrieveMarker - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoStaticContent.java b/src/java/org/apache/fop/fo/flow/FoStaticContent.java index 03145876e..9a1518500 100644 --- a/src/java/org/apache/fop/fo/flow/FoStaticContent.java +++ b/src/java/org/apache/fop/fo/flow/FoStaticContent.java @@ -99,7 +99,7 @@ public class FoStaticContent extends FOPageSeqNode { * @param event the XmlEvent that triggered the creation of * this node */ - public FoStaticContent(FOTree foTree, FONode parent, FoXmlEvent event) + public FoStaticContent(FOTree foTree, FoPageSequence parent, FoXmlEvent event) throws TreeException, FOPException { super(foTree, FObjectNames.STATIC_CONTENT, parent, event, diff --git a/src/java/org/apache/fop/fo/flow/FoTable.java b/src/java/org/apache/fop/fo/flow/FoTable.java index e93b5a657..afa1563b9 100644 --- a/src/java/org/apache/fop/fo/flow/FoTable.java +++ b/src/java/org/apache/fop/fo/flow/FoTable.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -139,7 +138,7 @@ public class FoTable extends FOPageSeqNode { * attribute set information. */ public FoTable - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java b/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java index 8ce339e47..b0d0cc340 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java +++ b/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -119,7 +118,7 @@ public class FoTableAndCaption extends FOPageSeqNode { * attribute set information. */ public FoTableAndCaption - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableBody.java b/src/java/org/apache/fop/fo/flow/FoTableBody.java index dd46def5d..dd50e3ec5 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableBody.java +++ b/src/java/org/apache/fop/fo/flow/FoTableBody.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -120,7 +119,7 @@ public class FoTableBody extends FOPageSeqNode { * attribute set information. */ public FoTableBody - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableCaption.java b/src/java/org/apache/fop/fo/flow/FoTableCaption.java index e3f687a82..b832191cb 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableCaption.java +++ b/src/java/org/apache/fop/fo/flow/FoTableCaption.java @@ -110,7 +110,7 @@ public class FoTableCaption extends FOPageSeqNode { * attribute set information. */ public FoTableCaption - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableCell.java b/src/java/org/apache/fop/fo/flow/FoTableCell.java index 8a8f9c27a..1d97e4396 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableCell.java +++ b/src/java/org/apache/fop/fo/flow/FoTableCell.java @@ -119,7 +119,7 @@ public class FoTableCell extends FOPageSeqNode { * attribute set information. */ public FoTableCell - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableColumn.java b/src/java/org/apache/fop/fo/flow/FoTableColumn.java index 798a10475..a8551934d 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableColumn.java +++ b/src/java/org/apache/fop/fo/flow/FoTableColumn.java @@ -25,7 +25,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -100,7 +99,7 @@ public class FoTableColumn extends FOPageSeqNode { * attribute set information. */ public FoTableColumn - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableFooter.java b/src/java/org/apache/fop/fo/flow/FoTableFooter.java index 1ace96dc7..3b01d899f 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableFooter.java +++ b/src/java/org/apache/fop/fo/flow/FoTableFooter.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -120,7 +119,7 @@ public class FoTableFooter extends FOPageSeqNode { * attribute set information. */ public FoTableFooter - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableHeader.java b/src/java/org/apache/fop/fo/flow/FoTableHeader.java index 45ea413e7..57746b4c6 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableHeader.java +++ b/src/java/org/apache/fop/fo/flow/FoTableHeader.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -120,7 +119,7 @@ public class FoTableHeader extends FOPageSeqNode { * attribute set information. */ public FoTableHeader - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTableRow.java b/src/java/org/apache/fop/fo/flow/FoTableRow.java index 4566d717d..4724ad59c 100644 --- a/src/java/org/apache/fop/fo/flow/FoTableRow.java +++ b/src/java/org/apache/fop/fo/flow/FoTableRow.java @@ -29,7 +29,6 @@ import java.util.BitSet; import org.apache.fop.apps.FOPException; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOPageSeqNode; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FObjectNames; @@ -119,7 +118,7 @@ public class FoTableRow extends FOPageSeqNode { * attribute set information. */ public FoTableRow - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { diff --git a/src/java/org/apache/fop/fo/flow/FoTitle.java b/src/java/org/apache/fop/fo/flow/FoTitle.java index 0ae99af36..aa1c9896d 100644 --- a/src/java/org/apache/fop/fo/flow/FoTitle.java +++ b/src/java/org/apache/fop/fo/flow/FoTitle.java @@ -105,7 +105,7 @@ public class FoTitle extends FOPageSeqNode { * @param event the XmlEvent that triggered the creation of * this node */ - public FoTitle(FOTree foTree, FONode parent, FoXmlEvent event) + public FoTitle(FOTree foTree, FoPageSequence parent, FoXmlEvent event) throws TreeException, FOPException { super(foTree, FObjectNames.TITLE, parent, event, diff --git a/src/java/org/apache/fop/fo/flow/FoWrapper.java b/src/java/org/apache/fop/fo/flow/FoWrapper.java index 924742a27..2df13e88b 100644 --- a/src/java/org/apache/fop/fo/flow/FoWrapper.java +++ b/src/java/org/apache/fop/fo/flow/FoWrapper.java @@ -86,7 +86,7 @@ public class FoWrapper extends FOPageSeqNode { * attribute set information. */ public FoWrapper - (FOTree foTree, FONode pageSequence, FOPageSeqNode parent, + (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent, FoXmlEvent event, int stateFlags) throws TreeException, FOPException { -- 2.39.5