pbwest 2002/12/01 06:40:53
Modified: src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoFloat.java
FoFlow.java FoFootnoteBody.java FoFootnote.java
FoInlineContainer.java FoInline.java FoLeader.java
FoListBlock.java FoListItem.java
FoListItemBody.java FoListItemLabel.java
FoMarker.java FoMultiCase.java
FoMultiProperties.java FoMultiSwitch.java
FoMultiToggle.java FoPageSequence.java
FoStaticContent.java FoTableBody.java
FoTableAndCaption.java FoTableCaption.java
FoTableCell.java FoTableFooter.java
FoTableHeader.java FoTable.java FoTableRow.java
FoTitle.java FoWrapper.java
Log:
Used pool.surrendeEvent().
Revision Changes Path
No revision
No revision
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoBasicLink.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoBasicLink.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -126,14 +126,16 @@
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoBidiOverride.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoBidiOverride.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -112,14 +112,16 @@
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoBlockContainer.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoBlockContainer.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -129,7 +129,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -140,7 +141,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.10 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoBlock.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoBlock.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -137,15 +137,18 @@
//System.out.println("Generating flow object for " + ev);
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ if (ev.getFoType() != FObjectNames.PCDATA) {
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ }
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoFloat.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoFloat.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -106,7 +106,8 @@
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags | FONode.MC_FLOAT);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -117,7 +118,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags | FONode.MC_FLOAT);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.7 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoFlow.java 29 Nov 2002 16:19:50 -0000 1.1.2.6
+++ FoFlow.java 1 Dec 2002 14:40:52 -0000 1.1.2.7
@@ -85,21 +85,23 @@
if ((ev = xmlevents.expectBlock()) == null)
throw new FOPException("%block; not found in fo:flow");
// Generate the flow object
- System.out.println("Generating first block for flow.");
+ //System.out.println("Generating first block for flow.");
FObjects.fobjects.makeFlowObject
(foTree, this, ev, FONode.FLOW_SET);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
ev = xmlevents.expectBlock();
if (ev != null) {
// Generate the flow object
- System.out.println
- ("Generating subsequent block for flow.");
+ //System.out.println
+ //("Generating subsequent block for flow.");
FObjects.fobjects.makeFlowObject
(foTree, this, ev, FONode.FLOW_SET);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoFootnoteBody.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoFootnoteBody.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -102,7 +102,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -113,7 +114,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoFootnote.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoFootnote.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -110,7 +110,8 @@
throw new FOPException("No inline in footnote.");
new FoInline
(getFOTree(), this, ev, stateFlags | FONode.MC_FOOTNOTE);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Look for the footnote-body
if ((ev = xmlevents.expectStartElement
@@ -119,7 +120,8 @@
throw new FOPException("No footnote-body in footnote.");
new FoFootnoteBody
(getFOTree(), this, ev, stateFlags | FONode.MC_FOOTNOTE);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
/*
} catch (NoSuchElementException e) {
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoInlineContainer.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoInlineContainer.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -124,7 +124,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -135,7 +136,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.9 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoInline.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoInline.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -126,15 +126,18 @@
//System.out.println("Generating flow object for " + ev);
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ if (ev.getFoType() != FObjectNames.PCDATA) {
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ }
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.9 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoLeader.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoLeader.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -129,15 +129,18 @@
//System.out.println("Generating flow object for " + ev);
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ if (ev.getFoType() != FObjectNames.PCDATA) {
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ }
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java
Index: FoListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoListBlock.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoListBlock.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -120,7 +120,8 @@
!= null) {
new FoMarker(getFOTree(), this, ev, stateFlags);
numMarkers++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one or more table-rows
@@ -130,7 +131,8 @@
!= null) {
new FoListItem(getFOTree(), this, ev, stateFlags);
numItems++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numItems > 0) {
1.1.2.10 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java
Index: FoListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoListItem.java 29 Nov 2002 16:23:28 -0000 1.1.2.9
+++ FoListItem.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -114,7 +114,8 @@
!= null) {
new FoMarker(getFOTree(), this, ev, stateFlags);
numMarkers++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one list-item-label
@@ -125,7 +126,8 @@
throw new FOPException
("No list-item-label in list-item.");
new FoListItemLabel(getFOTree(), this, ev, stateFlags);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Look for one list-item-body
nowProcessing = "list-item-body";
@@ -135,7 +137,8 @@
throw new FOPException
("No list-item-body in list-item.");
new FoListItemBody(getFOTree(), this, ev, stateFlags);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
/*
} catch (NoSuchElementException e) {
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoListItemBody.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoListItemBody.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -105,7 +105,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -116,7 +117,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoListItemLabel.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoListItemLabel.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -105,7 +105,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -116,7 +117,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.9 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java
Index: FoMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoMarker.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoMarker.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -97,15 +97,18 @@
//System.out.println("Generating flow object for " + ev);
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ if (ev.getFoType() != FObjectNames.PCDATA) {
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ }
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.9 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoMultiCase.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoMultiCase.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -109,15 +109,18 @@
//System.out.println("Generating flow object for " + ev);
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ if (ev.getFoType() != FObjectNames.PCDATA) {
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ }
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java
Index: FoMultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoMultiProperties.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoMultiProperties.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -101,7 +101,8 @@
!= null) {
new FoMultiPropertySet(getFOTree(), this, ev, stateFlags);
numSets++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numSets == 0)
@@ -115,7 +116,8 @@
throw new FOPException
("No wrapper in multi-properties.");
new FoWrapper(getFOTree(), this, ev, stateFlags);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
/*
} catch (NoSuchElementException e) {
1.1.2.10 +4 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java
Index: FoMultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoMultiSwitch.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoMultiSwitch.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -101,7 +101,8 @@
!= null) {
new FoMultiCase(getFOTree(), this, ev, stateFlags);
numCases++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numCases == 0)
1.1.2.9 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoMultiToggle.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoMultiToggle.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -106,15 +106,18 @@
//System.out.println("Generating flow object for " + ev);
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ if (ev.getFoType() != FObjectNames.PCDATA) {
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ }
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.7 +10 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoPageSequence.java 23 Nov 2002 14:25:37 -0000 1.1.2.6
+++ FoPageSequence.java 1 Dec 2002 14:40:52 -0000 1.1.2.7
@@ -109,7 +109,8 @@
// process the title
title = numChildren();
new FoTitle(getFOTree(), this, ev);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
} // else ignore
// Look for zero or more static-content
@@ -121,7 +122,8 @@
if (firstStaticContent != -1)
firstStaticContent = numChildren();
new FoStaticContent(getFOTree(), this, ev);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one or more page-sequence
@@ -133,13 +135,15 @@
throw new FOPException("No flow found.");
firstFlow = numChildren();
new FoFlow(getFOTree(), this, ev);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
while ((ev = xmlevents.expectStartElement
(FObjectNames.FLOW, XMLEvent.DISCARD_W_SPACE))
!= null) {
// Loop over remaining fo:page-sequences
new FoFlow(getFOTree(), this, ev);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} catch (NoSuchElementException e) {
throw new FOPException
1.1.2.7 +15 -16 xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoStaticContent.java 29 Nov 2002 16:19:50 -0000 1.1.2.6
+++ FoStaticContent.java 1 Dec 2002 14:40:52 -0000 1.1.2.7
@@ -87,23 +87,22 @@
throw new FOPException
("%block; not found in fo:static-content");
// Generate the flow object
- System.out.println("Generating first block for static-content.");
+ //System.out.println("Generating first block for static-content.");
FObjects.fobjects.makeFlowObject
- (foTree, this, ev, FONode.STATIC_SET);
+ (foTree, this, ev, FONode.STATIC_SET);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
- do {
- ev = xmlevents.expectBlock();
- if (ev != null) {
- // Generate the flow object
- System.out.println
- ("Generating subsequent block for static-content.");
- FObjects.fobjects.makeFlowObject
- (foTree, this, ev, FONode.STATIC_SET);
- ev = xmlevents.getEndElement(ev);
- }
- } while (ev != null);
+ while ((ev = xmlevents.expectBlock()) != null) {
+ // Generate the flow object
+ //System.out.println
+ //("Generating subsequent block for static-content.");
+ FObjects.fobjects.makeFlowObject
+ (foTree, this, ev, FONode.STATIC_SET);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
+ }
} catch(UnexpectedStartElementException e) {
throw new FOPException
("Block not found or unexpected non-block in fo:static-content");
1.1.2.10 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java
Index: FoTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTableBody.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoTableBody.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -123,7 +123,8 @@
!= null) {
new FoMarker(getFOTree(), this, ev, stateFlags);
numMarkers++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one or more table-rows
@@ -133,7 +134,8 @@
!= null) {
new FoTableRow(getFOTree(), this, ev, stateFlags);
numRows++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numRows > 0) {
@@ -146,7 +148,8 @@
!= null) {
new FoTableCell(getFOTree(), this, ev, stateFlags);
numCells++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numCells == 0)
throw new FOPException
1.1.2.9 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java
Index: FoTableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoTableAndCaption.java 23 Nov 2002 14:25:37 -0000 1.1.2.8
+++ FoTableAndCaption.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -122,7 +122,8 @@
!= null) {
new FoMarker(getFOTree(), this, ev, stateFlags);
numMarkers++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for optional table-caption
@@ -132,7 +133,8 @@
!= null) {
new FoTableCaption(getFOTree(), this, ev, stateFlags);
captionOffset = numMarkers;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one table
@@ -143,7 +145,8 @@
throw new FOPException("No table found.");
tableOffset = numChildren();
new FoTable(getFOTree(), this, ev, stateFlags);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
/*
} catch (NoSuchElementException e) {
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoTableCaption.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoTableCaption.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -114,7 +114,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -125,7 +126,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoTableCell.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoTableCell.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -123,7 +123,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((stateFlags & FONode.MC_OUT_OF_LINE) == 0)
@@ -134,7 +135,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
} catch(UnexpectedStartElementException e) {
1.1.2.10 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java
Index: FoTableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTableFooter.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoTableFooter.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -123,7 +123,8 @@
!= null) {
new FoMarker(getFOTree(), this, ev, stateFlags);
numMarkers++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one or more table-rows
@@ -133,7 +134,8 @@
!= null) {
new FoTableRow(getFOTree(), this, ev, stateFlags);
numRows++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numRows > 0) {
@@ -146,7 +148,8 @@
!= null) {
new FoTableCell(getFOTree(), this, ev, stateFlags);
numCells++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numCells == 0)
throw new FOPException
1.1.2.10 +8 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java
Index: FoTableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTableHeader.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoTableHeader.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -123,7 +123,8 @@
!= null) {
new FoMarker(getFOTree(), this, ev, stateFlags);
numMarkers++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one or more table-rows
@@ -133,7 +134,8 @@
!= null) {
new FoTableRow(getFOTree(), this, ev, stateFlags);
numRows++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numRows > 0) {
@@ -146,7 +148,8 @@
!= null) {
new FoTableCell(getFOTree(), this, ev, stateFlags);
numCells++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numCells == 0)
throw new FOPException
1.1.2.10 +14 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java
Index: FoTable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTable.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoTable.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -142,7 +142,8 @@
!= null) {
new FoMarker(getFOTree(), this, ev, stateFlags);
numMarkers++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for zero or more table-columns
@@ -152,7 +153,8 @@
!= null) {
new FoTableColumn(getFOTree(), this, ev, stateFlags);
numColumns++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for optional table-header
@@ -162,7 +164,8 @@
!= null) {
headerOffset = numChildren();
new FoTableHeader(getFOTree(), this, ev, stateFlags);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for optional table-footer
@@ -172,7 +175,8 @@
!= null) {
footerOffset = numChildren();
new FoTableFooter(getFOTree(), this, ev, stateFlags);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
// Look for one or more table-body
@@ -185,14 +189,16 @@
firstBodyOffset = numChildren();
new FoTableBody(getFOTree(), this, ev, stateFlags);
numBodies++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
while ((ev = xmlevents.expectStartElement
(FObjectNames.TABLE_BODY, XMLEvent.DISCARD_W_SPACE))
!= null) {
// Loop over remaining fo:table-body's
new FoTableBody(getFOTree(), this, ev, stateFlags);
numBodies++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
/*
1.1.2.10 +4 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java
Index: FoTableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTableRow.java 29 Nov 2002 16:19:50 -0000 1.1.2.9
+++ FoTableRow.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
@@ -120,7 +120,8 @@
!= null) {
new FoTableCell(getFOTree(), this, ev, stateFlags);
numCells++;
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
if (numCells == 0)
throw new FOPException
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java
Index: FoTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoTitle.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoTitle.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -109,14 +109,16 @@
FObjects.fobjects.makeFlowObject
(foTree, this, ev, FONode.TITLE_SET);
if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.9 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoWrapper.java 29 Nov 2002 16:19:50 -0000 1.1.2.8
+++ FoWrapper.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
@@ -95,14 +95,16 @@
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
if (ev.getFoType() != FObjectNames.PCDATA)
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
- ev = xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
}
} while (ev != null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
