pbwest 2004/01/16 22:45:00 Modified: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoTable.java Log: Remove local read of fo:markers and local numMarkers. Call superclass getMarkers(). Revision Changes Path No revision No revision 1.1.2.6 +3 -24 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java Index: FoTable.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- FoTable.java 15 Jan 2004 03:10:57 -0000 1.1.2.5 +++ FoTable.java 17 Jan 2004 06:44:59 -0000 1.1.2.6 @@ -142,9 +142,6 @@ } } - /** The number of markers on this FO. */ - private int numMarkers = 0; - /** The number of table-columns on this FO. */ private int numColumns = 0; @@ -179,19 +176,9 @@ stateFlags, sparsePropsMap, sparseIndices); XmlEvent ev; // Look for zero or more markers - String nowProcessing = "marker"; + getMarkers(); try { - while ((ev = xmlevents.expectStartElement - (FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE)) - != null) { - new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags); - numMarkers++; - ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev); - namespaces.surrenderEvent(ev); - } - // Look for zero or more table-columns - nowProcessing = "table-column"; while ((ev = xmlevents.expectStartElement (FObjectNames.TABLE_COLUMN, XmlEvent.DISCARD_W_SPACE)) != null) { @@ -204,7 +191,6 @@ } // Look for optional table-header - nowProcessing = "table-header"; if ((ev = xmlevents.expectStartElement (FObjectNames.TABLE_HEADER, XmlEvent.DISCARD_W_SPACE)) != null) { @@ -217,7 +203,6 @@ } // Look for optional table-footer - nowProcessing = "table-footer"; if ((ev = xmlevents.expectStartElement (FObjectNames.TABLE_FOOTER, XmlEvent.DISCARD_W_SPACE)) != null) { @@ -231,7 +216,6 @@ // Look for one or more table-body // must have at least one - nowProcessing = "table-body"; ev = xmlevents.expectStartElement (FObjectNames.TABLE_BODY, XmlEvent.DISCARD_W_SPACE); if (ev == null) @@ -253,11 +237,6 @@ namespaces.surrenderEvent(ev); } - /* - } catch (NoSuchElementException e) { - throw new FOPException - ("Unexpected EOF while processing " + nowProcessing + "."); - */ } catch(TreeException e) { throw new FOPException("TreeException: " + e.getMessage()); } catch(PropertyException e) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]