pbwest 2002/11/12 20:13:06 Modified: src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFlow.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoPageSequence.java FoPcdata.java FoRetrieveMarker.java FoStaticContent.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoTitle.java FoWrapper.java Log: Attribute set constants moved from FOPropertySets to FONode. numProps arg to FONode constructor removed. Revision Changes Path No revision No revision 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java Index: FoBasicLink.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoBasicLink.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoBasicLink.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.BASIC_LINK, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java Index: FoBidiOverride.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoBidiOverride.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoBidiOverride.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.BIDI_OVERRIDE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java Index: FoBlockContainer.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoBlockContainer.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoBlockContainer.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.BLOCK_CONTAINER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java Index: FoBlock.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoBlock.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoBlock.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ 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 @@ sparsePropsMap.put (Ints.consts.get(next), Ints.consts.get(propx++)); } + System.out.println("End of static block of FoBlock."); } /** @@ -119,7 +120,8 @@ 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; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java Index: FoCharacter.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoCharacter.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoCharacter.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.CHARACTER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java Index: FoExternalGraphic.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoExternalGraphic.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoExternalGraphic.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.EXTERNAL_GRAPHIC, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java Index: FoFloat.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoFloat.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoFloat.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.FLOAT, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.3 +8 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java Index: FoFlow.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FoFlow.java 11 Nov 2002 16:38:51 -0000 1.1.2.2 +++ FoFlow.java 13 Nov 2002 04:13:04 -0000 1.1.2.3 @@ -11,7 +11,6 @@ // 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 @@ 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 @@ // 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 @@ 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) { 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java Index: FoFootnoteBody.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoFootnoteBody.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoFootnoteBody.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.FOOTNOTE_BODY, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java Index: FoFootnote.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoFootnote.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoFootnote.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.FOOTNOTE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java Index: FoInitialPropertySet.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoInitialPropertySet.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoInitialPropertySet.java 13 Nov 2002 04:13:04 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.INITIAL_PROPERTY_SET, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java Index: FoInlineContainer.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoInlineContainer.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoInlineContainer.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.INLINE_CONTAINER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java Index: FoInline.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoInline.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoInline.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.INLINE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java Index: FoInstreamForeignObject.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoInstreamForeignObject.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoInstreamForeignObject.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.INSTREAM_FOREIGN_OBJECT, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java Index: FoLeader.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoLeader.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoLeader.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.LEADER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java Index: FoListBlock.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoListBlock.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoListBlock.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.LIST_BLOCK, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java Index: FoListItemBody.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoListItemBody.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoListItemBody.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.LIST_ITEM_BODY, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java Index: FoListItem.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoListItem.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoListItem.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.LIST_ITEM, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java Index: FoListItemLabel.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoListItemLabel.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoListItemLabel.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.LIST_ITEM_LABEL, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java Index: FoMarker.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoMarker.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoMarker.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.MARKER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java Index: FoMultiCase.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoMultiCase.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoMultiCase.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_CASE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java Index: FoMultiProperties.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoMultiProperties.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoMultiProperties.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_PROPERTIES, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java Index: FoMultiPropertySet.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoMultiPropertySet.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoMultiPropertySet.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_PROPERTY_SET, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java Index: FoMultiSwitch.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoMultiSwitch.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoMultiSwitch.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_SWITCH, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java Index: FoMultiToggle.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoMultiToggle.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoMultiToggle.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.MULTI_TOGGLE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoNoFo.java Index: FoNoFo.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoNoFo.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoNoFo.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoNoFo.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.NO_FO, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java Index: FoPageNumberCitation.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoPageNumberCitation.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoPageNumberCitation.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.PAGE_NUMBER_CITATION, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumber.java Index: FoPageNumber.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumber.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoPageNumber.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoPageNumber.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.PAGE_NUMBER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.2 +3 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java Index: FoPageSequence.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- FoPageSequence.java 7 Nov 2002 23:19:54 -0000 1.1.2.1 +++ FoPageSequence.java 13 Nov 2002 04:13:05 -0000 1.1.2.2 @@ -11,7 +11,6 @@ // 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 @@ 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 1.1.2.2 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPcdata.java Index: FoPcdata.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPcdata.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- FoPcdata.java 8 Nov 2002 15:47:28 -0000 1.1.2.1 +++ FoPcdata.java 13 Nov 2002 04:13:05 -0000 1.1.2.2 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.PCDATA, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); characters = event.getChars(); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java Index: FoRetrieveMarker.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoRetrieveMarker.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoRetrieveMarker.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.RETRIEVE_MARKER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.3 +8 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java Index: FoStaticContent.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FoStaticContent.java 11 Nov 2002 16:37:24 -0000 1.1.2.2 +++ FoStaticContent.java 13 Nov 2002 04:13:05 -0000 1.1.2.3 @@ -11,7 +11,6 @@ // 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 @@ 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 @@ // 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 @@ 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) { 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java Index: FoTableAndCaption.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableAndCaption.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableAndCaption.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_AND_CAPTION, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java Index: FoTableBody.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableBody.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableBody.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_BODY, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java Index: FoTableCaption.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableCaption.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableCaption.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_CAPTION, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java Index: FoTableCell.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableCell.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableCell.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_CELL, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableColumn.java Index: FoTableColumn.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableColumn.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableColumn.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableColumn.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_COLUMN, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java Index: FoTableFooter.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableFooter.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableFooter.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_FOOTER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java Index: FoTableHeader.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableHeader.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableHeader.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_HEADER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java Index: FoTable.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTable.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTable.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java Index: FoTableRow.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoTableRow.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoTableRow.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.TABLE_ROW, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing; 1.1.2.3 +5 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java Index: FoTitle.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FoTitle.java 11 Nov 2002 16:35:33 -0000 1.1.2.2 +++ FoTitle.java 13 Nov 2002 04:13:05 -0000 1.1.2.3 @@ -11,7 +11,6 @@ // 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 @@ 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 @@ 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); 1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java Index: FoWrapper.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FoWrapper.java 8 Nov 2002 14:18:24 -0000 1.1.2.3 +++ FoWrapper.java 13 Nov 2002 04:13:05 -0000 1.1.2.4 @@ -11,7 +11,6 @@ // 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 @@ throws TreeException, FOPException { super(foTree, FObjectNames.WRAPPER, parent, event, - attrSet, sparsePropsMap, sparseIndices, numProps); + attrSet, sparsePropsMap, sparseIndices); FoXMLEvent ev; String nowProcessing;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]