Added expectBlock(), expectNormalPcdataOrInline(),

expectOutOfLinePcdataOrInline(), expectNormalPcdataOrInlineOrBlock(),
expectOutOfLinePcdataOrInlineOrBlock().

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

diff --git a/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java b/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java
index fcdf97638ae9fefb36ca09c3b353663698a4ad7c..257c1964c9852bff28971e02ae39bdc6b46ada20 100644 (file)
--- a/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java
+++ b/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java
@@ -3,6 +3,7 @@ package org.apache.fop.xml;
 import org.apache.fop.datastructs.SyncedCircularBuffer;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjectSets;
 
 import java.util.NoSuchElementException;
 import java.util.LinkedList;
@@ -771,6 +772,7 @@ public class SyncedFoXmlEventsBuffer extends SyncedCircularBuffer {
     {
         FoXMLEvent ev;
         do {
+            try {
             ev = expectStartElement(set, discardWhiteSpace);
             if (ev != null) return ev;
             // The non-matching event has been pushed back.
@@ -778,6 +780,9 @@ public class SyncedFoXmlEventsBuffer extends SyncedCircularBuffer {
             // getEvent() returns null, the expectStartElement() calls
             // will throw a NoSuchElementException
             ev = getEvent();
+            } catch(UnexpectedStartElementException e) {
+                ev = getEvent();
+            }
         } while (ev != null);
         // Exit from this while loop is only by discovery of null event
         throw new NoSuchElementException
@@ -803,7 +808,7 @@ public class SyncedFoXmlEventsBuffer extends SyncedCircularBuffer {
      */
     public FoXMLEvent expectStartElement
                                     (BitSet set, boolean discardWhiteSpace)
-        throws FOPException
+        throws FOPException, UnexpectedStartElementException
     {
         FoXMLEvent ev;
         ev = expectTypedEvent(XMLEvent.STARTELEMENT, discardWhiteSpace);
@@ -813,9 +818,58 @@ public class SyncedFoXmlEventsBuffer extends SyncedCircularBuffer {
             if (ev.foType == i)
                 return ev; // Found it!
         }
-        // Not found - push the STARTELEMENT event back
+        // Not found - push the STARTELEMENT event back and throw an
+        // UnexpectedStartElementException
         pushBack(ev);
-        return null;
+        throw new UnexpectedStartElementException
+                ("Unexpected START element: " + ev.getQName());
+    }
+
+    public FoXMLEvent expectBlock()
+        throws FOPException, UnexpectedStartElementException
+    {
+        return expectStartElement
+                (FObjectSets.blockEntity, XMLEvent.DISCARD_W_SPACE);
+    }
+
+    public FoXMLEvent expectNormalPcdataOrInline()
+        throws FOPException, UnexpectedStartElementException
+    {
+        FoXMLEvent ev = expectStartElement
+                (FObjectSets.normalPcdataInlineSet, XMLEvent.RETAIN_W_SPACE);
+        if (ev == null)
+            ev = expectCharacters();
+        return ev;
+    }
+
+    public FoXMLEvent expectOutOfLinePcdataOrInline()
+        throws FOPException, UnexpectedStartElementException
+    {
+        FoXMLEvent ev = expectStartElement
+                    (FObjectSets.inlineEntity, XMLEvent.RETAIN_W_SPACE);
+        if (ev == null)
+            ev = expectCharacters();
+        return ev;
+    }
+
+    public FoXMLEvent expectNormalPcdataOrInlineOrBlock()
+        throws FOPException, UnexpectedStartElementException
+    {
+        FoXMLEvent ev = expectStartElement
+            (FObjectSets.normalPcdataBlockInlineSet, XMLEvent.RETAIN_W_SPACE);
+        if (ev == null)
+            ev = expectCharacters();
+        return ev;
+    }
+
+    public FoXMLEvent expectOutOfLinePcdataOrInlineOrBlock()
+        throws FOPException, UnexpectedStartElementException
+    {
+        FoXMLEvent ev = expectStartElement
+            (FObjectSets.pcdataBlockInlineSet, XMLEvent.RETAIN_W_SPACE);
+        if (ev == null)
+            ev = expectCharacters();
+        return ev;
     }
 
     /**