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

diff --git a/src/java/org/apache/fop/fo/flow/FoBasicLink.java b/src/java/org/apache/fop/fo/flow/FoBasicLink.java
index bd6cc732b9447db80654018833e3e9e72b40659d..28c73bd68dba209b6ddcbe713787820b969e87cf 100644 (file)
--- 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 54399b840c704a43076441ea6bbec2c160294be6..8e2703607459364203845893459297a40e873872 100644 (file)
--- 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 1d3e9ce4edc7cf074ee48c561ab4f184eba0d470..d46250382dbe41b7cb20e743339fd0a89c1b7437 100644 (file)
--- 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 a3073492b5777f3d26cee566257a35ee44feb2ee..0992eb7d8abc48f64debeafd49ea6a2a992bd081 100644 (file)
--- 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 ad218c72652945061b0157363755e7c6e0594c1a..62292ef6186f41faeab8aa98c0e735f4c1d5bb54 100644 (file)
--- 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 e5f255b81864319e66a51cc84bf00d232a35efa7..aeca46c1e67df4bc2012c765b4d5c16079cfc58a 100644 (file)
--- 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 38d423df6e0cb8af430306d6fd46b389728368ba..3ca77e12be2b8bb2de67f42e868cc7f8f7121a50 100644 (file)
--- 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 cb46b3637d1757e0b171c0113392f24ceccf2a2b..6a98aa33dc1c30e9489e2e2f9c948a73b9d326e2 100644 (file)
--- 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 <tt>XmlEvent</tt> 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 f06a16a7e47b5e71facebd885e96d80b7510b28a..c007d1802d565d0ec70d8cc5587a0a3f3953e833 100644 (file)
--- 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 bb17f681703fa7e1890f8e54360c2f552363793d..a2dd925c74c31720082041f53845a76e3e485da9 100644 (file)
--- 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 dbe2d2ccc670ee7fba968b07981918845feef1f2..bb6f484b93ee6e270b5681a6c0970fda47e0be63 100644 (file)
--- 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 4d386bf33a49e9b3870050423726a7930060d0a7..526421c411a9546397d480e3e00fb91e409ded4d 100644 (file)
--- 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 9d7861132071c50225d12c04b617337410e5d089..5b1c3664a60aa5e962817e7268857d124693c5cf 100644 (file)
--- 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 cc57f667368d8c92b0a0e272dd72544882a69d23..162f4b1e6a4e0f887442717cfe7b4a1ac7dcbc42 100644 (file)
--- 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 adc96af2e2a292fe6447aedf4f49a040dcba47a2..36853fb0cf22bee6b265b5d413128b0df9548d8c 100644 (file)
--- 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 7dc72875211d7b65e42860593745eb8cb0ae0342..3557a3bbeb78b5b5ee8176afa1b9e3bd8e413fc4 100644 (file)
--- 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 1572239ef575e644187699eb86c1f5b55cf47ba4..9a05296fc3beab7e2925a69ab998967cf0f64050 100644 (file)
--- 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 d4161936f04e7da2e897ae03ef4a6492390f6c66..3e3a9d11aae9d6a3e3afedc6ec8c86ae946ee5a2 100644 (file)
--- 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 d700e9ae3f48d5a9f263aa2ec751f8d0abbf58be..c087271fdb6a8911ff6aee6717ded588bcf64382 100644 (file)
--- 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 07a1c6329f664cf3289b5d27a5716fb52370c563..d8ac44f4a6a197c202f9f476c9039515884739c4 100644 (file)
--- 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 8fb08fe9e23953f7739d3480ee9fce9f27ccc1f8..6605eb627ce6da9e0727e1ab773086f3ffc9804f 100644 (file)
--- 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 c7e20d9b3800ba669cad0f363bb434fbdb0f1344..7dfad8ecfe81b2b58a579ad863e285128d51a5f0 100644 (file)
--- 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 316d52f4822c96f8b06a6e540305f0fdcee26793..f3ec235f7ff0d8a7b526d1cbc7b4a0b10b08bdfe 100644 (file)
--- 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 dd957d520fad3c277cfa8a2e67bc967eabc62b2e..5183c70da3aab057eccf01a77d566fe34e9abd3c 100644 (file)
--- 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 9a34e610f8cca8813390b0873bbd6f5558eb261e..be13efb07daf2402a6fd1213747a5103179a9184 100644 (file)
--- 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 43f638b8376e67de36036c123adfacb5e2b6e573..d81458646d75e87b20dedb793883c7fb432ab3bf 100644 (file)
--- 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 9230f49b036b34475bf8d5486caf1b3088e60629..6d5bd3ccef7b7c2f1191cc43e4f1e9f7ae4acbf6 100644 (file)
--- 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 2d39283701f420739863f8bf1d0559dcefb3ae52..f1da6e04bbfacaa1ee3bfc4cbbef37c5efae456a 100644 (file)
--- 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 03145876ef3929e7dd55bc96dca91508373f93fe..9a1518500e899e6c84aeb42c36ab9cc9d9794ffc 100644 (file)
--- 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 <tt>XmlEvent</tt> 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 e93b5a657d06c7d8c3a38336659594ef231e5bf9..afa1563b92b31a6093c2cd61e08eef072ade4da5 100644 (file)
--- 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 8ce339e47f718cf678246d62c8667a1aaba10b26..b0d0cc3405977f17ca309fde9687f1dcc8ebcc7d 100644 (file)
--- 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 dd46def5d015f96e655a50fb8308d4880dd9a1d2..dd50e3ec5cea074a82ad0c38e3de298deeb71828 100644 (file)
--- 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 e3f687a827c79cbabb3caf1ee5a848e9e6ebdca9..b832191cb30252f1938cd0b18539a4cea856ab47 100644 (file)
--- 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 8a8f9c27a75b5a4c3d90fc06799a82c69f6266e2..1d97e439664681597a2669d1f1817979004a0268 100644 (file)
--- 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 798a10475b33a845bc6a399eca258c7d0ee0d881..a8551934d17731faf3bde11eb93c85f9dc6bc7b3 100644 (file)
--- 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 1ace96dc738fe559b7d260f214594064fdebaa72..3b01d899f81f768950fbb38d9c903de2fe3096ca 100644 (file)
--- 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 45ea413e70dcc3922001ab898449341d3cd8fcc3..57746b4c6d9f2e7df1877701112ee1093408bd4f 100644 (file)
--- 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 4566d717dfe8f640fdb424e264d17584a5f3fbb7..4724ad59ca7f27725cf689314fde71202862d211 100644 (file)
--- 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 0ae99af36eb8040820128177ae610d4f960ef89b..aa1c9896d2fcef72da0a0933d47e507a7687a710 100644 (file)
--- 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 <tt>XmlEvent</tt> 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 924742a27aecdca9f737155123f4111348647774..2df13e88b9be71c5b188366b2dcd66be3d3fbd67 100644 (file)
--- 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
     {