Changes involved in introducing XmlEventReader, with

configurable XmlEventSources

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

diff --git a/src/java/org/apache/fop/fo/flow/FoBasicLink.java b/src/java/org/apache/fop/fo/flow/FoBasicLink.java
index b3a3b7133319f962e887631c8673cdc843d372e4..5aae317f55452c22358257d10ab8645646d9d7b9 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoBasicLink.java
+++ b/src/java/org/apache/fop/fo/flow/FoBasicLink.java
@@ -69,7 +69,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -171,8 +171,8 @@ public class FoBasicLink extends FONode {
                             foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS)
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                                XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -180,8 +180,8 @@ public class FoBasicLink extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoBidiOverride.java b/src/java/org/apache/fop/fo/flow/FoBidiOverride.java
index 1064e3db86d20b051311f8b533e4aef6eeddb154..2c07da62c4ab9a6fda41f65ac8749a3a55bbd4f7 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoBidiOverride.java
+++ b/src/java/org/apache/fop/fo/flow/FoBidiOverride.java
@@ -69,7 +69,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -157,8 +157,8 @@ public class FoBidiOverride extends FONode {
                             foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS)
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                                XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -166,8 +166,8 @@ public class FoBidiOverride extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoBlock.java b/src/java/org/apache/fop/fo/flow/FoBlock.java
index 8d4395608e1b6005ce4d743eb19c8f59c6967569..161425fcd8a761e60b94681ef67c786f94df42ab 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoBlock.java
+++ b/src/java/org/apache/fop/fo/flow/FoBlock.java
@@ -69,7 +69,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -183,9 +183,9 @@ public class FoBlock extends FONode {
                             foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS) {
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
+                                XmlEventReader.DISCARD_EV, ev);
                     }
