You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2004/01/20 06:57:08 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoFootnote.java FoMultiCase.java FoTableBody.java FoListItem.java FoListBlock.java FoTable.java FoPageSequence.java FoFloat.java FoStaticContent.java FoTitle.java FoFlow.java FoBasicLink.java FoLeader.java FoBidiOverride.java FoTableCell.java FoBlockContainer.java FoMultiToggle.java FoTableRow.java FoMultiProperties.java FoMultiSwitch.java FoWrapper.java FoMarker.java FoTableAndCaption.java FoListItemLabel.java FoTableHeader.java FoFootnoteBody.java FoBlock.java FoListItemBody.java FoInline.java FoTableCaption.java FoTableFooter.java FoInlineContainer.java
pbwest 2004/01/19 21:57:08
Modified: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoFootnote.java FoMultiCase.java FoTableBody.java
FoListItem.java FoListBlock.java FoTable.java
FoPageSequence.java FoFloat.java
FoStaticContent.java FoTitle.java FoFlow.java
FoBasicLink.java FoLeader.java FoBidiOverride.java
FoTableCell.java FoBlockContainer.java
FoMultiToggle.java FoTableRow.java
FoMultiProperties.java FoMultiSwitch.java
FoWrapper.java FoMarker.java FoTableAndCaption.java
FoListItemLabel.java FoTableHeader.java
FoFootnoteBody.java FoBlock.java
FoListItemBody.java FoInline.java
FoTableCaption.java FoTableFooter.java
FoInlineContainer.java
Log:
Changes involved in introducing XmlEventReader, with
configurable XmlEventSources
Revision Changes Path
No revision
No revision
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFootnote.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoFootnote.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoMultiCase.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoMultiCase.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -69,7 +69,7 @@
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 @@
(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 @@
("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);
1.1.2.6 +9 -9 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java
Index: FoTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTableBody.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTableBody.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
!= 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 @@
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 @@
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
1.1.2.7 +7 -7 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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoListItem.java 17 Jan 2004 06:43:36 -0000 1.1.2.6
+++ FoListItem.java 20 Jan 2004 05:57:07 -0000 1.1.2.7
@@ -65,7 +65,7 @@
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 @@
("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 @@
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());
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java
Index: FoListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoListBlock.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoListBlock.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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) {
1.1.2.7 +13 -13 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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoTable.java 17 Jan 2004 06:44:59 -0000 1.1.2.6
+++ FoTable.java 20 Jan 2004 05:57:07 -0000 1.1.2.7
@@ -68,7 +68,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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) {
1.1.2.6 +11 -11 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoPageSequence.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoPageSequence.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
// 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 @@
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 @@
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
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFloat.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoFloat.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -67,7 +67,7 @@
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 @@
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 @@
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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoStaticContent.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoStaticContent.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -67,7 +67,7 @@
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 @@
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 @@
//("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
1.1.2.6 +9 -9 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java
Index: FoTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTitle.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTitle.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -69,7 +69,7 @@
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 @@
}
}
- /** 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 @@
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 @@
("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);
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFlow.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoFlow.java 20 Jan 2004 05:57:07 -0000 1.1.2.6
@@ -67,7 +67,7 @@
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 @@
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 @@
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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoBasicLink.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoBasicLink.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -69,7 +69,7 @@
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 @@
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 @@
("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);
1.1.2.7 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoLeader.java 17 Jan 2004 06:34:47 -0000 1.1.2.6
+++ FoLeader.java 20 Jan 2004 05:57:08 -0000 1.1.2.7
@@ -66,7 +66,7 @@
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 @@
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 @@
("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);
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoBidiOverride.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoBidiOverride.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -69,7 +69,7 @@
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 @@
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 @@
("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);
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTableCell.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTableCell.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
// 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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoBlockContainer.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoBlockContainer.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoMultiToggle.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoMultiToggle.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -69,7 +69,7 @@
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 @@
(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 @@
("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);
1.1.2.6 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java
Index: FoTableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTableRow.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTableRow.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiProperties.java
Index: FoMultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoMultiProperties.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoMultiProperties.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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) {
1.1.2.6 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java
Index: FoMultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoMultiSwitch.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoMultiSwitch.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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)
1.1.2.7 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoWrapper.java 17 Jan 2004 06:46:20 -0000 1.1.2.6
+++ FoWrapper.java 20 Jan 2004 05:57:08 -0000 1.1.2.7
@@ -65,7 +65,7 @@
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 @@
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 @@
("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);
1.1.2.7 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMarker.java
Index: FoMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMarker.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoMarker.java 17 Jan 2004 06:47:20 -0000 1.1.2.6
+++ FoMarker.java 20 Jan 2004 05:57:08 -0000 1.1.2.7
@@ -65,7 +65,7 @@
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 @@
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 @@
("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);
1.1.2.6 +9 -9 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java
Index: FoTableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTableAndCaption.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTableAndCaption.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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 @@
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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoListItemLabel.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoListItemLabel.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
// 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) {
1.1.2.6 +9 -9 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableHeader.java
Index: FoTableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTableHeader.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTableHeader.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
!= 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 @@
!= 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 @@
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
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFootnoteBody.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoFootnoteBody.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoBlock.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoBlock.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -69,7 +69,7 @@
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 @@
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 @@
("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);
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoListItemBody.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoListItemBody.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
// 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) {
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoInline.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoInline.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -69,7 +69,7 @@
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 @@
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 @@
("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);
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTableCaption.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTableCaption.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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) {
1.1.2.6 +9 -9 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableFooter.java
Index: FoTableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoTableFooter.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoTableFooter.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
!= 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 @@
!= 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 @@
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
1.1.2.6 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoInlineContainer.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
+++ FoInlineContainer.java 20 Jan 2004 05:57:08 -0000 1.1.2.6
@@ -68,7 +68,7 @@
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 @@
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 @@
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org