From c359797cf0495bc5828a5c3f43612fe181628534 Mon Sep 17 00:00:00 2001 From: Peter Bernard West Date: Wed, 13 Nov 2002 04:15:19 +0000 Subject: [PATCH] Attribute set constants moved from FOPropertySets to FONode. numProps arg to FONode constructor removed. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195514 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/fop/fo/flow/FoBasicLink.java | 3 +-- .../apache/fop/fo/flow/FoBidiOverride.java | 3 +-- src/org/apache/fop/fo/flow/FoBlock.java | 6 ++++-- .../apache/fop/fo/flow/FoBlockContainer.java | 3 +-- src/org/apache/fop/fo/flow/FoCharacter.java | 3 +-- .../apache/fop/fo/flow/FoExternalGraphic.java | 3 +-- src/org/apache/fop/fo/flow/FoFloat.java | 3 +-- src/org/apache/fop/fo/flow/FoFlow.java | 11 +++++----- src/org/apache/fop/fo/flow/FoFootnote.java | 3 +-- .../apache/fop/fo/flow/FoFootnoteBody.java | 3 +-- .../fop/fo/flow/FoInitialPropertySet.java | 3 +-- src/org/apache/fop/fo/flow/FoInline.java | 3 +-- .../apache/fop/fo/flow/FoInlineContainer.java | 3 +-- .../fop/fo/flow/FoInstreamForeignObject.java | 3 +-- src/org/apache/fop/fo/flow/FoLeader.java | 3 +-- src/org/apache/fop/fo/flow/FoListBlock.java | 3 +-- src/org/apache/fop/fo/flow/FoListItem.java | 3 +-- .../apache/fop/fo/flow/FoListItemBody.java | 3 +-- .../apache/fop/fo/flow/FoListItemLabel.java | 3 +-- src/org/apache/fop/fo/flow/FoMarker.java | 3 +-- src/org/apache/fop/fo/flow/FoMultiCase.java | 3 +-- .../apache/fop/fo/flow/FoMultiProperties.java | 3 +-- .../fop/fo/flow/FoMultiPropertySet.java | 3 +-- src/org/apache/fop/fo/flow/FoMultiSwitch.java | 3 +-- src/org/apache/fop/fo/flow/FoMultiToggle.java | 3 +-- src/org/apache/fop/fo/flow/FoNoFo.java | 3 +-- src/org/apache/fop/fo/flow/FoPageNumber.java | 3 +-- .../fop/fo/flow/FoPageNumberCitation.java | 3 +-- .../apache/fop/fo/flow/FoPageSequence.java | 4 +--- src/org/apache/fop/fo/flow/FoPcdata.java | 3 +-- .../apache/fop/fo/flow/FoRetrieveMarker.java | 3 +-- .../apache/fop/fo/flow/FoStaticContent.java | 11 +++++----- src/org/apache/fop/fo/flow/FoTable.java | 3 +-- .../apache/fop/fo/flow/FoTableAndCaption.java | 3 +-- src/org/apache/fop/fo/flow/FoTableBody.java | 3 +-- .../apache/fop/fo/flow/FoTableCaption.java | 3 +-- src/org/apache/fop/fo/flow/FoTableCell.java | 3 +-- src/org/apache/fop/fo/flow/FoTableColumn.java | 3 +-- src/org/apache/fop/fo/flow/FoTableFooter.java | 3 +-- src/org/apache/fop/fo/flow/FoTableHeader.java | 3 +-- src/org/apache/fop/fo/flow/FoTableRow.java | 3 +-- src/org/apache/fop/fo/flow/FoTitle.java | 7 +++---- src/org/apache/fop/fo/flow/FoWrapper.java | 3 +-- .../fop/fo/pagination/FoLayoutMasterSet.java | 4 +--- .../fo/pagination/FoPageSequenceMaster.java | 20 +++++++++---------- .../fo/pagination/FoRegionBeforeAfter.java | 5 ++--- .../fop/fo/pagination/FoRegionBody.java | 5 +---- .../fop/fo/pagination/FoRegionStartEnd.java | 5 ++--- .../fop/fo/pagination/FoSimplePageMaster.java | 4 +--- 49 files changed, 74 insertions(+), 122 deletions(-) diff --git a/src/org/apache/fop/fo/flow/FoBasicLink.java b/src/org/apache/fop/fo/flow/FoBasicLink.java index cd7ad3309..86fb6a3ca 100644 --- a/src/org/apache/fop/fo/flow/FoBasicLink.java +++ b/src/org/apache/fop/fo/flow/FoBasicLink.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -106,7 +105,7 @@ public class FoBasicLink extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.BASIC_LINK, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoBidiOverride.java b/src/org/apache/fop/fo/flow/FoBidiOverride.java index aeefbbc09..2e7f37cfe 100644 --- a/src/org/apache/fop/fo/flow/FoBidiOverride.java +++ b/src/org/apache/fop/fo/flow/FoBidiOverride.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -93,7 +92,7 @@ public class FoBidiOverride extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.BIDI_OVERRIDE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoBlock.java b/src/org/apache/fop/fo/flow/FoBlock.java index 8410f2abd..972ece228 100644 --- a/src/org/apache/fop/fo/flow/FoBlock.java +++ b/src/org/apache/fop/fo/flow/FoBlock.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -51,6 +50,7 @@ public class FoBlock extends FONode { static { // Collect the sets of properties that apply + System.out.println("In static block of FoBlock."); BitSet propsets = new BitSet(); propsets.or(PropertySets.accessibilitySet); propsets.or(PropertySets.auralSet); @@ -105,6 +105,7 @@ public class FoBlock extends FONode { sparsePropsMap.put (Ints.consts.get(next), Ints.consts.get(propx++)); } + System.out.println("End of static block of FoBlock."); } /** @@ -119,7 +120,8 @@ public class FoBlock extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.BLOCK, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); + System.out.println("Back from super constructor of FoBlock."); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoBlockContainer.java b/src/org/apache/fop/fo/flow/FoBlockContainer.java index c04d07710..c3324816e 100644 --- a/src/org/apache/fop/fo/flow/FoBlockContainer.java +++ b/src/org/apache/fop/fo/flow/FoBlockContainer.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -105,7 +104,7 @@ public class FoBlockContainer extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.BLOCK_CONTAINER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoCharacter.java b/src/org/apache/fop/fo/flow/FoCharacter.java index 0cfc5358a..848a95ce6 100644 --- a/src/org/apache/fop/fo/flow/FoCharacter.java +++ b/src/org/apache/fop/fo/flow/FoCharacter.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -113,7 +112,7 @@ public class FoCharacter extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.CHARACTER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoExternalGraphic.java b/src/org/apache/fop/fo/flow/FoExternalGraphic.java index 8de06b8df..d2884c259 100644 --- a/src/org/apache/fop/fo/flow/FoExternalGraphic.java +++ b/src/org/apache/fop/fo/flow/FoExternalGraphic.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -111,7 +110,7 @@ public class FoExternalGraphic extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.EXTERNAL_GRAPHIC, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoFloat.java b/src/org/apache/fop/fo/flow/FoFloat.java index c49041d30..dcd0a7459 100644 --- a/src/org/apache/fop/fo/flow/FoFloat.java +++ b/src/org/apache/fop/fo/flow/FoFloat.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -84,7 +83,7 @@ public class FoFloat extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.FLOAT, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoFlow.java b/src/org/apache/fop/fo/flow/FoFlow.java index 047e67059..3d6e3c891 100644 --- a/src/org/apache/fop/fo/flow/FoFlow.java +++ b/src/org/apache/fop/fo/flow/FoFlow.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjects; @@ -79,8 +78,7 @@ public class FoFlow extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.FLOW, parent, event, - FOPropertySets.FLOW_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.FLOW_SET, sparsePropsMap, sparseIndices); xmlevents = foTree.getXmlevents(); FoXMLEvent ev; try { @@ -90,7 +88,9 @@ public class FoFlow extends FONode { // Generate the flow object System.out.println("Generating first block for flow."); FObjects.fobjects.makeFlowObject - (foTree, this, ev, FOPropertySets.FLOW_SET); + (foTree, this, ev, FONode.FLOW_SET); + // Clear the blockage + ev = xmlevents.getEndElement(ev); // Get the rest of the %block;s do { ev = xmlevents.expectBlock(); @@ -99,7 +99,8 @@ public class FoFlow extends FONode { System.out.println ("Generating subsequent block for flow."); FObjects.fobjects.makeFlowObject - (foTree, this, ev, FOPropertySets.FLOW_SET); + (foTree, this, ev, FONode.FLOW_SET); + ev = xmlevents.getEndElement(ev); } } while (ev != null); } catch(UnexpectedStartElementException e) { diff --git a/src/org/apache/fop/fo/flow/FoFootnote.java b/src/org/apache/fop/fo/flow/FoFootnote.java index 083fa507a..830b15944 100644 --- a/src/org/apache/fop/fo/flow/FoFootnote.java +++ b/src/org/apache/fop/fo/flow/FoFootnote.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -83,7 +82,7 @@ public class FoFootnote extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.FOOTNOTE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoFootnoteBody.java b/src/org/apache/fop/fo/flow/FoFootnoteBody.java index 3b98fdeef..2bc8f8319 100644 --- a/src/org/apache/fop/fo/flow/FoFootnoteBody.java +++ b/src/org/apache/fop/fo/flow/FoFootnoteBody.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -83,7 +82,7 @@ public class FoFootnoteBody extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.FOOTNOTE_BODY, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java index b83cec481..6549894c5 100644 --- a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java +++ b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -98,7 +97,7 @@ public class FoInitialPropertySet extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.INITIAL_PROPERTY_SET, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoInline.java b/src/org/apache/fop/fo/flow/FoInline.java index 218fa806a..db2954ba8 100644 --- a/src/org/apache/fop/fo/flow/FoInline.java +++ b/src/org/apache/fop/fo/flow/FoInline.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -108,7 +107,7 @@ public class FoInline extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.INLINE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoInlineContainer.java b/src/org/apache/fop/fo/flow/FoInlineContainer.java index 5e7bd81ea..9755bd453 100644 --- a/src/org/apache/fop/fo/flow/FoInlineContainer.java +++ b/src/org/apache/fop/fo/flow/FoInlineContainer.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -105,7 +104,7 @@ public class FoInlineContainer extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.INLINE_CONTAINER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java index 44971d23e..caab0983d 100644 --- a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java +++ b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -110,7 +109,7 @@ public class FoInstreamForeignObject extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.INSTREAM_FOREIGN_OBJECT, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoLeader.java b/src/org/apache/fop/fo/flow/FoLeader.java index 62f03e9b1..a119aabb0 100644 --- a/src/org/apache/fop/fo/flow/FoLeader.java +++ b/src/org/apache/fop/fo/flow/FoLeader.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -111,7 +110,7 @@ public class FoLeader extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.LEADER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoListBlock.java b/src/org/apache/fop/fo/flow/FoListBlock.java index 74083a33e..2475b4677 100644 --- a/src/org/apache/fop/fo/flow/FoListBlock.java +++ b/src/org/apache/fop/fo/flow/FoListBlock.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -98,7 +97,7 @@ public class FoListBlock extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.LIST_BLOCK, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoListItem.java b/src/org/apache/fop/fo/flow/FoListItem.java index 7777e74d5..7f46bed55 100644 --- a/src/org/apache/fop/fo/flow/FoListItem.java +++ b/src/org/apache/fop/fo/flow/FoListItem.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -97,7 +96,7 @@ public class FoListItem extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.LIST_ITEM, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoListItemBody.java b/src/org/apache/fop/fo/flow/FoListItemBody.java index 88bb1d58a..0a476acf6 100644 --- a/src/org/apache/fop/fo/flow/FoListItemBody.java +++ b/src/org/apache/fop/fo/flow/FoListItemBody.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -85,7 +84,7 @@ public class FoListItemBody extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.LIST_ITEM_BODY, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoListItemLabel.java b/src/org/apache/fop/fo/flow/FoListItemLabel.java index 5e0f7be97..4895647fd 100644 --- a/src/org/apache/fop/fo/flow/FoListItemLabel.java +++ b/src/org/apache/fop/fo/flow/FoListItemLabel.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -85,7 +84,7 @@ public class FoListItemLabel extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.LIST_ITEM_LABEL, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoMarker.java b/src/org/apache/fop/fo/flow/FoMarker.java index 4359de50c..70e72129d 100644 --- a/src/org/apache/fop/fo/flow/FoMarker.java +++ b/src/org/apache/fop/fo/flow/FoMarker.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -76,7 +75,7 @@ public class FoMarker extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.MARKER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoMultiCase.java b/src/org/apache/fop/fo/flow/FoMultiCase.java index 55d204436..398338dad 100644 --- a/src/org/apache/fop/fo/flow/FoMultiCase.java +++ b/src/org/apache/fop/fo/flow/FoMultiCase.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -87,7 +86,7 @@ public class FoMultiCase extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_CASE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoMultiProperties.java b/src/org/apache/fop/fo/flow/FoMultiProperties.java index 7482104b0..6e83e535b 100644 --- a/src/org/apache/fop/fo/flow/FoMultiProperties.java +++ b/src/org/apache/fop/fo/flow/FoMultiProperties.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -84,7 +83,7 @@ public class FoMultiProperties extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_PROPERTIES, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java index 6c7ac8a18..ba22df820 100644 --- a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java +++ b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -84,7 +83,7 @@ public class FoMultiPropertySet extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_PROPERTY_SET, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoMultiSwitch.java b/src/org/apache/fop/fo/flow/FoMultiSwitch.java index 8e37ca87e..1f65ab20f 100644 --- a/src/org/apache/fop/fo/flow/FoMultiSwitch.java +++ b/src/org/apache/fop/fo/flow/FoMultiSwitch.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -85,7 +84,7 @@ public class FoMultiSwitch extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_SWITCH, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoMultiToggle.java b/src/org/apache/fop/fo/flow/FoMultiToggle.java index 857477d22..5e88b4e8a 100644 --- a/src/org/apache/fop/fo/flow/FoMultiToggle.java +++ b/src/org/apache/fop/fo/flow/FoMultiToggle.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -85,7 +84,7 @@ public class FoMultiToggle extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_TOGGLE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoNoFo.java b/src/org/apache/fop/fo/flow/FoNoFo.java index 29541fb0f..8b95cd12f 100644 --- a/src/org/apache/fop/fo/flow/FoNoFo.java +++ b/src/org/apache/fop/fo/flow/FoNoFo.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -76,7 +75,7 @@ public class FoNoFo extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.NO_FO, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoPageNumber.java b/src/org/apache/fop/fo/flow/FoPageNumber.java index 58f71e93b..e11a28c27 100644 --- a/src/org/apache/fop/fo/flow/FoPageNumber.java +++ b/src/org/apache/fop/fo/flow/FoPageNumber.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -109,7 +108,7 @@ public class FoPageNumber extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.PAGE_NUMBER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java index 9a2527eba..a4e912e07 100644 --- a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java +++ b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -110,7 +109,7 @@ public class FoPageNumberCitation extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.PAGE_NUMBER_CITATION, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoPageSequence.java b/src/org/apache/fop/fo/flow/FoPageSequence.java index 6d7752682..b7fbfe4d3 100644 --- a/src/org/apache/fop/fo/flow/FoPageSequence.java +++ b/src/org/apache/fop/fo/flow/FoPageSequence.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -99,8 +98,7 @@ public class FoPageSequence extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.PAGE_SEQUENCE, parent, event, - FOPropertySets.PAGESEQ_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.PAGESEQ_SET, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; // Look for optional title diff --git a/src/org/apache/fop/fo/flow/FoPcdata.java b/src/org/apache/fop/fo/flow/FoPcdata.java index c47b7a30a..bd91c5de9 100644 --- a/src/org/apache/fop/fo/flow/FoPcdata.java +++ b/src/org/apache/fop/fo/flow/FoPcdata.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -116,7 +115,7 @@ public class FoPcdata extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.PCDATA, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); characters = event.getChars(); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java index 21c14ceac..4909f72fe 100644 --- a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java +++ b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -85,7 +84,7 @@ public class FoRetrieveMarker extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.RETRIEVE_MARKER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoStaticContent.java b/src/org/apache/fop/fo/flow/FoStaticContent.java index 91f813a23..776ccb9ff 100644 --- a/src/org/apache/fop/fo/flow/FoStaticContent.java +++ b/src/org/apache/fop/fo/flow/FoStaticContent.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjects; @@ -80,8 +79,7 @@ public class FoStaticContent extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.STATIC_CONTENT, parent, event, - FOPropertySets.STATIC_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.STATIC_SET, sparsePropsMap, sparseIndices); xmlevents = foTree.getXmlevents(); FoXMLEvent ev; try { @@ -92,7 +90,9 @@ public class FoStaticContent extends FONode { // Generate the flow object System.out.println("Generating first block for static-content."); FObjects.fobjects.makeFlowObject - (foTree, this, ev, FOPropertySets.STATIC_SET); + (foTree, this, ev, FONode.STATIC_SET); + // Clear the blockage + ev = xmlevents.getEndElement(ev); // Get the rest of the %block;s do { ev = xmlevents.expectBlock(); @@ -101,7 +101,8 @@ public class FoStaticContent extends FONode { System.out.println ("Generating subsequent block for static-content."); FObjects.fobjects.makeFlowObject - (foTree, this, ev, FOPropertySets.STATIC_SET); + (foTree, this, ev, FONode.STATIC_SET); + ev = xmlevents.getEndElement(ev); } } while (ev != null); } catch(UnexpectedStartElementException e) { diff --git a/src/org/apache/fop/fo/flow/FoTable.java b/src/org/apache/fop/fo/flow/FoTable.java index a37907e58..7cd22dddc 100644 --- a/src/org/apache/fop/fo/flow/FoTable.java +++ b/src/org/apache/fop/fo/flow/FoTable.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -110,7 +109,7 @@ public class FoTable extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableAndCaption.java b/src/org/apache/fop/fo/flow/FoTableAndCaption.java index 822e6b036..46e4cbca8 100644 --- a/src/org/apache/fop/fo/flow/FoTableAndCaption.java +++ b/src/org/apache/fop/fo/flow/FoTableAndCaption.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -98,7 +97,7 @@ public class FoTableAndCaption extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_AND_CAPTION, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableBody.java b/src/org/apache/fop/fo/flow/FoTableBody.java index 76a58125c..f6451460f 100644 --- a/src/org/apache/fop/fo/flow/FoTableBody.java +++ b/src/org/apache/fop/fo/flow/FoTableBody.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -93,7 +92,7 @@ public class FoTableBody extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_BODY, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableCaption.java b/src/org/apache/fop/fo/flow/FoTableCaption.java index fd3b551b8..ea71b14e3 100644 --- a/src/org/apache/fop/fo/flow/FoTableCaption.java +++ b/src/org/apache/fop/fo/flow/FoTableCaption.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -95,7 +94,7 @@ public class FoTableCaption extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_CAPTION, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableCell.java b/src/org/apache/fop/fo/flow/FoTableCell.java index 7dd1b04e0..e45c41903 100644 --- a/src/org/apache/fop/fo/flow/FoTableCell.java +++ b/src/org/apache/fop/fo/flow/FoTableCell.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -105,7 +104,7 @@ public class FoTableCell extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_CELL, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableColumn.java b/src/org/apache/fop/fo/flow/FoTableColumn.java index 760c16434..54ff4dd8d 100644 --- a/src/org/apache/fop/fo/flow/FoTableColumn.java +++ b/src/org/apache/fop/fo/flow/FoTableColumn.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -93,7 +92,7 @@ public class FoTableColumn extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_COLUMN, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableFooter.java b/src/org/apache/fop/fo/flow/FoTableFooter.java index f94de3846..5b3d2b452 100644 --- a/src/org/apache/fop/fo/flow/FoTableFooter.java +++ b/src/org/apache/fop/fo/flow/FoTableFooter.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -93,7 +92,7 @@ public class FoTableFooter extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_FOOTER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableHeader.java b/src/org/apache/fop/fo/flow/FoTableHeader.java index 86074d941..854dadbe5 100644 --- a/src/org/apache/fop/fo/flow/FoTableHeader.java +++ b/src/org/apache/fop/fo/flow/FoTableHeader.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -93,7 +92,7 @@ public class FoTableHeader extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_HEADER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTableRow.java b/src/org/apache/fop/fo/flow/FoTableRow.java index 805bbabd2..93c82bf05 100644 --- a/src/org/apache/fop/fo/flow/FoTableRow.java +++ b/src/org/apache/fop/fo/flow/FoTableRow.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -100,7 +99,7 @@ public class FoTableRow extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_ROW, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/flow/FoTitle.java b/src/org/apache/fop/fo/flow/FoTitle.java index 48d961ccd..5db9fa9c7 100644 --- a/src/org/apache/fop/fo/flow/FoTitle.java +++ b/src/org/apache/fop/fo/flow/FoTitle.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjects; @@ -100,8 +99,7 @@ public class FoTitle extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.TITLE, parent, event, - FOPropertySets.TITLE_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.TITLE_SET, sparsePropsMap, sparseIndices); xmlevents = foTree.getXmlevents(); FoXMLEvent ev = null; do { @@ -117,7 +115,8 @@ public class FoTitle extends FONode { if (ev != null) { // Generate the flow object FObjects.fobjects.makeFlowObject - (foTree, this, ev, FOPropertySets.TITLE_SET); + (foTree, this, ev, FONode.TITLE_SET); + ev = xmlevents.getEndElement(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoWrapper.java b/src/org/apache/fop/fo/flow/FoWrapper.java index 91083e8ba..6b280ffab 100644 --- a/src/org/apache/fop/fo/flow/FoWrapper.java +++ b/src/org/apache/fop/fo/flow/FoWrapper.java @@ -11,7 +11,6 @@ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -76,7 +75,7 @@ public class FoWrapper extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.WRAPPER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; diff --git a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java index 5c3a559c8..ec57b31bb 100644 --- a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java +++ b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java @@ -7,7 +7,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FONode; @@ -105,8 +104,7 @@ public class FoLayoutMasterSet extends FONode { throws TreeException, FOPException, PropertyException { super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event, - FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.LAYOUT_SET, sparsePropsMap, sparseIndices); setupPageMasters(event); // No need to clean up the build tree, because the whole subtree // will be deleted. diff --git a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java index 62d7ee395..f8816f8f3 100644 --- a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java +++ b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java @@ -23,7 +23,6 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FOTree; import org.apache.fop.fo.FONode; @@ -191,8 +190,7 @@ public class FoPageSequenceMaster extends FONode { throws TreeException, FOPException, PropertyException { super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event, - FOPropertySets.SEQ_MASTER_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.SEQ_MASTER_SET, sparsePropsMap, sparseIndices); // Process sequence members here try { do { @@ -244,8 +242,8 @@ public class FoPageSequenceMaster extends FONode { throws TreeException, FOPException, PropertyException { super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent, - event, FOPropertySets.SEQ_MASTER_SET, s_p_m_r_PropsMap, - s_p_m_r_Indices, s_p_m_r_numProps); + event, FONode.SEQ_MASTER_SET, s_p_m_r_PropsMap, + s_p_m_r_Indices); this.makeSparsePropsSet(); } @@ -266,8 +264,8 @@ public class FoPageSequenceMaster extends FONode { throws TreeException, FOPException, PropertyException { super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE, - parent, event, FOPropertySets.SEQ_MASTER_SET, - r_p_m_r_PropsMap, r_p_m_r_Indices, r_p_m_r_numProps); + parent, event, FONode.SEQ_MASTER_SET, + r_p_m_r_PropsMap, r_p_m_r_Indices); this.makeSparsePropsSet(); } @@ -292,8 +290,8 @@ public class FoPageSequenceMaster extends FONode { throws TreeException, FOPException, PropertyException { super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES, - parent, event, FOPropertySets.SEQ_MASTER_SET, - r_p_m_a_PropsMap, r_p_m_a_Indices, r_p_m_a_numProps); + parent, event, FONode.SEQ_MASTER_SET, + r_p_m_a_PropsMap, r_p_m_a_Indices); // Process conditional-page-master-references here try { @@ -325,8 +323,8 @@ public class FoPageSequenceMaster extends FONode { throws TreeException, FOPException, PropertyException { super(foTree, FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE, - parent, event, FOPropertySets.SEQ_MASTER_SET, - c_p_m_r_PropsMap, c_p_m_r_Indices, c_p_m_r_numProps); + parent, event, FONode.SEQ_MASTER_SET, + c_p_m_r_PropsMap, c_p_m_r_Indices); this.makeSparsePropsSet(); } diff --git a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java index 6074ef416..8b696bd12 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java +++ b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java @@ -12,7 +12,6 @@ package org.apache.fop.fo.pagination; // FOP import org.apache.fop.fo.FOAttributes; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -90,8 +89,8 @@ public class FoRegionBeforeAfter extends FONode { (FOTree foTree, int foType, FONode parent, FoXMLEvent event) throws TreeException, FOPException { - super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET, - sparsePropsMap, sparseIndices, numProps); + super(foTree, foType, parent, event, FONode.LAYOUT_SET, + sparsePropsMap, sparseIndices); } } diff --git a/src/org/apache/fop/fo/pagination/FoRegionBody.java b/src/org/apache/fop/fo/pagination/FoRegionBody.java index 5a5244c26..8e2038d9d 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionBody.java +++ b/src/org/apache/fop/fo/pagination/FoRegionBody.java @@ -10,9 +10,7 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FOAttributes; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -92,8 +90,7 @@ public class FoRegionBody extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.REGION_BODY, parent, event, - FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.LAYOUT_SET, sparsePropsMap, sparseIndices); makeSparsePropsSet(); } diff --git a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java index a780bac63..9af5e3c28 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java +++ b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java @@ -12,7 +12,6 @@ package org.apache.fop.fo.pagination; // FOP import org.apache.fop.fo.FOAttributes; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; @@ -89,8 +88,8 @@ public class FoRegionStartEnd extends FONode { (FOTree foTree, int foType, FONode parent, FoXMLEvent event) throws TreeException, FOPException { - super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET, - sparsePropsMap, sparseIndices, numProps); + super(foTree, foType, parent, event, FONode.LAYOUT_SET, + sparsePropsMap, sparseIndices); } } diff --git a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java index 455a60cb5..de4a4ec81 100644 --- a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java +++ b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java @@ -16,7 +16,6 @@ import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FOPropertySets; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; @@ -94,8 +93,7 @@ public class FoSimplePageMaster extends FONode { throws TreeException, FOPException { super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event, - FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices, - numProps); + FONode.LAYOUT_SET, sparsePropsMap, sparseIndices); // Process regions here FoXMLEvent regionEv; if ((regionEv = xmlevents.expectStartElement -- 2.39.5