-                    namespaces.surrenderEvent(ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -193,8 +193,8 @@ public class FoBlock extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoBlockContainer.java b/src/java/org/apache/fop/fo/flow/FoBlockContainer.java
index 61a74b614a13035c533bdc36c87ae7d338abe971..04a6fb2bd18d9f6aaeab5d4067ec031dec6ccca9 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoBlockContainer.java
+++ b/src/java/org/apache/fop/fo/flow/FoBlockContainer.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -173,8 +173,8 @@ public class FoBlockContainer extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -186,8 +186,8 @@ public class FoBlockContainer extends FONode {
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, stateFlags);
                     ev = xmlevents.getEndElement(
-                            SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                            XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoFloat.java b/src/java/org/apache/fop/fo/flow/FoFloat.java
index cb968f624af37404012947c90bbe7c37746cc544..42e85150149e488301c0fc08a2325594f575eceb 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoFloat.java
+++ b/src/java/org/apache/fop/fo/flow/FoFloat.java
@@ -67,7 +67,7 @@ import org.apache.fop.fo.FObjects;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -150,8 +150,8 @@ public class FoFloat extends FONode {
                     foTree, this, (FoXmlEvent)ev,
                     stateFlags | FONode.MC_FLOAT);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -164,8 +164,8 @@ public class FoFloat extends FONode {
                             foTree, this, (FoXmlEvent)ev,
                             stateFlags | FONode.MC_FLOAT);
                     ev = xmlevents.getEndElement(
-                            SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                            XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoFlow.java b/src/java/org/apache/fop/fo/flow/FoFlow.java
index e22a517cd2684bd58842dc05ae75ee2f525e0934..e422792c359ddf234237bce75810caae19b31278 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoFlow.java
+++ b/src/java/org/apache/fop/fo/flow/FoFlow.java
@@ -67,7 +67,7 @@ import org.apache.fop.fo.FObjects;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -132,8 +132,8 @@ public class FoFlow extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, FONode.FLOW_SET);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 ev = xmlevents.expectBlock();
@@ -144,8 +144,8 @@ public class FoFlow extends FONode {
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, FONode.FLOW_SET);
                     ev = xmlevents.getEndElement(
-                            SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                            XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoFootnote.java b/src/java/org/apache/fop/fo/flow/FoFootnote.java
index 8a8514929514b34f3efef02683b146c8da79e336..310efe9edccd21b6bb9e9d3a67f064a6d37fd26a 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoFootnote.java
+++ b/src/java/org/apache/fop/fo/flow/FoFootnote.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:footnote flow object.
@@ -156,8 +156,8 @@ public class FoFootnote extends FONode {
                     getFOTree(), this, (FoXmlEvent)ev,
                     stateFlags | FONode.MC_FOOTNOTE);
             ev =  xmlevents.getEndElement(
-                    SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+                    XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
 
             // Look for the footnote-body
             if ((ev = xmlevents.expectStartElement
@@ -167,8 +167,8 @@ public class FoFootnote extends FONode {
             new FoFootnoteBody(
                     getFOTree(), this, (FoXmlEvent)ev,
                     stateFlags | FONode.MC_FOOTNOTE);
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
 
             /*
         } catch (NoSuchElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java b/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java
index ad208dd16e13c23c06ca710fee3ff594eac62c1e..7d0710628ccc55a1be169ccc434912a8e10c4b58 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java
+++ b/src/java/org/apache/fop/fo/flow/FoFootnoteBody.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -147,8 +147,8 @@ public class FoFootnoteBody extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -160,8 +160,8 @@ public class FoFootnoteBody extends FONode {
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, stateFlags);
                     ev = xmlevents.getEndElement(
-                            SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                            XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoInline.java b/src/java/org/apache/fop/fo/flow/FoInline.java
index 588b0876a3f9452bf9a1ef09a074009de8ad62f6..1873402c87ace4bdceba5935c24f1763ab5674e8 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoInline.java
+++ b/src/java/org/apache/fop/fo/flow/FoInline.java
@@ -69,7 +69,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -172,9 +172,9 @@ public class FoInline extends FONode {
                             foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS) {
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
+                                XmlEventReader.DISCARD_EV, ev);
                     }
-                    namespaces.surrenderEvent(ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -182,8 +182,8 @@ public class FoInline extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoInlineContainer.java b/src/java/org/apache/fop/fo/flow/FoInlineContainer.java
index 350630eb9afdb153ff759f8d9de8071d04da7a5e..6ac8129a19e97e114241db0385a57608bf18de34 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoInlineContainer.java
+++ b/src/java/org/apache/fop/fo/flow/FoInlineContainer.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -170,8 +170,8 @@ public class FoInlineContainer extends FONode {
                     foTree, this, (FoXmlEvent)ev, stateFlags);
             // Clear the blockage
             ev = xmlevents.getEndElement(
-                    SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+                    XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -183,8 +183,8 @@ public class FoInlineContainer extends FONode {
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, stateFlags);
                     ev = xmlevents.getEndElement(
-                            SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                            XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoLeader.java b/src/java/org/apache/fop/fo/flow/FoLeader.java
index 01f561bd4f55dc86c464317409339487e69c3cb5..225b331a4960f519d6c938fc471662ca5448bf2d 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoLeader.java
+++ b/src/java/org/apache/fop/fo/flow/FoLeader.java
@@ -66,7 +66,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -181,9 +181,9 @@ public class FoLeader extends FONode {
                             foTree, this, ev, stateFlags | FONode.MC_LEADER);
                     if (ev.getType() != XmlEvent.CHARACTERS) {
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
+                                XmlEventReader.DISCARD_EV, ev);
                     }
-                    namespaces.surrenderEvent(ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -191,8 +191,8 @@ public class FoLeader extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoListBlock.java b/src/java/org/apache/fop/fo/flow/FoListBlock.java
index 6a4634abb4cd1e796d68ed4f5c42faef2e6f2aac..7220e6a7a09948403e22f29ce85cde3d45c033cc 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoListBlock.java
+++ b/src/java/org/apache/fop/fo/flow/FoListBlock.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:list-block flow object.
@@ -165,8 +165,8 @@ public class FoListBlock extends FONode {
                 new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numMarkers++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for one or more table-rows
@@ -177,8 +177,8 @@ public class FoListBlock extends FONode {
                 new FoListItem(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numItems++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             if (numItems > 0) {

diff --git a/src/java/org/apache/fop/fo/flow/FoListItem.java b/src/java/org/apache/fop/fo/flow/FoListItem.java
index c83a851bac1a4f59a4b69338eee0e4adb1d6596c..541fccbf1c4bc8d198ca08ad397addb497f4172e 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoListItem.java
+++ b/src/java/org/apache/fop/fo/flow/FoListItem.java
@@ -65,7 +65,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:list-item flow object.
@@ -157,8 +157,8 @@ public class FoListItem extends FONode {
                         ("No list-item-label in list-item.");
             new FoListItemLabel(
                     getFOTree(), this, (FoXmlEvent)ev, stateFlags);
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
 
             // Look for one list-item-body
             if ((ev = xmlevents.expectStartElement
@@ -167,8 +167,8 @@ public class FoListItem extends FONode {
                 throw new FOPException
                         ("No list-item-body in list-item.");
             new FoListItemBody(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
 
         } catch(TreeException e) {
             throw new FOPException("TreeException: " + e.getMessage());

diff --git a/src/java/org/apache/fop/fo/flow/FoListItemBody.java b/src/java/org/apache/fop/fo/flow/FoListItemBody.java
index a0c2f471b027031dfab0d62435171fdab9db5641..bc2e73e5966f2e463c87bba27cab8b51432dfd5b 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoListItemBody.java
+++ b/src/java/org/apache/fop/fo/flow/FoListItemBody.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -149,8 +149,8 @@ public class FoListItemBody extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -161,8 +161,8 @@ public class FoListItemBody extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, stateFlags);
-                    ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                    ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoListItemLabel.java b/src/java/org/apache/fop/fo/flow/FoListItemLabel.java
index 90147d4627ebe05ad2beb7f05ddab95d6c901bad..8b4be53ab5e83dda089031c5780a298d9e98147f 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoListItemLabel.java
+++ b/src/java/org/apache/fop/fo/flow/FoListItemLabel.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -149,8 +149,8 @@ public class FoListItemLabel extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -161,8 +161,8 @@ public class FoListItemLabel extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, stateFlags);
-                    ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                    ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoMarker.java b/src/java/org/apache/fop/fo/flow/FoMarker.java
index 36d3ed99c53c21053e38ad073ff34b4cdfbfead4..f1a3509c4bfe050b066ef9e6c962ebb8b406c56e 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoMarker.java
+++ b/src/java/org/apache/fop/fo/flow/FoMarker.java
@@ -65,7 +65,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -139,9 +139,9 @@ public class FoMarker extends FONode {
                             foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS) {
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
+                                XmlEventReader.DISCARD_EV, ev);
                     }
-                    namespaces.surrenderEvent(ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -149,8 +149,8 @@ public class FoMarker extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoMultiCase.java b/src/java/org/apache/fop/fo/flow/FoMultiCase.java
index 849ba0546e495a71cd3b2db99f31c01abc90d503..74e8ef2f15c4ac63fcd459befbbc20181674da7a 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoMultiCase.java
+++ b/src/java/org/apache/fop/fo/flow/FoMultiCase.java
@@ -69,7 +69,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -155,9 +155,9 @@ public class FoMultiCase extends FONode {
                                 (foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS) {
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
+                                XmlEventReader.DISCARD_EV, ev);
                     }
-                    namespaces.surrenderEvent(ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -165,8 +165,8 @@ public class FoMultiCase extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoMultiProperties.java b/src/java/org/apache/fop/fo/flow/FoMultiProperties.java
index bebdc845c0169d5049bd407d19ae521e52aa9bc2..1a3ed1a870465ffbb23632c28fcfd9ad25deabdf 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoMultiProperties.java
+++ b/src/java/org/apache/fop/fo/flow/FoMultiProperties.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:multi-properties flow object.
@@ -147,8 +147,8 @@ public class FoMultiProperties extends FONode {
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numSets++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             if (numSets == 0)
@@ -162,8 +162,8 @@ public class FoMultiProperties extends FONode {
                 throw new FOPException
                         ("No wrapper in multi-properties.");
             new FoWrapper(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
 
             /*
         } catch (NoSuchElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java b/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java
index 37236860d8f731d21b51c3751de471e4058e8935..6a1f302562587bd088f5d25039916c258bf442eb 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java
+++ b/src/java/org/apache/fop/fo/flow/FoMultiSwitch.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:multi-switch flow object.
@@ -147,8 +147,8 @@ public class FoMultiSwitch extends FONode {
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numCases++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             if (numCases == 0)

diff --git a/src/java/org/apache/fop/fo/flow/FoMultiToggle.java b/src/java/org/apache/fop/fo/flow/FoMultiToggle.java
index 32a5107957e60ce3f8d35d8e053f2b8bf13ceed6..548f91f42e66c6688b77b6c99266e9017fc19ede 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoMultiToggle.java
+++ b/src/java/org/apache/fop/fo/flow/FoMultiToggle.java
@@ -69,7 +69,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -152,9 +152,9 @@ public class FoMultiToggle extends FONode {
                                 (foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS) {
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
+                                XmlEventReader.DISCARD_EV, ev);
                     }
-                    namespaces.surrenderEvent(ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -162,8 +162,8 @@ public class FoMultiToggle extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoPageSequence.java b/src/java/org/apache/fop/fo/flow/FoPageSequence.java
index 0de0506af3f4aab480cd638ef7c9b54b265608f7..c352c389525b10c2316422401ea213876de5fbd7 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoPageSequence.java
+++ b/src/java/org/apache/fop/fo/flow/FoPageSequence.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -152,8 +152,8 @@ public class FoPageSequence extends FONode {
                 // process the title
                 title = numChildren();
                 new FoTitle(getFOTree(), this, (FoXmlEvent)ev);
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             } // else ignore
 
             // Look for zero or more static-content
@@ -165,8 +165,8 @@ public class FoPageSequence extends FONode {
                 if (firstStaticContent != -1)
                     firstStaticContent = numChildren();
                 new FoStaticContent(getFOTree(), this, (FoXmlEvent)ev);
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for one or more page-sequence
@@ -178,15 +178,15 @@ public class FoPageSequence extends FONode {
                 throw new FOPException("No flow found.");
             firstFlow = numChildren();
             new FoFlow(getFOTree(), this, (FoXmlEvent)ev);
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             while ((ev = xmlevents.expectStartElement
                             (FObjectNames.FLOW, XmlEvent.DISCARD_W_SPACE))
                    != null) {
                 // Loop over remaining fo:page-sequences
                 new FoFlow(getFOTree(), this, (FoXmlEvent)ev);
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } catch (NoSuchElementException e) {
             throw new FOPException

diff --git a/src/java/org/apache/fop/fo/flow/FoStaticContent.java b/src/java/org/apache/fop/fo/flow/FoStaticContent.java
index 6a22a51f11e900ac5a27bf8bb6e629fe382a1209..21c44d656ee8dc17eea31eb67e5df154e5ae9655 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoStaticContent.java
+++ b/src/java/org/apache/fop/fo/flow/FoStaticContent.java
@@ -67,7 +67,7 @@ import org.apache.fop.fo.FObjects;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -134,8 +134,8 @@ public class FoStaticContent extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, FONode.STATIC_SET);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             while ((ev = xmlevents.expectBlock()) != null) {
                 // Generate the flow object
@@ -143,8 +143,8 @@ public class FoStaticContent extends FONode {
                     //("Generating subsequent block for static-content.");
                 FObjects.fobjects.makeFlowObject(
                         foTree, this, (FoXmlEvent)ev, FONode.STATIC_SET);
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } catch(UnexpectedStartElementException e) {
             throw new FOPException

diff --git a/src/java/org/apache/fop/fo/flow/FoTable.java b/src/java/org/apache/fop/fo/flow/FoTable.java
index 04ade070cff834c98ab632fd5c8336fc4d9b2ed0..1d120c2601469daaef23ec20a5974778af864d01 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTable.java
+++ b/src/java/org/apache/fop/fo/flow/FoTable.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:table flow object.
@@ -186,8 +186,8 @@ public class FoTable extends FONode {
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numColumns++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for optional table-header
@@ -198,8 +198,8 @@ public class FoTable extends FONode {
                 new FoTableHeader(
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for optional table-footer
@@ -210,8 +210,8 @@ public class FoTable extends FONode {
                 new FoTableFooter(
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for one or more table-body
@@ -223,8 +223,8 @@ public class FoTable extends FONode {
             firstBodyOffset = numChildren();
             new FoTableBody(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
             numBodies++;
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             while ((ev = xmlevents.expectStartElement
                         (FObjectNames.TABLE_BODY, XmlEvent.DISCARD_W_SPACE))
                    != null) {
@@ -233,8 +233,8 @@ public class FoTable extends FONode {
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numBodies++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
         } catch(TreeException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java b/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java
index d33b39900c37927a286f4a0aeee73a5179490531..4680cdd52258f3c96de18fbcfe5644c428dcd032 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java
+++ b/src/java/org/apache/fop/fo/flow/FoTableAndCaption.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:table-and-caption flow object.
@@ -167,8 +167,8 @@ public class FoTableAndCaption extends FONode {
                 new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numMarkers++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for optional table-caption
@@ -179,8 +179,8 @@ public class FoTableAndCaption extends FONode {
                 new FoTableCaption(
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 captionOffset = numMarkers;
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for one table
@@ -191,8 +191,8 @@ public class FoTableAndCaption extends FONode {
                 throw new FOPException("No table found.");
             tableOffset = numChildren();
             new FoTable(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
 
             /*
         } catch (NoSuchElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoTableBody.java b/src/java/org/apache/fop/fo/flow/FoTableBody.java
index 53196a67dd4d6afa6516852b7205866818f657ae..f02145cd9b35b8c4971283abce8da390cb948a6b 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTableBody.java
+++ b/src/java/org/apache/fop/fo/flow/FoTableBody.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:table-body flow object.
@@ -167,8 +167,8 @@ public class FoTableBody extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for one or more table-rows
@@ -179,8 +179,8 @@ public class FoTableBody extends FONode {
                 new FoTableRow(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numRows++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             if (numRows > 0) {
@@ -194,8 +194,8 @@ public class FoTableBody extends FONode {
                     new FoTableCell(
                             getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                     numCells++;
-                    ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                    ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
                 if (numCells == 0)
                     throw new FOPException

diff --git a/src/java/org/apache/fop/fo/flow/FoTableCaption.java b/src/java/org/apache/fop/fo/flow/FoTableCaption.java
index eb517e67f090e17d9314c97a2e469b9cda7d6c29..276b05e233220d9430681fb73b20e29cb705cbb6 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTableCaption.java
+++ b/src/java/org/apache/fop/fo/flow/FoTableCaption.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -159,8 +159,8 @@ public class FoTableCaption extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -172,8 +172,8 @@ public class FoTableCaption extends FONode {
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, stateFlags);
                     ev = xmlevents.getEndElement(
-                            SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                            XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoTableCell.java b/src/java/org/apache/fop/fo/flow/FoTableCell.java
index c9621826a9ae2e4d5c3fcbeb085328e8aee69436..174e673a66bf3876ed7cac12fdec63da4f772f63 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTableCell.java
+++ b/src/java/org/apache/fop/fo/flow/FoTableCell.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -168,8 +168,8 @@ public class FoTableCell extends FONode {
             FObjects.fobjects.makeFlowObject(
                     foTree, this, (FoXmlEvent)ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-            namespaces.surrenderEvent(ev);
+            ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+            namespaces.relinquishEvent(ev);
             // Get the rest of the %block;s
             do {
                 if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -180,8 +180,8 @@ public class FoTableCell extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject(
                             foTree, this, (FoXmlEvent)ev, stateFlags);
-                    ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                    ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/java/org/apache/fop/fo/flow/FoTableFooter.java b/src/java/org/apache/fop/fo/flow/FoTableFooter.java
index 041630ff091a4f4d70f5229a853d22539fe49e30..54b2fc80d85d86d96b3fe6fe82e55dfe77fe603c 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTableFooter.java
+++ b/src/java/org/apache/fop/fo/flow/FoTableFooter.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:table-footer flow object.
@@ -167,8 +167,8 @@ public class FoTableFooter extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for one or more table-rows
@@ -178,8 +178,8 @@ public class FoTableFooter extends FONode {
                    != null) {
                 new FoTableRow(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numRows++;
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             if (numRows > 0) {
@@ -194,8 +194,8 @@ public class FoTableFooter extends FONode {
                             getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                     numCells++;
                     ev = xmlevents.getEndElement(
-                            SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                            XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
                 if (numCells == 0)
                     throw new FOPException

diff --git a/src/java/org/apache/fop/fo/flow/FoTableHeader.java b/src/java/org/apache/fop/fo/flow/FoTableHeader.java
index c3eb37fff34b4bd48a3edb41a08d0c3ad7e82fdf..ea241347644577075bf1f0042f5181fdbd33216e 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTableHeader.java
+++ b/src/java/org/apache/fop/fo/flow/FoTableHeader.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:table-header flow object.
@@ -167,8 +167,8 @@ public class FoTableHeader extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             // Look for one or more table-rows
@@ -178,8 +178,8 @@ public class FoTableHeader extends FONode {
                    != null) {
                 new FoTableRow(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numRows++;
-                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
 
             if (numRows > 0) {
@@ -193,8 +193,8 @@ public class FoTableHeader extends FONode {
                     new FoTableCell(
                             getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                     numCells++;
-                    ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                    namespaces.surrenderEvent(ev);
+                    ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
+                    namespaces.relinquishEvent(ev);
                 }
                 if (numCells == 0)
                     throw new FOPException

diff --git a/src/java/org/apache/fop/fo/flow/FoTableRow.java b/src/java/org/apache/fop/fo/flow/FoTableRow.java
index 161d54785d92820bd146ada183723e50fe3b944e..efb007dd3c9659c4fcf6cba7d51701668bac0176 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTableRow.java
+++ b/src/java/org/apache/fop/fo/flow/FoTableRow.java
@@ -68,7 +68,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 
 /**
  * Implements the fo:table-row flow object.
@@ -166,8 +166,8 @@ public class FoTableRow extends FONode {
                         getFOTree(), this, (FoXmlEvent)ev, stateFlags);
                 numCells++;
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
             if (numCells == 0)
                 throw new FOPException

diff --git a/src/java/org/apache/fop/fo/flow/FoTitle.java b/src/java/org/apache/fop/fo/flow/FoTitle.java
index 15b5854e2c91805e57860ede476f2ec1c7a41d8b..87180f933d4b779bc2eb3b91e763c8efedf83d38 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoTitle.java
+++ b/src/java/org/apache/fop/fo/flow/FoTitle.java
@@ -69,7 +69,7 @@ import org.apache.fop.fo.PropertySets;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -126,8 +126,8 @@ public class FoTitle extends FONode {
         }
     }
 
-    /** The <tt>SyncedXmlEventsBuffer</tt> from which events are drawn. */
-    private SyncedXmlEventsBuffer xmlevents;
+    /** The <tt>XmlEventReader</tt> from which events are drawn. */
+    private XmlEventReader xmlevents;
 
     /**
      * Construct an fo:title node, and build the fo:title subtree.
@@ -152,8 +152,8 @@ public class FoTitle extends FONode {
                             foTree, this, ev, FONode.TITLE_SET);
                     if (ev.getType() != XmlEvent.CHARACTERS)
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                        namespaces.surrenderEvent(ev);
+                                XmlEventReader.DISCARD_EV, ev);
+                        namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -161,8 +161,8 @@ public class FoTitle extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);
 

diff --git a/src/java/org/apache/fop/fo/flow/FoWrapper.java b/src/java/org/apache/fop/fo/flow/FoWrapper.java
index 3e6371f49659cd1e930e1c802748c5ad6836a808..e7c05ce91a325bea7309c9ba45e0e181c5e0c85d 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FoWrapper.java
+++ b/src/java/org/apache/fop/fo/flow/FoWrapper.java
@@ -65,7 +65,7 @@ import org.apache.fop.fo.PropNames;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXmlEvent;
 import org.apache.fop.xml.XmlEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
 import org.apache.fop.xml.UnexpectedStartElementException;
 
 /**
@@ -137,8 +137,8 @@ public class FoWrapper extends FONode {
                             foTree, this, ev, stateFlags);
                     if (ev.getType() != XmlEvent.CHARACTERS)
                         ev = xmlevents.getEndElement(
-                                SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                        namespaces.surrenderEvent(ev);
+                                XmlEventReader.DISCARD_EV, ev);
+                        namespaces.relinquishEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
                 ev = xmlevents.getStartElement();
@@ -146,8 +146,8 @@ public class FoWrapper extends FONode {
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
                 ev = xmlevents.getEndElement(
-                        SyncedXmlEventsBuffer.DISCARD_EV, ev);
-                namespaces.surrenderEvent(ev);
+                        XmlEventReader.DISCARD_EV, ev);
+                namespaces.relinquishEvent(ev);
             }
         } while (ev != null);