pbwest 2004/01/16 22:43:36 Modified: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoListItem.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 +6 -26 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java Index: FoListItem.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- FoListItem.java 15 Jan 2004 03:10:57 -0000 1.1.2.5 +++ FoListItem.java 17 Jan 2004 06:43:36 -0000 1.1.2.6 @@ -1,6 +1,4 @@ /* - * $Id$ - * * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -47,9 +45,8 @@ * on behalf of the Apache Software Foundation and was originally created by * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache * Software Foundation, please see <http://www.apache.org/>. - * - * - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> + * + * $Id$ */ package org.apache.fop.fo.flow; @@ -72,6 +69,8 @@ /** * Implements the fo:list-item flow object. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> */ public class FoListItem extends FONode { @@ -129,9 +128,6 @@ } } - /** The number of markers on this FO. */ - private int numMarkers = 0; - /** * Construct an fo:list-item node, and build the fo:list-item subtree. * <p>Content model for fo:list-item: @@ -151,19 +147,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 one list-item-label - nowProcessing = "list-item-label"; if ((ev = xmlevents.expectStartElement (FObjectNames.LIST_ITEM_LABEL, XmlEvent.DISCARD_W_SPACE)) == null) @@ -175,7 +161,6 @@ namespaces.surrenderEvent(ev); // Look for one list-item-body - nowProcessing = "list-item-body"; if ((ev = xmlevents.expectStartElement (FObjectNames.LIST_ITEM_BODY, XmlEvent.DISCARD_W_SPACE)) == null) @@ -185,11 +170,6 @@ ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev); 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]