pbwest 2002/11/23 06:25:38 Modified: src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoListBlock.java FoListItem.java FoMultiProperties.java FoMultiSwitch.java FoPageSequence.java FoTableAndCaption.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java Log: More general getEndElement(). Revision Changes Path No revision No revision 1.1.2.8 +4 -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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoListBlock.java 22 Nov 2002 00:35:30 -0000 1.1.2.7 +++ FoListBlock.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -121,7 +121,7 @@ != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - xmlevents.getEndElement(FObjectNames.MARKER); + xmlevents.getEndElement(ev); } // Look for one or more table-rows @@ -131,7 +131,7 @@ != null) { new FoListItem(getFOTree(), this, ev, stateFlags); numItems++; - xmlevents.getEndElement(FObjectNames.LIST_ITEM); + xmlevents.getEndElement(ev); } if (numItems > 0) { 1.1.2.8 +5 -5 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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoListItem.java 22 Nov 2002 00:35:30 -0000 1.1.2.7 +++ FoListItem.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -115,7 +115,7 @@ != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - xmlevents.getEndElement(FObjectNames.MARKER); + xmlevents.getEndElement(ev); } // Look for one list-item-label @@ -126,7 +126,7 @@ throw new FOPException ("No list-item-label in list-item."); new FoListItemLabel(getFOTree(), this, ev, stateFlags); - xmlevents.getEndElement(FObjectNames.LIST_ITEM_LABEL); + xmlevents.getEndElement(ev); // Look for one list-item-body nowProcessing = "list-item-body"; @@ -136,7 +136,7 @@ throw new FOPException ("No list-item-body in list-item."); new FoListItemBody(getFOTree(), this, ev, stateFlags); - xmlevents.getEndElement(FObjectNames.LIST_ITEM_BODY); + xmlevents.getEndElement(ev); /* } catch (NoSuchElementException e) { 1.1.2.8 +4 -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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoMultiProperties.java 22 Nov 2002 00:46:27 -0000 1.1.2.7 +++ FoMultiProperties.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -102,7 +102,7 @@ != null) { new FoMultiPropertySet(getFOTree(), this, ev, stateFlags); numSets++; - xmlevents.getEndElement(FObjectNames.MULTI_PROPERTY_SET); + xmlevents.getEndElement(ev); } if (numSets == 0) @@ -116,7 +116,7 @@ throw new FOPException ("No wrapper in multi-properties."); new FoWrapper(getFOTree(), this, ev, stateFlags); - xmlevents.getEndElement(FObjectNames.WRAPPER); + xmlevents.getEndElement(ev); /* } catch (NoSuchElementException e) { 1.1.2.8 +3 -3 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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoMultiSwitch.java 22 Nov 2002 00:46:27 -0000 1.1.2.7 +++ FoMultiSwitch.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -102,7 +102,7 @@ != null) { new FoMultiCase(getFOTree(), this, ev, stateFlags); numCases++; - xmlevents.getEndElement(FObjectNames.MULTI_CASE); + xmlevents.getEndElement(ev); } if (numCases == 0) 1.1.2.6 +6 -6 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.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- FoPageSequence.java 22 Nov 2002 00:46:27 -0000 1.1.2.5 +++ FoPageSequence.java 23 Nov 2002 14:25:37 -0000 1.1.2.6 @@ -109,7 +109,7 @@ // process the title title = numChildren(); new FoTitle(getFOTree(), this, ev); - xmlevents.getEndElement(FObjectNames.TITLE); + xmlevents.getEndElement(ev); } // else ignore // Look for zero or more static-content @@ -121,7 +121,7 @@ if (firstStaticContent != -1) firstStaticContent = numChildren(); new FoStaticContent(getFOTree(), this, ev); - xmlevents.getEndElement(FObjectNames.STATIC_CONTENT); + xmlevents.getEndElement(ev); } // Look for one or more page-sequence @@ -133,13 +133,13 @@ throw new FOPException("No flow found."); firstFlow = numChildren(); new FoFlow(getFOTree(), this, ev); - xmlevents.getEndElement(FObjectNames.FLOW); + xmlevents.getEndElement(ev); while ((ev = xmlevents.expectStartElement (FObjectNames.FLOW, XMLEvent.DISCARD_W_SPACE)) != null) { // Loop over remaining fo:page-sequences new FoFlow(getFOTree(), this, ev); - xmlevents.getEndElement(FObjectNames.FLOW); + xmlevents.getEndElement(ev); } } catch (NoSuchElementException e) { throw new FOPException 1.1.2.8 +5 -5 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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoTableAndCaption.java 22 Nov 2002 01:05:23 -0000 1.1.2.7 +++ FoTableAndCaption.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -122,7 +122,7 @@ != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - xmlevents.getEndElement(FObjectNames.MARKER); + xmlevents.getEndElement(ev); } // Look for optional table-caption @@ -132,7 +132,7 @@ != null) { new FoTableCaption(getFOTree(), this, ev, stateFlags); captionOffset = numMarkers; - xmlevents.getEndElement(FObjectNames.TABLE_CAPTION); + xmlevents.getEndElement(ev); } // Look for one table @@ -143,7 +143,7 @@ throw new FOPException("No table found."); tableOffset = numChildren(); new FoTable(getFOTree(), this, ev, stateFlags); - xmlevents.getEndElement(FObjectNames.TABLE); + xmlevents.getEndElement(ev); /* } catch (NoSuchElementException e) { 1.1.2.8 +5 -5 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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoTableFooter.java 22 Nov 2002 01:05:23 -0000 1.1.2.7 +++ FoTableFooter.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -124,7 +124,7 @@ != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - xmlevents.getEndElement(FObjectNames.MARKER); + xmlevents.getEndElement(ev); } // Look for one or more table-rows @@ -134,7 +134,7 @@ != null) { new FoTableRow(getFOTree(), this, ev, stateFlags); numRows++; - xmlevents.getEndElement(FObjectNames.TABLE_ROW); + xmlevents.getEndElement(ev); } if (numRows > 0) { @@ -147,7 +147,7 @@ != null) { new FoTableCell(getFOTree(), this, ev, stateFlags); numCells++; - xmlevents.getEndElement(FObjectNames.TABLE_CELL); + xmlevents.getEndElement(ev); } if (numCells == 0) throw new FOPException 1.1.2.8 +5 -5 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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoTableHeader.java 22 Nov 2002 01:05:23 -0000 1.1.2.7 +++ FoTableHeader.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -124,7 +124,7 @@ != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - xmlevents.getEndElement(FObjectNames.MARKER); + xmlevents.getEndElement(ev); } // Look for one or more table-rows @@ -134,7 +134,7 @@ != null) { new FoTableRow(getFOTree(), this, ev, stateFlags); numRows++; - xmlevents.getEndElement(FObjectNames.TABLE_ROW); + xmlevents.getEndElement(ev); } if (numRows > 0) { @@ -147,7 +147,7 @@ != null) { new FoTableCell(getFOTree(), this, ev, stateFlags); numCells++; - xmlevents.getEndElement(FObjectNames.TABLE_CELL); + xmlevents.getEndElement(ev); } if (numCells == 0) throw new FOPException 1.1.2.8 +8 -8 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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoTable.java 22 Nov 2002 01:05:23 -0000 1.1.2.7 +++ FoTable.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -143,7 +143,7 @@ != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - xmlevents.getEndElement(FObjectNames.MARKER); + xmlevents.getEndElement(ev); } // Look for zero or more table-columns @@ -153,7 +153,7 @@ != null) { new FoTableColumn(getFOTree(), this, ev, stateFlags); numColumns++; - xmlevents.getEndElement(FObjectNames.TABLE_COLUMN); + xmlevents.getEndElement(ev); } // Look for optional table-header @@ -163,7 +163,7 @@ != null) { headerOffset = numChildren(); new FoTableHeader(getFOTree(), this, ev, stateFlags); - xmlevents.getEndElement(FObjectNames.TABLE_HEADER); + xmlevents.getEndElement(ev); } // Look for optional table-footer @@ -173,7 +173,7 @@ != null) { footerOffset = numChildren(); new FoTableFooter(getFOTree(), this, ev, stateFlags); - xmlevents.getEndElement(FObjectNames.TABLE_FOOTER); + xmlevents.getEndElement(ev); } // Look for one or more table-body @@ -186,14 +186,14 @@ firstBodyOffset = numChildren(); new FoTableBody(getFOTree(), this, ev, stateFlags); numBodies++; - xmlevents.getEndElement(FObjectNames.TABLE_BODY); + xmlevents.getEndElement(ev); while ((ev = xmlevents.expectStartElement (FObjectNames.TABLE_BODY, XMLEvent.DISCARD_W_SPACE)) != null) { // Loop over remaining fo:table-body's new FoTableBody(getFOTree(), this, ev, stateFlags); numBodies++; - xmlevents.getEndElement(FObjectNames.TABLE_BODY); + xmlevents.getEndElement(ev); } /* 1.1.2.8 +3 -3 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.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoTableRow.java 22 Nov 2002 01:05:23 -0000 1.1.2.7 +++ FoTableRow.java 23 Nov 2002 14:25:37 -0000 1.1.2.8 @@ -121,7 +121,7 @@ != null) { new FoTableCell(getFOTree(), this, ev, stateFlags); numCells++; - xmlevents.getEndElement(FObjectNames.TABLE_CELL); + xmlevents.getEndElement(ev); } if (numCells == 0) throw new FOPException
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]