pbwest 2004/05/30 09:46:41
Modified: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoFootnote.java FoTableColumn.java FoTableBody.java
FoRetrieveMarker.java FoMultiCase.java
FoMultiPropertySet.java FoListBlock.java
FoListItem.java FoTable.java FoFloat.java
FoInstreamForeignObject.java FoStaticContent.java
FoTitle.java FoFlow.java FoBasicLink.java
FoInitialPropertySet.java FoBidiOverride.java
FoLeader.java FoTableCell.java
FoPageNumberCitation.java FoBlockContainer.java
FoMultiToggle.java FoTableRow.java
FoMultiProperties.java FoMultiSwitch.java
FoWrapper.java FoMarker.java FoTableAndCaption.java
FoListItemLabel.java FoTableHeader.java
FoPageNumber.java FoFootnoteBody.java
FoCharacter.java FoBlock.java FoListItemBody.java
FoInline.java FoExternalGraphic.java
FoTableCaption.java FoTableFooter.java
FoInlineContainer.java
Log:
Changed FONode to FoPageSequence in signature.
Revision Changes Path
No revision
No revision
1.1.2.10 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoFootnote.java 25 Feb 2004 23:40:28 -0000 1.1.2.9
+++ FoFootnote.java 30 May 2004 16:46:40 -0000 1.1.2.10
@@ -107,7 +107,7 @@
* attribute set information.
*/
public FoFootnote
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.8 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java
Index: FoTableColumn.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoTableColumn.java 8 Mar 2004 21:51:59 -0000 1.1.2.7
+++ FoTableColumn.java 30 May 2004 16:46:40 -0000 1.1.2.8
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoTableColumn
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java
Index: FoTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableBody.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoTableBody.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoTableBody
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.8 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java
Index: FoRetrieveMarker.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoRetrieveMarker.java 8 Mar 2004 21:51:59 -0000 1.1.2.7
+++ FoRetrieveMarker.java 30 May 2004 16:46:40 -0000 1.1.2.8
@@ -91,7 +91,7 @@
* attribute set information.
*/
public FoRetrieveMarker
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoMultiCase.java 8 May 2004 13:01:40 -0000 1.1.2.13
+++ FoMultiCase.java 30 May 2004 16:46:40 -0000 1.1.2.14
@@ -103,7 +103,7 @@
* attribute set information.
*/
public FoMultiCase
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.8 +3 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java
Index: FoMultiPropertySet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoMultiPropertySet.java 8 Mar 2004 21:51:59 -0000 1.1.2.7
+++ FoMultiPropertySet.java 30 May 2004 16:46:40 -0000 1.1.2.8
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoMultiPropertySet
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java
Index: FoListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoListBlock.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoListBlock.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoListBlock
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java
Index: FoListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoListItem.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoListItem.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -26,7 +26,6 @@
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 @@
* attribute set information.
*/
public FoListItem
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.12 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java
Index: FoTable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoTable.java 25 Feb 2004 23:40:28 -0000 1.1.2.11
+++ FoTable.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoTable
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoFloat.java 8 May 2004 13:01:40 -0000 1.1.2.10
+++ FoFloat.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -97,7 +97,7 @@
* attribute set information.
*/
public FoFloat
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.8 +3 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java
Index: FoInstreamForeignObject.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoInstreamForeignObject.java 8 Mar 2004 21:51:59 -0000 1.1.2.7
+++ FoInstreamForeignObject.java 30 May 2004 16:46:40 -0000 1.1.2.8
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoInstreamForeignObject
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.13 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoStaticContent.java 8 May 2004 13:01:40 -0000 1.1.2.12
+++ FoStaticContent.java 30 May 2004 16:46:40 -0000 1.1.2.13
@@ -99,7 +99,7 @@
* @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,
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java
Index: FoTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoTitle.java 8 May 2004 13:01:40 -0000 1.1.2.13
+++ FoTitle.java 30 May 2004 16:46:40 -0000 1.1.2.14
@@ -105,7 +105,7 @@
* @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,
1.1.2.16 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- FoFlow.java 12 May 2004 11:05:17 -0000 1.1.2.15
+++ FoFlow.java 30 May 2004 16:46:40 -0000 1.1.2.16
@@ -88,7 +88,7 @@
* @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,
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoBasicLink.java 8 May 2004 13:01:40 -0000 1.1.2.13
+++ FoBasicLink.java 30 May 2004 16:46:40 -0000 1.1.2.14
@@ -120,7 +120,7 @@
* attribute set information.
*/
public FoBasicLink(
- FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.8 +3 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java
Index: FoInitialPropertySet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoInitialPropertySet.java 8 Mar 2004 21:51:59 -0000 1.1.2.7
+++ FoInitialPropertySet.java 30 May 2004 16:46:40 -0000 1.1.2.8
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoInitialPropertySet
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.14 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoBidiOverride.java 8 May 2004 13:01:40 -0000 1.1.2.13
+++ FoBidiOverride.java 30 May 2004 16:46:40 -0000 1.1.2.14
@@ -107,7 +107,7 @@
* attribute set information.
*/
public FoBidiOverride
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoLeader.java 8 May 2004 13:01:40 -0000 1.1.2.13
+++ FoLeader.java 30 May 2004 16:46:40 -0000 1.1.2.14
@@ -123,7 +123,7 @@
* attribute set information.
*/
public FoLeader
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.12 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoTableCell.java 8 May 2004 13:01:40 -0000 1.1.2.11
+++ FoTableCell.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -119,7 +119,7 @@
* attribute set information.
*/
public FoTableCell
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.9 +3 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java
Index: FoPageNumberCitation.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoPageNumberCitation.java 8 Mar 2004 21:51:59 -0000 1.1.2.8
+++ FoPageNumberCitation.java 30 May 2004 16:46:40 -0000 1.1.2.9
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoPageNumberCitation
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.12 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoBlockContainer.java 8 May 2004 13:01:40 -0000 1.1.2.11
+++ FoBlockContainer.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -120,7 +120,7 @@
* attribute set information.
*/
public FoBlockContainer
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoMultiToggle.java 8 May 2004 13:01:40 -0000 1.1.2.13
+++ FoMultiToggle.java 30 May 2004 16:46:40 -0000 1.1.2.14
@@ -100,7 +100,7 @@
* attribute set information.
*/
public FoMultiToggle
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java
Index: FoTableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableRow.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoTableRow.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoTableRow
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.10 +3 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiProperties.java
Index: FoMultiProperties.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoMultiProperties.java 25 Feb 2004 23:40:28 -0000 1.1.2.9
+++ FoMultiProperties.java 30 May 2004 16:46:40 -0000 1.1.2.10
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoMultiProperties
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.10 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java
Index: FoMultiSwitch.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoMultiSwitch.java 25 Feb 2004 23:40:28 -0000 1.1.2.9
+++ FoMultiSwitch.java 30 May 2004 16:46:40 -0000 1.1.2.10
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoMultiSwitch
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoWrapper.java 8 May 2004 13:01:40 -0000 1.1.2.13
+++ FoWrapper.java 30 May 2004 16:46:40 -0000 1.1.2.14
@@ -86,7 +86,7 @@
* attribute set information.
*/
public FoWrapper
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.12 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMarker.java
Index: FoMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMarker.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoMarker.java 25 Feb 2004 23:40:28 -0000 1.1.2.11
+++ FoMarker.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -97,7 +97,7 @@
* attribute set information.
*/
public FoMarker
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java
Index: FoTableAndCaption.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableAndCaption.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoTableAndCaption.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoTableAndCaption
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.12 +4 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoListItemLabel.java 8 May 2004 13:01:40 -0000 1.1.2.11
+++ FoListItemLabel.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -100,7 +100,8 @@
* 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,
1.1.2.11 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableHeader.java
Index: FoTableHeader.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableHeader.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoTableHeader.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoTableHeader
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.9 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumber.java
Index: FoPageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumber.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoPageNumber.java 8 Mar 2004 21:51:59 -0000 1.1.2.8
+++ FoPageNumber.java 30 May 2004 16:46:40 -0000 1.1.2.9
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoPageNumber
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoFootnoteBody.java 8 May 2004 13:01:40 -0000 1.1.2.10
+++ FoFootnoteBody.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -98,7 +98,7 @@
* attribute set information.
*/
public FoFootnoteBody
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.8 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoCharacter.java
Index: FoCharacter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoCharacter.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoCharacter.java 8 Mar 2004 21:51:59 -0000 1.1.2.7
+++ FoCharacter.java 30 May 2004 16:46:40 -0000 1.1.2.8
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoCharacter
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.18 +7 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- FoBlock.java 28 May 2004 15:25:21 -0000 1.1.2.17
+++ FoBlock.java 30 May 2004 16:46:40 -0000 1.1.2.18
@@ -132,7 +132,7 @@
* 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 @@
// 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);
1.1.2.12 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoListItemBody.java 8 May 2004 13:01:40 -0000 1.1.2.11
+++ FoListItemBody.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -100,7 +100,7 @@
* attribute set information.
*/
public FoListItemBody
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.15 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- FoInline.java 8 May 2004 13:01:40 -0000 1.1.2.14
+++ FoInline.java 30 May 2004 16:46:40 -0000 1.1.2.15
@@ -121,7 +121,7 @@
* attribute set information.
*/
public FoInline
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.8 +3 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java
Index: FoExternalGraphic.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoExternalGraphic.java 8 Mar 2004 21:51:59 -0000 1.1.2.7
+++ FoExternalGraphic.java 30 May 2004 16:46:40 -0000 1.1.2.8
@@ -25,7 +25,6 @@
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 @@
* attribute set information.
*/
public FoExternalGraphic
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.12 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoTableCaption.java 8 May 2004 13:01:40 -0000 1.1.2.11
+++ FoTableCaption.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -110,7 +110,7 @@
* attribute set information.
*/
public FoTableCaption
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.11 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableFooter.java
Index: FoTableFooter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableFooter.java 25 Feb 2004 23:40:28 -0000 1.1.2.10
+++ FoTableFooter.java 30 May 2004 16:46:40 -0000 1.1.2.11
@@ -29,7 +29,6 @@
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 @@
* attribute set information.
*/
public FoTableFooter
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
1.1.2.12 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoInlineContainer.java 8 May 2004 13:01:40 -0000 1.1.2.11
+++ FoInlineContainer.java 30 May 2004 16:46:40 -0000 1.1.2.12
@@ -120,7 +120,7 @@
* attribute set information.
*/
public FoInlineContainer
- (FOTree foTree, FONode pageSequence, FOPageSeqNode parent,
+ (FOTree foTree, FoPageSequence pageSequence, FOPageSeqNode parent,
FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
