Remove local read of fo:markers and local numMarkers.

Call superclass getMarkers().

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197208 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/flow/FoListItem.java b/src/java/org/apache/fop/fo/flow/FoListItem.java
index aa6bad5808ae5f40ba3717cf1188ec10d5d85219..c83a851bac1a4f59a4b69338eee0e4adb1d6596c 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoListItem.java
+++ b/src/java/org/apache/fop/fo/flow/FoListItem.java
@@ -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 <jtauber@jtauber.com>. For more  information on the Apache 
  * Software Foundation, please see <http://www.apache.org/>.
- *  
- *
- * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
+ * 
+ * $Id$
  */
 
 package org.apache.fop.fo.flow;
@@ -72,6 +69,8 @@ import org.apache.fop.xml.SyncedXmlEventsBuffer;
 
 /**
  * Implements the fo:list-item flow object.
+ *
+ * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  */
 public class FoListItem extends FONode {
 
@@ -129,9 +128,6 @@ public class FoListItem extends FONode {
         }
     }
 
-    /** 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 @@ public class FoListItem extends FONode {
                           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 @@ public class FoListItem extends FONode {
             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 @@ public class FoListItem extends FONode {
             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) {

diff --git a/src/java/org/apache/fop/fo/flow/FoTable.java b/src/java/org/apache/fop/fo/flow/FoTable.java
index d01f402671d1260334576824f6eb112f750d83bf..04ade070cff834c98ab632fd5c8336fc4d9b2ed0 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTable.java
+++ b/src/java/org/apache/fop/fo/flow/FoTable.java
@@ -142,9 +142,6 @@ public class FoTable extends FONode {
         }
     }
 
-    /** 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 @@ public class FoTable extends FONode {
                                   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 @@ public class FoTable extends FONode {
             }
 
             // Look for optional table-header
-            nowProcessing = "table-header";
             if ((ev = xmlevents.expectStartElement
                     (FObjectNames.TABLE_HEADER, XmlEvent.DISCARD_W_SPACE))
                    != null) {
@@ -217,7 +203,6 @@ public class FoTable extends FONode {
             }
 
             // Look for optional table-footer
-            nowProcessing = "table-footer";
             if ((ev = xmlevents.expectStartElement
                     (FObjectNames.TABLE_FOOTER, XmlEvent.DISCARD_W_SPACE))
                    != null) {
@@ -231,7 +216,6 @@ public class FoTable extends FONode {
 
             // 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 @@ public class FoTable extends FONode {
                 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) {